X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=3d8acbd2454314a1736f7ff69d4f861738468d90;hp=7413f629e4f9ad18588599de65f3fe0e8164241e;hb=5690a02eb4b66139814483dab8e7a5b5fcb74a55;hpb=fa33f4e91645cc757624b7b237cbd4fdf5bd8d18

diff --git a/win/makefile b/win/makefile
index 7413f62..3d8acbd 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.50 2006-06-07 10:01:11 adam Exp $
+# $Id: makefile,v 1.65 2007-08-22 12:36:22 adam Exp $
  
 ###########################################################
 ############### Parameters 
@@ -9,19 +9,19 @@ DEBUG=0   # 0 for release, 1 for debug
 
 # EXPAT is optional. It's required for grs.xml-filters.
 HAVE_EXPAT=1
-EXPAT_DIR=c:\Expat-1.95.8
+EXPAT_DIR=c:\Program files\Expat 2.0.1
 
 # iconv is optional
 HAVE_ICONV=1
-ICONV_DIR=c:\iconv-1.9.1.win32
+ICONV_DIR=c:\iconv-1.9.2.win32
 
 # libxslt. For alvis
 HAVE_LIBXSLT=1
-LIBXSLT_DIR=c:\libxslt-1.1.14.win32
+LIBXSLT_DIR=c:\libxslt-1.1.19.win32
 
 # libxml2. Used by libxslt
 HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.6.20.win32
+LIBXML2_DIR=c:\libxml2-2.6.28.win32
 
 # zlib compression.  Used by libxml2
 ZLIB_DIR = c:\zlib-1.2.3.win32
@@ -31,28 +31,27 @@ ZLIB_DIR = c:\zlib-1.2.3.win32
 
 default: all
 
-all: dirs expat iconv libxml2 libxslt yaz dll zserver zindex 
+all: dirs expat iconv libxml2 libxslt yaz dll zserver zebraidx tstflock
 
-###########################################################
-############### Directories
-###########################################################
+# Directories
 # The current directory is supposed to be something like
 # ..../Zebra/Win, everything is relative to that
 ROOTDIR=..   # The home of zebra
 
 # YAZ include files, libraries, etc.
-YAZDIR=$(ROOTDIR)\..\YAZ
+YAZDIR=$(ROOTDIR)\..\yaz  # or \program files\yaz
+
 YAZINCL=$(YAZDIR)\include
 YAZLIBS=$(YAZLIB)
 YAZBINDIR=$(YAZDIR)\bin
 !if $(DEBUG)
-YAZLIB=$(YAZDIR)\lib\yazd.lib
-YAZ_DLL_SOURCE=$(YAZBINDIR)\yazd.dll
-YAZ_DLL_TARGET=$(BINDIR)\yazd.dll
+YAZLIB="$(YAZDIR)\lib\yaz3d.lib"
+YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz3d.dll"
+YAZ_DLL_TARGET="$(BINDIR)\yaz3d.dll"
 !else
-YAZLIB=$(YAZDIR)\lib\yaz.lib
-YAZ_DLL_SOURCE=$(YAZBINDIR)\yaz.dll
-YAZ_DLL_TARGET=$(BINDIR)\yaz.dll
+YAZLIB="$(YAZDIR)\lib\yaz3.lib"
+YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz3.dll"
+YAZ_DLL_TARGET="$(BINDIR)\yaz3.dll"
 !endif
 
 # BZIP2 settings. Uncomment and specify if you wish to use LIBBZIP2.
@@ -80,14 +79,11 @@ BFILEDIR=$(SRCDIR)\BFILE
 DFADIR=$(SRCDIR)\DFA
 DICTDIR=$(SRCDIR)\DICT
 ISAMSDIR=$(SRCDIR)\ISAMS
-ISAMDIR=$(SRCDIR)\ISAM
 ISAMCDIR=$(SRCDIR)\ISAMC
 ISAMBDIR=$(SRCDIR)\ISAMB
-RECCTRLDIR=$(SRCDIR)\RECCTRL
 RSETDIR=$(SRCDIR)\RSET
 UTILDIR=$(SRCDIR)\UTIL
 DATA1DIR=$(SRCDIR)\DATA1
-APITESTDIR=$(SRCDIR)\APITEST
 
 # Force temp files in a local temp, easier to clean
 # when nmake crashes and leaves a lot of rubbish behind
@@ -107,9 +103,7 @@ dist:
 nsis:
 	$(NSIS) zebra.nsi
 
-###########################################################
-############### Targets - what to make
-###########################################################
+# Targets - what to make
 
 !if $(DEBUG)
 DLL=$(BINDIR)\idzebrad.dll
@@ -122,25 +116,22 @@ IMPLIB=$(LIBDIR)\idzebra.lib
 ZEBRA_RES=$(OBJDIR)\idzebra.res
 
 ZSERVER=$(BINDIR)\zebrasrv.exe
-ZINDEX=$(BINDIR)\zebraidx.exe
-APITEST=$(BINDIR)\apitest.exe
+ZEBRAIDX=$(BINDIR)\zebraidx.exe
 TSTFLOCK=$(BINDIR)\tstflock.exe
 
 # shortcut names defined here
-zindex: $(ZINDEX)
+zebraidx: $(ZEBRAIDX)
 zserver: $(ZSERVER)
-apitest: $(APITEST)
 tstflock: $(TSTFLOCK)
 dll: $(DLL) 
-###########################################################
-############### Compiler and linker options 
-###########################################################
+
+# External libs and modules (enabled or disabled)
 
 !if $(HAVE_EXPAT)
 EXPAT_DEF= /D HAVE_EXPAT_H=1 /I"$(EXPAT_DIR)\source\lib"
-EXPAT_LIB= "$(EXPAT_DIR)\libs\libexpat.lib"
-EXPAT_DLL_SOURCE= "$(EXPAT_DIR)\libs\libexpat.dll"
-EXPAT_DLL_TARGET="$(BINDIR)\libexpat.dll"
+EXPAT_LIB= "$(EXPAT_DIR)\bin\libexpat.lib"
+EXPAT_DLL_SOURCE= "$(EXPAT_DIR)\bin\libexpat.dll"
+EXPAT_DLL_TARGET= "$(BINDIR)\libexpat.dll"
 expat: $(EXPAT_DLL_TARGET)
 
 $(EXPAT_DLL_TARGET) : $(EXPAT_DLL_SOURCE)
@@ -168,7 +159,7 @@ iconv:
 
 !if $(HAVE_LIBXML2)
 LIBXML2_LIB="$(LIBXML2_DIR)\lib\libxml2.lib"
-LIBXML2_DEF=/D HAVE_XML2=1 /I"$(LIBXML2_DIR)\include"
+LIBXML2_DEF=/DYAZ_HAVE_XML2=1 /D HAVE_XML2=1 /I"$(LIBXML2_DIR)\include"
 libxml2: $(BINDIR)\libxml2.dll $(BINDIR)\zlib1.dll
 
 $(BINDIR)\libxml2.dll:
@@ -202,9 +193,15 @@ libxslt:
 !if $(HAVE_LIBXSLT)
 MOD_ALVIS_OBJS= $(OBJDIR)\alvis.obj
 MOD_ALVIS_CFLAGS=/DIDZEBRA_STATIC_ALVIS=1
+
+MOD_DOM_OBJS= $(OBJDIR)\mod_dom.obj
+MOD_DOM_CFLAGS=/DIDZEBRA_STATIC_DOM=1
 !else
 MOD_ALVIS_OBJS=
 MOD_ALVIS_CFLAGS=
+
+MOD_DOM_OBJS=
+MOD_DOM_CFLAGS=
 !endif
 
 ### C and CPP compiler  (the same thing)
@@ -234,6 +231,7 @@ COMMON_C_OPTIONS=          \
   /DIDZEBRA_STATIC_GRS_MARC=1 \
   /DIDZEBRA_STATIC_GRS_DANBIB=1 \
   $(MOD_ALVIS_CFLAGS) \
+  $(MOD_DOM_CFLAGS) \
   /DIDZEBRA_STATIC_SAFARI=1 \
   $(BZIP2DEF)
 
@@ -285,9 +283,7 @@ ZEBRALIB_LINK_OPTIONS= -lib
 
 DLL_LINK_OPTIONS= /dll  
 
-ZSERVER_LINK_OPTIONS= /subsystem:console  
-ZINDEX_LINK_OPTIONS= /subsystem:console  
-APITEST_LINK_OPTIONS= /subsystem:console  
+CLIENT_LINK_OPTIONS= /subsystem:console  
 
 # Final opt variables
 !if $(DEBUG)
@@ -303,32 +299,37 @@ RCOPT=  $(COMMON_RC_OPTIONS)  $(RELEASE_RC_OPTIONS)
 LNKOPT= $(COMMON_LNK_OPTIONS) $(RELEASE_LNK_OPTIONS) $(LNK_LIBS)
 !endif
 
-###########################################################
-###############  Source and object modules
-###########################################################
+LINK_PROGRAM= $(LINK) \
+		$(LNKOPT) \
+		$(CLIENT_LINK_OPTIONS) \
+		$(IMPLIB) \
+		$(YAZLIBS) \
+		$(BZIP2LIB) \
+		$(LINK_LIBS)
 
+# 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 
+	$(OBJDIR)\zebrasrv.obj 
 
 ZEBRAIDX_OBJS= \
-	$(OBJDIR)\main.obj 
-APITEST_OBJS= \
-	$(OBJDIR)\apitest.obj
+	$(OBJDIR)\zebraidx.obj 
 TSTFLOCK_OBJS= \
 	$(OBJDIR)\tstflock.obj
 
 ZEBRALIB_OBJS= \
         $(MOD_ALVIS_OBJS) \
+        $(MOD_DOM_OBJS) \
 	$(OBJDIR)\atoi_zn.obj \
 	$(OBJDIR)\attribute.obj \
 	$(OBJDIR)\attrfind.obj \
 	$(OBJDIR)\bfile.obj \
 	$(OBJDIR)\bset.obj \
 	$(OBJDIR)\cfile.obj \
+	$(OBJDIR)\check_res.obj \
 	$(OBJDIR)\charmap.obj \
 	$(OBJDIR)\close.obj \
 	$(OBJDIR)\commit.obj \
@@ -349,6 +350,7 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\d1_sumout.obj \
 	$(OBJDIR)\d1_sutrs.obj \
 	$(OBJDIR)\d1_tagset.obj \
+	$(OBJDIR)\d1_utils.obj \
 	$(OBJDIR)\d1_varset.obj \
 	$(OBJDIR)\d1_write.obj \
 	$(OBJDIR)\dclose.obj \
@@ -360,7 +362,9 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\dirs.obj \
 	$(OBJDIR)\dopen.obj \
 	$(OBJDIR)\drdwr.obj \
+	$(OBJDIR)\exit.obj \
 	$(OBJDIR)\extract.obj \
+	$(OBJDIR)\flock.obj \
 	$(OBJDIR)\imalloc.obj \
 	$(OBJDIR)\inline.obj \
 	$(OBJDIR)\insert.obj \
@@ -368,11 +372,12 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\isamb.obj \
 	$(OBJDIR)\isamc.obj \
 	$(OBJDIR)\isams.obj \
-	$(OBJDIR)\kcompare.obj \
+	$(OBJDIR)\isam_methods.obj \
+	$(OBJDIR)\it_key.obj \
 	$(OBJDIR)\kcontrol.obj \
+	$(OBJDIR)\key_block.obj \
 	$(OBJDIR)\kinput.obj \
 	$(OBJDIR)\limit.obj \
-	$(OBJDIR)\flock.obj \
 	$(OBJDIR)\lookgrep.obj \
 	$(OBJDIR)\lookup.obj \
 	$(OBJDIR)\lookupec.obj \
@@ -395,6 +400,8 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\regxread.obj \
 	$(OBJDIR)\res.obj \
 	$(OBJDIR)\retrieve.obj \
+	$(OBJDIR)\rpnscan.obj \
+	$(OBJDIR)\rpnsearch.obj \
 	$(OBJDIR)\rsbetween.obj \
 	$(OBJDIR)\rsbool.obj \
 	$(OBJDIR)\rset.obj \
@@ -412,41 +419,27 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\snippet.obj \
 	$(OBJDIR)\sortidx.obj \
 	$(OBJDIR)\states.obj \
+	$(OBJDIR)\stream.obj \
+	$(OBJDIR)\su_codec.obj \
 	$(OBJDIR)\symtab.obj \
+	$(OBJDIR)\trunc.obj \
+	$(OBJDIR)\untrans.obj \
 	$(OBJDIR)\update_path.obj \
 	$(OBJDIR)\update_file.obj \
-	$(OBJDIR)\trunc.obj \
 	$(OBJDIR)\xmlread.obj \
 	$(OBJDIR)\xpath.obj \
+	$(OBJDIR)\zaptterm.obj \
 	$(OBJDIR)\zebra-lock.obj \
 	$(OBJDIR)\zebraapi.obj \
 	$(OBJDIR)\zebramap.obj \
 	$(OBJDIR)\zinfo.obj \
 	$(OBJDIR)\zint.obj \
-	$(OBJDIR)\zrpn.obj \
-	$(OBJDIR)\zsets.obj \
-	$(OBJDIR)\zvrank.obj 
-
-ALL_OBJS=\
-  $(ZEBRALIB_OBJS) \
-  $(ZEBRAIDX_OBJS) \
-  $(APITEST_OBJS)  \
-  $(ZSERVER_OBJS)
-
-###########################################################
-############### Compiling 
-###########################################################
+	$(OBJDIR)\zsets.obj
 
+# 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) $< 
 
@@ -462,18 +455,12 @@ ALL_OBJS=\
 {$(ISAMSDIR)}.c{$(OBJDIR)}.obj:
 	$(CPP) $(COPT) $< 
 
-{$(ISAMDIR)}.c{$(OBJDIR)}.obj:
-	$(CPP) $(COPT) $< 
-
 {$(ISAMCDIR)}.c{$(OBJDIR)}.obj:
 	$(CPP) $(COPT) $< 
 
 {$(ISAMBDIR)}.c{$(OBJDIR)}.obj:
 	$(CPP) $(COPT) $< 
 
-{$(RECCTRLDIR)}.c{$(OBJDIR)}.obj:
-	$(CPP) $(COPT) $< 
-
 {$(RSETDIR)}.c{$(OBJDIR)}.obj:
 	$(CPP) $(COPT) $< 
 
@@ -483,91 +470,44 @@ ALL_OBJS=\
 {$(DATA1DIR)}.c{$(OBJDIR)}.obj:
 	$(CPP) $(COPT) $< 
 
-{$(APITESTDIR)}.c{$(OBJDIR)}.obj:
-	$(CPP) $(COPT) $< 
-
-###########################################################
-############### Linking
-###########################################################
+# Linking
 
 $(ZSERVER) : "$(BINDIR)" $(ZSERVER_OBJS) $(IMPLIB)
-	@echo Linking the server $(ZSERVER)
-	$(LINK) @<<
-		$(LNKOPT) 
-		$(ZSERVER_LINK_OPTIONS)
-		/out:$(ZSERVER) 
-		$(IMPLIB)
-		$(YAZLIBS)
-		$(BZIP2LIB)
-		$(LINK_LIBS) 
-		$(ZSERVER_OBJS) 
-<<
-
-$(ZINDEX) : "$(BINDIR)" $(ZEBRAIDX_OBJS)  $(IMPLIB)
-	@echo Linking the indexer $(ZINDEX)
-	$(LINK) @<<
-		$(LNKOPT) 
-		$(ZINDEX_LINK_OPTIONS)
-		/out:$(ZINDEX) 
-		$(IMPLIB)
-		$(YAZLIBS)
-		$(BZIP2LIB)
-		$(LINK_LIBS) 
-		$(ZEBRAIDX_OBJS) 
-<<
-
-$(APITEST) : "$(BINDIR)" $(APITEST_OBJS) $(YAZLIBS)
-	@echo Linking the test program $(APITEST)
-	$(LINK) @<<
-		$(LNKOPT) 
-		$(APITEST_LINK_OPTIONS)
-		/out:$(APITEST) 
-		$(IMPLIB)
-		$(YAZLIBS)
-		$(BZIP2LIB)
-		$(LINK_LIBS) 
-		$(APITEST_OBJS)
-<<
-
-$(TSTFLOCK) : "$(BINDIR)" $(TSTFLOCK_OBJS)  $(IMPLIB)
-	@echo Linking $(TSTFLOCK)
-	$(LINK) @<<
-		$(LNKOPT) 
-		$(TSTFLOCK_LINK_OPTIONS)
+	$(LINK_PROGRAM) \
+		$(ZSERVER_OBJS) \
+		/out:$(ZSERVER)
+
+$(ZEBRAIDX) : "$(BINDIR)" $(ZEBRAIDX_OBJS) $(IMPLIB)
+	$(LINK_PROGRAM) \
+		$(ZEBRAIDX_OBJS) \
+		/out:$(ZEBRAIDX)
+
+$(TSTFLOCK) : "$(BINDIR)" $(TSTFLOCK_OBJS) $(IMPLIB)
+	$(LINK_PROGRAM) \
+		$(TSTFLOCK_OBJS) \
 		/out:$(TSTFLOCK) 
-		$(IMPLIB)
-		$(YAZLIBS)
-		$(BZIP2LIB)
-		$(LINK_LIBS) 
-		$(TSTFLOCK_OBJS) 
-<<
-
 
 $(DLL) $(IMPLIB): "$(BINDIR)" $(ZEBRALIB_OBJS)
-	@echo Linking the dll  $(DLL)
-	$(LINK) @<<
-		$(LNKOPT) 
-		$(LINK_LIBS) 
-		$(DLL_LINK_OPTIONS)
-		$(ZEBRALIB_OBJS)
-		/out:$(DLL) 
-		$(YAZLIBS)
-		/implib:"$(IMPLIB)"
-		/map:"$(LIBDIR)\idzebra.map"  
-<<
-
-###########################################################
-############### Special operations
-###########################################################
+	$(LINK) \
+		$(LNKOPT) \
+		$(LINK_LIBS) \
+		$(DLL_LINK_OPTIONS) \
+		$(ZEBRALIB_OBJS) \
+		/out:$(DLL) \
+		$(YAZLIBS) \
+		/implib:"$(IMPLIB)" \
+		/map:"$(LIBDIR)\idzebra.map" \
+
+# Other rules
 
 clean:
 	-del $(OBJDIR)\*.obj
 	-del $(OBJDIR)\*.sbr
 	-del $(BINDIR)\*.exe
+	-del $(BINDIR)\*.dll
 	-del $(TMPDIR)\*.
 	-del $(LIBDIR)\*.lib
 
-########### check directories and create if needed
 dirs: $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR)
 
 $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):
@@ -576,14 +516,7 @@ $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):
 yaz: $(YAZ_DLL_TARGET)
 
 $(YAZ_DLL_TARGET) : $(YAZ_DLL_SOURCE)
-	copy $(YAZBINDIR)\*.dll $(BINDIR)
+#	copy "$(YAZBINDIR)\*.dll.manifest" $(BINDIR)
+	copy "$(YAZBINDIR)\*.dll" $(BINDIR)
 
-###########################################################
-############### Explicit dependencies
-###########################################################
-
-# $(ALL_OBJS): makefile
 
-# force recompilation of everything, if makefile changed
-
-###########################################################