Separate WIN32 sub directories for Zebra and Z'mbol.

diff --git a/LICENSE.2 b/LICENSE.2
deleted file mode 100644 (file)
index 7733ace..0000000
--- a/LICENSE.2
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 1995-1998 Index Data.
- * 
- * All rights reserved.
- * 
- * Use and redistribution in source or binary form, with or without
- * modification, of any or all of this software and documentation is
- * permitted, provided that the following conditions are met:
- * 
- * 1. This copyright and permission notice appear with all copies of the
- * software and its documentation. Notices of copyright or attribution
- * which appear at the beginning of any file must remain unchanged.
- * 
- * 2. The names of Index Data or the individual authors may not be used to
- * endorse or promote products derived from this software without specific
- * prior written permission.
- * 
- * 3. Source code or binary versions of this software and its
- * documentation may be used freely in not-for-profit applications. For
- * profit applications - such as providing for-pay database services,
- * marketing a product based in whole or in part on this software or its
- * documentation, or generally distributing this software or its
- * documentation under a different license - requires a commercial
- * license from Index Data. The software may be installed and used for
- * evaluation purposes in conjunction with a commercial application for a
- * trial period no longer than 60 days.
- * 
- * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
- * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR
- * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- *
- */

diff --git a/doc/README b/doc/README
index fecfd0b..ff9ee2f 100644 (file)
--- a/doc/README
+++ b/doc/README
@@ -1,3 +1,3 @@
 To download the documentation for Zebra in postscript or ASCII, look
 at the FTP site where you retrieved this software, or at
 To download the documentation for Zebra in postscript or ASCII, look
 at the FTP site where you retrieved this software, or at

-   http://www.indexdata.dk/zebra
+   http://www.indexdata.dk/zebra/

diff --git a/doc/zebra.sgml b/doc/zebra.sgml
index 872ded7..911e949 100644 (file)
--- a/doc/zebra.sgml
+++ b/doc/zebra.sgml
@@ -1,14 +1,14 @@
 <!doctype linuxdoc system>
 
 <!--
 <!doctype linuxdoc system>
 
 <!--

-  $Id: zebra.sgml,v 1.43 1999-12-08 15:03:11 adam Exp $
+  $Id: zebra.sgml,v 1.44 1999-12-08 22:11:56 adam Exp $

 -->
 
 <article>
 <title>Zebra Server - Administrators's Guide and Reference
 <author><htmlurl url="http://www.indexdata.dk/" name="Index Data">,
 <tt><htmlurl url="mailto:info@indexdata.dk" name="info@indexdata.dk"></>
 -->
 
 <article>
 <title>Zebra Server - Administrators's Guide and Reference
 <author><htmlurl url="http://www.indexdata.dk/" name="Index Data">,
 <tt><htmlurl url="mailto:info@indexdata.dk" name="info@indexdata.dk"></>

-<date>$Revision: 1.43 $
+<date>$Revision: 1.44 $

 <abstract>
 
 
 <abstract>
 
 

@@ -260,11 +260,10 @@ Zebra is shipped with "makefiles" for the NMAKE tool that comes
 with Visual C++.
 
 Start an MS-DOS prompt and switch the sub directory <tt>WIN</tt> where
 with Visual C++.
 
 Start an MS-DOS prompt and switch the sub directory <tt>WIN</tt> where

-the file <tt>zebra.mak</tt> is located. Customize the installation
-by editing the <tt>zebra.mak</tt> file (for example by using notepad).
+the file <tt>makefile</tt> is located. Customize the installation
+by editing the <tt>makefile</tt> file (for example by using wordpad).

 
 

-The following summarises the most important settings in that
-file.
+The following summarises the most important settings in that file.

 
 <descrip>
 <tag><tt>YAZDIR</tt></tag> Specifies where YAZ is located.
 
 <descrip>
 <tag><tt>YAZDIR</tt></tag> Specifies where YAZ is located.

@@ -277,7 +276,7 @@ that must be defined if BZIP2 compression support is desired.
 
 When satisfied with the settings in the makefile type
 <tscreen><verb>
 
 When satisfied with the settings in the makefile type
 <tscreen><verb>

-nmake /f zebra.mak
+nmake

 </verb></tscreen>
 
 If compilation was successful the executables <tt>zebraidx.exe</tt>
 </verb></tscreen>
 
 If compilation was successful the executables <tt>zebraidx.exe</tt>

@@ -291,8 +290,8 @@ GILS records that are included with the software distribution. Go to the
 find a configuration
 file named <tt>zebra.cfg</tt> with the following contents:
 <tscreen><verb>
 find a configuration
 file named <tt>zebra.cfg</tt> with the following contents:
 <tscreen><verb>

-# Where are the YAZ tables located.
-profilePath: ../../../yaz/tab ../../tab
+# Where the schema files, attribute files, etc. are located.
+profilePath: .:../../tab:../../../yaz/tab 

 
 # Files that describe the attribute sets supported.
 attset: explain.att
 
 # Files that describe the attribute sets supported.
 attset: explain.att

diff --git a/test/gils/zebra.cfg b/test/gils/zebra.cfg
index 88b0d20..ceee63b 100644 (file)
--- a/test/gils/zebra.cfg
+++ b/test/gils/zebra.cfg
@@ -1,7 +1,7 @@
 # Simple Zebra configuration file
 # Simple Zebra configuration file

-# $Id: zebra.cfg,v 1.9 1999-12-01 13:30:30 adam Exp $
+# $Id: zebra.cfg,v 1.10 1999-12-08 22:11:56 adam Exp $

 #
 #

-# Where are the YAZ / Zebra tables located?
+# Where the schema files, attribute files, etc are located.

 profilePath: .:../../tab:../../../yaz/tab
 
 # Files that describe the attribute sets supported.
 profilePath: .:../../tab:../../../yaz/tab
 
 # Files that describe the attribute sets supported.

@@ -9,13 +9,5 @@ attset: bib1.att
 attset: gils.att
 attset: explain.att
 
 attset: gils.att
 attset: explain.att
 

-#isam: d
-#isamdddebug: 0
-
-#isam: 
-
-#isamhDebug: 9
-
-

 recordtype: grs.sgml
 
 recordtype: grs.sgml
 

diff --git a/test/usmarc/zebra.cfg b/test/usmarc/zebra.cfg
index 3e01731..99933f9 100644 (file)
--- a/test/usmarc/zebra.cfg
+++ b/test/usmarc/zebra.cfg
@@ -1,8 +1,8 @@
 # Simple Zebra configuration file that defines
 # a database with USMARC records.
 # Simple Zebra configuration file that defines
 # a database with USMARC records.

-# $Id: zebra.cfg,v 1.3 1998-06-08 14:43:18 adam Exp $
+# $Id: zebra.cfg,v 1.4 1999-12-08 22:11:56 adam Exp $

 #
 #

-# Where are the YAZ / Zebra tables located?
+# Where are the config files located?

 profilePath: .:../../tab:../../../yaz/tab
 
 # Files that describe the attribute sets supported.
 profilePath: .:../../tab:../../../yaz/tab
 
 # Files that describe the attribute sets supported.

@@ -12,9 +12,6 @@ attset: explain.att
 # Specify record type
 recordType: grs.marc.usmarc
 
 # Specify record type
 recordType: grs.marc.usmarc
 

-# Register Area
-register: register:100M
-

 # Lock File Area
 lockDir: lock
 
 # Lock File Area
 lockDir: lock
 

@@ -26,7 +23,3 @@ keyTmpDir: tmp
 
 # Approx. Memory usage during indexing
 memMax: 4
 
 # Approx. Memory usage during indexing
 memMax: 4

-
-# Shadow Area
-shadow: shadow:100M
-

diff --git a/win/makefile b/win/makefile
new file mode 100644 (file)
index 0000000..58554bb
--- /dev/null
+++ b/win/makefile
@@ -0,0 +1,402 @@
+# Z'mbol makefile for MS NMAKE
+# $Id: makefile,v 1.1 1999-12-08 22:11:56 adam Exp $
+ 
+###########################################################
+############### Parameters 
+###########################################################
+
+DEBUG=0   # 0 for release, 1 for debug
+
+default: all
+
+all: dirs zebralib zserver zindex
+
+###########################################################
+############### Directories
+###########################################################
+# The current directory is supposed to be something like
+# ..../Zebra/Win, everything is relative to that
+ROOTDIR=..   # The home of Z'mbol
+
+# YAZ include files, libraries, etc.
+YAZDIR=$(ROOTDIR)\..\YAZ
+YAZINCL=$(YAZDIR)\include
+YAZLIB=$(YAZDIR)\lib\yaz.lib
+YAZSERVLIB=$(YAZDIR)\lib\server.lib
+YAZLIBS=$(YAZLIB) $(YAZSERVLIB)
+YAZBINDIR=$(YAZDIR)\bin
+YAZDLL=$(YAZBINDIR)\yaz.dll
+
+# BZIP2 settings. Uncomment and specify if you wish to use LIBBZIP2.
+# (C) 1996-1999 Julian Seward <jseward@acm.org> http://www.bzip2.org
+
+#BZIP2INCLUDE=/I"$(ROOTDIR)\..\bzip2-0.9.5d"
+#BZIP2LIB=$(ROOTDIR)\..\bzip2-0.9.5d\libbz2.lib
+#BZIP2DEF=/D"HAVE_BZLIB_H=1"
+
+# ZEBRA Include files, libraries, programs, etc.
+INCLDIR=$(ROOTDIR)\include  # our includes
+LIBDIR=$(ROOTDIR)\lib       # We produce .lib, .exp etc there
+BINDIR=$(ROOTDIR)\bin       # We produce exes and dlls there
+WINDIR=$(ROOTDIR)\win       # all these Win make things
+OBJDIR=$(WINDIR)\obj        # where we store intermediate files
+UNIXDIR=$(ROOTDIR)\unix     # corresponding unix things
+SRCDIR=$(ROOTDIR)           # for the case we move them under src
+
+INDEXDIR=$(SRCDIR)\INDEX
+BFILEDIR=$(SRCDIR)\BFILE
+DFADIR=$(SRCDIR)\DFA
+DICTDIR=$(SRCDIR)\DICT
+ISAMSDIR=$(SRCDIR)\ISAMS
+ISAMDIR=$(SRCDIR)\ISAM
+ISAMCDIR=$(SRCDIR)\ISAMC
+RECCTRLDIR=$(SRCDIR)\RECCTRL
+RSETDIR=$(SRCDIR)\RSET
+UTILDIR=$(SRCDIR)\UTIL
+APITESTDIR=$(SRCDIR)\APITEST
+
+# Force temp files in a local temp, easier to clean
+# when nmake crashes and leaves a lot of rubbish behind
+TMPDIR=$(ROOTDIR)\win\tmp
+TMP=$(TMPDIR)
+TEMP=$(TMPDIR)
+
+###########################################################
+############### Targets - what to make
+###########################################################
+
+ZEBRALIB=$(LIBDIR)\zebra.lib
+ZSERVER=$(BINDIR)\zmbolsrv.exe
+ZINDEX=$(BINDIR)\zmbolidx.exe
+APITEST=$(BINDIR)\apitest.exe
+
+# shortcut names defined here
+zebralib: $(ZEBRALIB)
+zindex: $(ZINDEX)
+zserver: $(ZSERVER)
+apitest: $(APITEST)
+
+###########################################################
+############### Compiler and linker options 
+###########################################################
+
+### C and CPP compiler  (the same thing)
+# Note: $(CPP) has already been defined in the environment
+# (if you set things up right!)
+
+COMMON_C_OPTIONS=          \
+  /nologo /W3 /GX /FD /c   \
+  /D "WIN32"               \
+  /D"_CONSOLE" /D"_MBCS"   \
+  /FR"$(OBJDIR)\\"         \
+  /Fo"$(OBJDIR)\\"         \
+  /Fd"$(OBJDIR)\\"         \
+  /D"ZMBOL=1"              \
+  $(BZIP2DEF)
+
+COMMON_C_INCLUDES= \
+  /I"$(SRCDIR)\include" \
+  /I"$(YAZDIR)\include" \
+  $(BZIP2INCLUDE)
+
+DEBUG_C_OPTIONS=  \
+  /D "_DEBUG"      \
+  /MDd  /Od /YX /Zi /Gm
+
+RELEASE_C_OPTIONS=  \
+  /D "NDEBUG"        \
+  /MD /O2
+
+# /W3  = warning level
+# /GX  = Enable exception handling
+# /FD  = Generate file dependencies (what ever they are)
+# /c   = compile without linking
+# /FR  = Generate browse info (.sbr file that gets combined into .bsc)
+# /Fo  = object file name (or at least path)
+# /Fd  = debug database name (or path)
+# /MD  = Runtime library: Multithread DLL
+# /MDd = Runtime library: Multithread DLL (debug)
+# /Od  = Disable optimising (debug)
+# /O2  = Optimize for speed
+# /YX  = Automatic use of precomipled headers
+# /Gm  = Minimal rebuild (some cpp class stuff)
+# /Zi  = Program database for debuggers
+# /ZI  = Pgm database with special "edit&continue" stuff - not available in C5
+
+### Linker options
+LINK=link.exe
+
+LINK_LIBS= kernel32.lib user32.lib   gdi32.lib   winspool.lib \
+           comdlg32.lib advapi32.lib shell32.lib ole32.lib    \
+           oleaut32.lib uuid.lib     odbc32.lib  odbccp32.lib \
+           wsock32.lib  advapi32.lib
+
+COMMON_LNK_OPTIONS= /nologo \
+                    /machine:i386 \
+                                   /incremental:no
+
+#                    /subsystem:windows \
+
+DEBUG_LNK_OPTIONS= /debug 
+
+RELEASE_LNK_OPTIONS=  /pdb:none
+
+ZEBRALIB_LINK_OPTIONS = -lib 
+
+ZSERVER_LINK_OPTIONS = /subsystem:console  
+ZINDEX_LINK_OPTIONS = /subsystem:console  
+APITEST_LINK_OPTIONS = /subsystem:console  
+
+# Final opt variables
+!if $(DEBUG)
+COPT=   $(COMMON_C_OPTIONS)   $(DEBUG_C_OPTIONS)     $(COMMON_C_INCLUDES)
+MTLOPT= $(COMMON_MTL_OPTIONS) $(DEBUG_MTL_OPTIONS)
+RCOPT=  $(COMMON_RC_OPTIONS)  $(DEBUG_RC_OPTIONS)
+LNKOPT= $(COMMON_LNK_OPTIONS) $(DEBUG_LNK_OPTIONS)   $(LNK_LIBS)
+
+!else
+COPT=   $(COMMON_C_OPTIONS)   $(RELEASE_C_OPTIONS)   $(COMMON_C_INCLUDES) 
+MTLOPT= $(COMMON_MTL_OPTIONS) $(RELEASE_MTL_OPTIONS)
+RCOPT=  $(COMMON_RC_OPTIONS)  $(RELEASE_RC_OPTIONS)
+LNKOPT= $(COMMON_LNK_OPTIONS) $(RELEASE_LNK_OPTIONS) $(LNK_LIBS)
+!endif
+
+###########################################################
+###############  Source and object modules
+###########################################################
+
+# Note: Ordinary source files are not specified here at 
+# all, make finds them in suitable dirs. The object modules
+# need to be specified, though
+
+ZSERVER_OBJS= \
+       $(OBJDIR)\zserver.obj 
+
+ZEBRAIDX_OBJS= \
+       $(OBJDIR)\dir.obj \
+       $(OBJDIR)\dirs.obj \
+       $(OBJDIR)\extract.obj \
+       $(OBJDIR)\kinput.obj \
+       $(OBJDIR)\main.obj \
+       $(OBJDIR)\trav.obj
+
+APITEST_OBJS= \
+       $(OBJDIR)\apitest.obj
+
+ZEBRALIB_OBJS= \
+       $(OBJDIR)\attribute.obj \
+       $(OBJDIR)\bfile.obj \
+       $(OBJDIR)\bset.obj \
+       $(OBJDIR)\cfile.obj \
+       $(OBJDIR)\charmap.obj \
+       $(OBJDIR)\close.obj \
+       $(OBJDIR)\commit.obj \
+       $(OBJDIR)\compact.obj \
+       $(OBJDIR)\dclose.obj \
+       $(OBJDIR)\dcompact.obj \
+       $(OBJDIR)\delete.obj \
+       $(OBJDIR)\dfa.obj \
+       $(OBJDIR)\dirent.obj \
+       $(OBJDIR)\dopen.obj \
+       $(OBJDIR)\drdwr.obj \
+       $(OBJDIR)\imalloc.obj \
+       $(OBJDIR)\insert.obj \
+       $(OBJDIR)\invstat.obj \
+       $(OBJDIR)\isam.obj \
+       $(OBJDIR)\isamc.obj \
+       $(OBJDIR)\isamd.obj \
+       $(OBJDIR)\isutil.obj \
+       $(OBJDIR)\kcompare.obj \
+       $(OBJDIR)\lockidx.obj \
+       $(OBJDIR)\locksrv.obj \
+       $(OBJDIR)\lockutil.obj \
+       $(OBJDIR)\lookgrep.obj \
+       $(OBJDIR)\lookup.obj \
+       $(OBJDIR)\lookupec.obj \
+       $(OBJDIR)\marcread.obj \
+       $(OBJDIR)\memory.obj \
+       $(OBJDIR)\merge.obj \
+       $(OBJDIR)\merge-d.obj \
+       $(OBJDIR)\mfile.obj \
+       $(OBJDIR)\open.obj \
+       $(OBJDIR)\passwddb.obj \
+       $(OBJDIR)\physical.obj \
+       $(OBJDIR)\rank1.obj \
+       $(OBJDIR)\readfile.obj \
+       $(OBJDIR)\recctrl.obj \
+       $(OBJDIR)\recgrs.obj \
+       $(OBJDIR)\recindex.obj \
+       $(OBJDIR)\recstat.obj \
+       $(OBJDIR)\rectext.obj \
+       $(OBJDIR)\regxread.obj \
+       $(OBJDIR)\res.obj \
+       $(OBJDIR)\retrieve.obj \
+       $(OBJDIR)\rootblk.obj \
+       $(OBJDIR)\rsbool.obj \
+       $(OBJDIR)\rset.obj \
+       $(OBJDIR)\rsisam.obj \
+       $(OBJDIR)\rsisamc.obj \
+       $(OBJDIR)\rsm_or.obj \
+       $(OBJDIR)\rsnull.obj \
+       $(OBJDIR)\rstemp.obj \
+       $(OBJDIR)\scan.obj \
+       $(OBJDIR)\set.obj \
+       $(OBJDIR)\sgmlread.obj \
+       $(OBJDIR)\sortidx.obj \
+       $(OBJDIR)\states.obj \
+       $(OBJDIR)\symtab.obj \
+       $(OBJDIR)\trunc.obj \
+       $(OBJDIR)\zebraapi.obj \
+       $(OBJDIR)\zebramap.obj \
+       $(OBJDIR)\zinfo.obj \
+       $(OBJDIR)\zrpn.obj \
+       $(OBJDIR)\zsets.obj \
+       $(OBJDIR)\isams.obj \
+       $(OBJDIR)\rsisams.obj 
+
+ALL_OBJS=\
+  $(ZEBRALIB_OBJS) \
+  $(ZEBRAIDX_OBJS) \
+  $(APITEST_OBJS)  \
+  $(ZSERVER_OBJS)
+
+###########################################################
+############### Compiling 
+###########################################################
+
+# Note: This defines where to look for the necessary
+# source files. Funny way of doing it, but it works.
+
+{$(SRCDIR)}.cpp{$(OBJDIR)}.obj:
+       @$(CPP) $(COPT) $<
+
+{$(SRCDIR)}.c{$(OBJDIR)}.obj:
+       @$(CPP) $(COPT) $<
+
+# ZebraLib
+{$(INDEXDIR)}.c{$(OBJDIR)}.obj:
+       @$(CPP) $(COPT) $< 
+
+{$(BFILEDIR)}.c{$(OBJDIR)}.obj:
+       @$(CPP) $(COPT) $< 
+
+{$(DFADIR)}.c{$(OBJDIR)}.obj:
+       @$(CPP) $(COPT) $< 
+
+{$(DICTDIR)}.c{$(OBJDIR)}.obj:
+       @$(CPP) $(COPT) $< 
+
+{$(ISAMSDIR)}.c{$(OBJDIR)}.obj:
+       @$(CPP) $(COPT) $< 
+
+{$(ISAMDIR)}.c{$(OBJDIR)}.obj:
+       @$(CPP) $(COPT) $< 
+
+{$(ISAMCDIR)}.c{$(OBJDIR)}.obj:
+       @$(CPP) $(COPT) $< 
+
+{$(RECCTRLDIR)}.c{$(OBJDIR)}.obj:
+       @$(CPP) $(COPT) $< 
+
+{$(RSETDIR)}.c{$(OBJDIR)}.obj:
+       @$(CPP) $(COPT) $< 
+
+{$(UTILDIR)}.c{$(OBJDIR)}.obj:
+       @$(CPP) $(COPT) $< 
+
+{$(APITESTDIR)}.c{$(OBJDIR)}.obj:
+       @$(CPP) $(COPT) $< 
+
+
+###########################################################
+############### Linking
+###########################################################
+
+$(ZSERVER) : "$(BINDIR)" $(ZSERVER_OBJS) $(ZEBRALIB) $(YAZLIBS)
+       @echo Linking the zmbol server  $(ZSERVER)
+       $(LINK) @<<
+               $(LNKOPT) 
+               $(ZSERVER_LINK_OPTIONS)
+               /out:$(ZSERVER) 
+               $(YAZLIBS)
+               $(ZEBRALIB)
+               $(BZIP2LIB)
+               $(LINK_LIBS) 
+               $(ZSERVER_OBJS) 
+<<
+
+$(ZINDEX) : "$(BINDIR)" $(ZEBRAIDX_OBJS) $(ZEBRALIB) $(YAZLIBS)
+       @echo Linking the zmbol indexer  $(ZINDEX)
+       $(LINK) @<<
+               $(LNKOPT) 
+               $(ZINDEX_LINK_OPTIONS)
+               /out:$(ZINDEX) 
+               $(YAZLIBS)
+               $(ZEBRALIB)
+               $(BZIP2LIB)
+               $(LINK_LIBS) 
+               $(ZEBRAIDX_OBJS) 
+<<
+
+$(APITEST) : "$(BINDIR)" $(APITEST_OBJS) $(ZEBRALIB) $(YAZLIBS)
+       @echo Linking the test program $(APITEST)
+       $(LINK) @<<
+               $(LNKOPT) 
+               $(APITEST_LINK_OPTIONS)
+               /out:$(APITEST) 
+               $(YAZLIBS)
+               $(ZEBRALIB)
+               $(BZIP2LIB)
+               $(LINK_LIBS) 
+               $(APITEST_OBJS) 
+<<
+
+$(ZEBRALIB) : "$(BINDIR)" $(ZEBRALIB_OBJS) 
+       @echo Linking zebra/zmbol library  $(ZEBRALIB)
+       $(LINK) $(ZEBRALIB_LINK_OPTIONS) @<<
+               /nologo
+               $(ZEBRALIB_OBJS) 
+               /out:$(ZEBRALIB) 
+<<
+
+###########################################################
+############### Special operations
+###########################################################
+
+clean:
+       del $(OBJDIR)\*.obj
+       del $(OBJDIR)\*.sbr
+       del $(APITEST)
+       del $(ZINDEX)
+       del $(ZSERVER)
+       del $(TMPDIR)\*.
+       del $(ZEBRALIB)
+
+########### check directories and create if needed
+dirs: $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR)
+
+$(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):
+       if not exist "$@/$(NUL)" mkdir "$@"
+
+###########################################################
+############### Explicit dependencies
+###########################################################
+
+$(ALL_OBJS): zmbol.mak
+
+# force recompilation of everything, if makefile changed
+
+###########################################################
+############### Log
+###########################################################
+#
+# $Log: makefile,v $
+# Revision 1.1  1999-12-08 22:11:56  adam
+# Separate WIN32 sub directories for Zebra and Z'mbol.
+#
+# Revision 1.1  1999/12/02 10:26:49  adam
+# Added zmbol makefile.
+#
+#
+
+

diff --git a/win/readme.txt b/win/readme.txt
new file mode 100644 (file)
index 0000000..7e183cd
--- /dev/null
+++ b/win/readme.txt
@@ -0,0 +1,23 @@
+Compilation for Z'mbol on WIN32.
+ $Id: readme.txt,v 1.1 1999-12-08 22:11:56 adam Exp $
+
+This software is shipped with MS nmake files. It has been tested
+on Visual C++ 6, but should work with Visual C++ 5 as well.
+
+Prerequesties:
+   yaz    - untar it at the same location as Z'mbol.
+
+Optional prerequesties:
+   bzip2  - untar it at the same location as Z'mbol.
+
+Adjust the makefile as needed. Comments in the makefile itself
+describe the most important settings.
+
+Run nmake
+
+The makefile (if un-modified) builds the following:
+
+ lib\zebra.lib       a library with most modules
+ bin\zmbolidx.exe    the indexer utility
+ bin\zmbolsrv.exe    the Z39.50 server
+

diff --git a/zebra.dsp b/zebra.dsp
deleted file mode 100644 (file)
index 7d0d342..0000000
--- a/zebra.dsp
+++ /dev/null
@@ -1,348 +0,0 @@
-# Microsoft Developer Studio Project File - Name="zebra" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
-CFG=zebra - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "zebra.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "zebra.mak" CFG="zebra - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "zebra - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "zebra - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "zebra - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "..\yaz\include" /I "..\bzip2-0.9.0c" /D "_WINDOWS" /D "WIN32" /D "NDEBUG" /D HAVE_BZLIB_H=1 /YX /FD /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ELSEIF  "$(CFG)" == "zebra - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "include" /I "..\yaz\include" /I "..\bzip2-0.9.0c" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D HAVE_BZLIB_H=1 /FR /YX /FD /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-
-!ENDIF 
-
-# Begin Target
-
-# Name "zebra - Win32 Release"
-# Name "zebra - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\index\attribute.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\bfile\bfile.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\dfa\bset.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\bfile\cfile.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\util\charmap.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\dict\close.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\bfile\commit.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\index\compact.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\dict\dclose.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\dict\dcompact.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\dict\delete.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\dfa\dfa.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\util\dirent.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\dict\dopen.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\dict\drdwr.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\dfa\imalloc.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\dict\insert.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\index\invstat.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\isam\isam.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\isamc\isamc.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\Isamc\Isams.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\isam\isutil.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\index\kcompare.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\index\lockidx.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\index\locksrv.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\index\lockutil.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\dict\lookgrep.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\dict\lookup.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\dict\lookupec.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\recctrl\marcread.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\isam\memory.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\isamc\merge.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\bfile\mfile.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\dict\open.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\util\passwddb.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\isam\physical.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\index\rank1.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\recctrl\recctrl.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\recctrl\recgrs.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\index\recindex.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\index\recstat.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\recctrl\rectext.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\recctrl\regxread.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\util\res.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\index\retrieve.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\isam\rootblk.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rset\rsbool.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rset\rset.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rset\rsisam.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rset\rsisamc.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rset\rsisams.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rset\rsm_or.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rset\rsnull.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\rset\rstemp.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\dict\scan.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\dfa\set.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\recctrl\sgmlread.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\index\sortidx.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\dfa\states.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\index\symtab.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\index\trunc.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\index\zebraapi.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\util\zebramap.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\index\zinfo.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\index\zrpn.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\index\zsets.c
-# End Source File
-# End Target
-# End Project

diff --git a/zebra.dsw b/zebra.dsw
deleted file mode 100644 (file)
index 056a37b..0000000
--- a/zebra.dsw
+++ /dev/null
@@ -1,74 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "apitest"=.\apitest\apitest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name zebra
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "zebra"=.\zebra.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "zebraidx"=.\zebraidx\zebraidx.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name zebra
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "zebrasrv"=.\zebrasrv\zebrasrv.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name zebra
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-