X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=2d73d8c22ef6d85341c501bc1c42d0b7acaa34c8;hp=a92d421c6a18dc294c2ae6f3a9e08c0f2873cc2e;hb=27d70cebc8400fd364453a6bf9445531a66872d9;hpb=31c0644406a982db1c50b963280a474efe97901a

diff --git a/win/makefile b/win/makefile
index a92d421c6..2d73d8c 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,37 +1,42 @@
 # Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.54 2006-08-14 18:12:35 adam Exp $
  
 ###########################################################
 ############### Parameters 
 ###########################################################
 
 DEBUG=0   # 0 for release, 1 for debug
+USE_MANIFEST = 0
+
+# TCL is optional - ONLY needed for source straight from Git
+TCL=tclsh
+#TCL="C:\Tcl\bin\tclsh85.exe"
+HAVE_TCL=1
 
 # 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 (x86)\Expat 2.0.1
 
 # iconv is optional
-HAVE_ICONV=1
+HAVE_ICONV=0
 ICONV_DIR=c:\iconv-1.9.2.win32
 
-# libxslt. For alvis
+# libxslt. For mod_dom and mod_alvis
 HAVE_LIBXSLT=1
-LIBXSLT_DIR=c:\libxslt-1.1.17.win32
+LIBXSLT_DIR=c:\libxslt-1.1.28.win32
 
 # libxml2. Used by libxslt
 HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.6.26.win32
-
-# zlib compression.  Used by libxml2
-ZLIB_DIR = c:\zlib-1.2.3.win32
+LIBXML2_DIR=c:\libxml2-2.9.2.win32
 
-# get WIN32 binaries libxml2 & iconv & zlib from here:
-#  http://www.zlatkovic.com/libxml.en.html
+# ICU support
+HAVE_ICU=1
+ICU_DIR=c:\icu
+ICU_LIB=$(ICU_DIR)\lib
+ICU_BIN=$(ICU_DIR)\bin
+ICU_INCLUDE=$(ICU_DIR)\include
 
 default: all
-
-all: dirs expat iconv libxml2 libxslt yaz dll zserver zebraidx tstflock
+all: dirs generate expat iconv yaz dll zserver zebraidx tstflock
 
 # Directories
 # The current directory is supposed to be something like
@@ -39,18 +44,23 @@ all: dirs expat iconv libxml2 libxslt yaz dll zserver zebraidx tstflock
 ROOTDIR=..   # The home of zebra
 
 # YAZ include files, libraries, etc.
-YAZDIR=$(ROOTDIR)\..\YAZ
-YAZINCL=$(YAZDIR)\include
-YAZLIBS=$(YAZLIB)
+YAZDIR=$(ROOTDIR)\..\yaz  # or \program files\yaz
+
 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\yaz5d.lib"
+!if $(HAVE_ICU)
+YAZLIB=$(YAZLIB) "$(YAZDIR)\lib\yaz_icu5d.lib"
+!endif
+YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz5d.dll"
+YAZ_DLL_TARGET="$(BINDIR)\yaz5d.dll"
 !else
-YAZLIB=$(YAZDIR)\lib\yaz.lib
-YAZ_DLL_SOURCE=$(YAZBINDIR)\yaz.dll
-YAZ_DLL_TARGET=$(BINDIR)\yaz.dll
+YAZLIB="$(YAZDIR)\lib\yaz5.lib"
+!if $(HAVE_ICU)
+YAZLIB=$(YAZLIB) "$(YAZDIR)\lib\yaz_icu5.lib"
+!endif
+YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz5.dll"
+YAZ_DLL_TARGET="$(BINDIR)\yaz5.dll"
 !endif
 
 # BZIP2 settings. Uncomment and specify if you wish to use LIBBZIP2.
@@ -91,7 +101,7 @@ TMP=$(TMPDIR)
 TEMP=$(TMPDIR)
 
 # NSIS
-NSIS="c:\program files\nsis\makensis.exe"
+NSIS="c:\program files (x86)\nsis\makensis.exe"
 
 dist:
 	nmake DEBUG=1 clean
@@ -112,8 +122,6 @@ DLL=$(BINDIR)\idzebra.dll
 IMPLIB=$(LIBDIR)\idzebra.lib
 !endif
 
-ZEBRA_RES=$(OBJDIR)\idzebra.res
-
 ZSERVER=$(BINDIR)\zebrasrv.exe
 ZEBRAIDX=$(BINDIR)\zebraidx.exe
 TSTFLOCK=$(BINDIR)\tstflock.exe
@@ -128,9 +136,9 @@ dll: $(DLL)
 
 !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)
@@ -158,43 +166,41 @@ iconv:
 
 !if $(HAVE_LIBXML2)
 LIBXML2_LIB="$(LIBXML2_DIR)\lib\libxml2.lib"
-LIBXML2_DEF=/D HAVE_XML2=1 /I"$(LIBXML2_DIR)\include"
-libxml2: $(BINDIR)\libxml2.dll $(BINDIR)\zlib1.dll
-
-$(BINDIR)\libxml2.dll:
-  copy "$(LIBXML2_DIR)\bin\libxml2.dll" $(BINDIR)
-
-$(BINDIR)\zlib1.dll:
-  copy "$(ZLIB_DIR)\bin\zlib1.dll" $(BINDIR)
-
+LIBXML2_DEF=/DYAZ_HAVE_XML2=1 /D HAVE_XML2=1 /I"$(LIBXML2_DIR)\include\libxml2"
 !else
 LIBXML2_LIB=
 LIBXML2_DEF=/D HAVE_XML2=0
-libxml2: 
-
 !endif
 
 !if $(HAVE_LIBXSLT)
 LIBXSLT_LIB="$(LIBXSLT_DIR)\lib\libxslt.lib"
 LIBXSLT_DEF=/D HAVE_XSLT=1 /I"$(LIBXSLT_DIR)\include"
-libxslt: $(BINDIR)\libxslt.dll 
-
-$(BINDIR)\libxslt.dll:
-  copy "$(LIBXSLT_DIR)\bin\libxslt.dll" $(BINDIR)
-
 !else
 LIBXSLT_LIB=
 LIBXSLT_DEF=/D HAVE_XSLT=0
-libxslt: 
 
 !endif
 
+!if $(HAVE_ICU)
+ICU_DEF= /DYAZ_HAVE_ICU=1 /I"$(ICU_INCLUDE)"
+ICU_LIBS= $(ICU_LIB)\icudt.lib $(ICU_LIB)\icuin.lib $(ICU_LIB)\icuuc.lib
+!else
+ICU_DEF=  /DYAZ_HAVE_ICU=0
+ICU_LIBS=
+!endif
+
 !if $(HAVE_LIBXSLT)
-MOD_ALVIS_OBJS= $(OBJDIR)\alvis.obj
+MOD_ALVIS_OBJS= $(OBJDIR)\mod_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)
@@ -203,15 +209,15 @@ MOD_ALVIS_CFLAGS=
 
 COMMON_C_OPTIONS=          \
   /nologo /W3 /EHsc /FD /c \
-  /D "WIN32"               \
-  /D"_CONSOLE" /D"_MBCS"   \
   /DYAZ_USE_NEW_LOG=1      \
   /D"_CRT_SECURE_NO_DEPRECATE" \
   /D"_CRT_NONSTDC_NO_DEPRECATE" \
+  /D "WIN32"               \
   $(ICONV_DEF)             \
   $(EXPAT_DEF)             \
   $(LIBXML2_DEF)           \
   $(LIBXSLT_DEF)           \
+  $(ICU_DEF)               \
   /FR"$(OBJDIR)\\"         \
   /Fo"$(OBJDIR)\\"         \
   /Fd"$(OBJDIR)\\"         \
@@ -224,6 +230,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)
 
@@ -233,11 +240,11 @@ COMMON_C_INCLUDES= \
   $(BZIP2INCLUDE)
 
 DEBUG_C_OPTIONS=  \
-  /D "_DEBUG"      \
-  /MDd  /Od /YX /Zi /Gm
+  /D "_DEBUG"     \
+  /MDd /Od /Zi /Gm
 
-RELEASE_C_OPTIONS=  \
-  /D "NDEBUG"        \
+RELEASE_C_OPTIONS= \
+  /D "NDEBUG"      \
   /MD /O2
 
 # /W3  = warning level
@@ -259,11 +266,16 @@ RELEASE_C_OPTIONS=  \
 ### 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 \
-	   $(ICONV_LIB) $(EXPAT_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
+!if $(USE_MANIFEST)
+MT=mt.exe /nologo
+!else
+MT=echo
+!endif
+
+# wsock32.lib  advapi32.lib \
+
+LINK_LIBS= kernel32.lib advapi32.lib \
+	   $(ICONV_LIB) $(EXPAT_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB) $(ICU_LIBS)
 
 COMMON_LNK_OPTIONS= /nologo /machine:i386 /incremental:no
 
@@ -295,31 +307,41 @@ LINK_PROGRAM= $(LINK) \
 		$(LNKOPT) \
 		$(CLIENT_LINK_OPTIONS) \
 		$(IMPLIB) \
-		$(YAZLIBS) \
+		$(YAZLIB) \
 		$(BZIP2LIB) \
 		$(LINK_LIBS)
 
+
+# Generated sources
+generate: $(INCLDIR)\idzebra\version.h
+
+$(INCLDIR)\idzebra\version.h: $(ROOTDIR)/IDMETA 
+	@cd $(ROOTDIR)\util
+	$(TCL) mk_version.tcl $(ROOTDIR)/IDMETA $(INCLDIR)\idzebra\version.h
+
 # 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 
+	$(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 \
@@ -352,7 +374,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 \
@@ -360,16 +384,17 @@ 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 \
 	$(OBJDIR)\marcomp.obj \
-	$(OBJDIR)\marcread.obj \
+	$(OBJDIR)\mod_grs_marc.obj \
 	$(OBJDIR)\merge.obj \
 	$(OBJDIR)\mfile.obj \
 	$(OBJDIR)\open.obj \
@@ -380,16 +405,19 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\rankstatic.obj \
 	$(OBJDIR)\recctrl.obj \
 	$(OBJDIR)\recgrs.obj \
+	$(OBJDIR)\records.obj \
 	$(OBJDIR)\recindex.obj \
 	$(OBJDIR)\reckeys.obj \
-	$(OBJDIR)\recstat.obj \
-	$(OBJDIR)\rectext.obj \
-	$(OBJDIR)\regxread.obj \
+	$(OBJDIR)\mod_text.obj \
+	$(OBJDIR)\mod_grs_regx.obj \
 	$(OBJDIR)\res.obj \
 	$(OBJDIR)\retrieve.obj \
+	$(OBJDIR)\rpnscan.obj \
+	$(OBJDIR)\rpnsearch.obj \
 	$(OBJDIR)\rsbetween.obj \
 	$(OBJDIR)\rsbool.obj \
 	$(OBJDIR)\rset.obj \
+	$(OBJDIR)\rset_isam.obj \
 	$(OBJDIR)\rsisamb.obj \
 	$(OBJDIR)\rsisamc.obj \
 	$(OBJDIR)\rsisams.obj \
@@ -397,25 +425,29 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\rsnull.obj \
 	$(OBJDIR)\rsprox.obj \
 	$(OBJDIR)\rstemp.obj \
-	$(OBJDIR)\safari.obj \
+	$(OBJDIR)\mod_safari.obj \
 	$(OBJDIR)\scan.obj \
 	$(OBJDIR)\set.obj \
-	$(OBJDIR)\sgmlread.obj \
+	$(OBJDIR)\mod_grs_sgml.obj \
 	$(OBJDIR)\snippet.obj \
 	$(OBJDIR)\sortidx.obj \
 	$(OBJDIR)\states.obj \
-	$(OBJDIR)\symtab.obj \
+	$(OBJDIR)\stream.obj \
+	$(OBJDIR)\strmap.obj \
+	$(OBJDIR)\su_codec.obj \
+	$(OBJDIR)\trunc.obj \
+	$(OBJDIR)\untrans.obj \
 	$(OBJDIR)\update_path.obj \
 	$(OBJDIR)\update_file.obj \
-	$(OBJDIR)\trunc.obj \
-	$(OBJDIR)\xmlread.obj \
+	$(OBJDIR)\version.obj \
+	$(OBJDIR)\mod_grs_xml.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
 
 # Compiling 
@@ -455,30 +487,44 @@ ZEBRALIB_OBJS= \
 # Linking
 
 $(ZSERVER) : "$(BINDIR)" $(ZSERVER_OBJS) $(IMPLIB)
-	$(LINK_PROGRAM) \
-		$(ZSERVER_OBJS) \
-		/out:$(ZSERVER)
+	$(LINK_PROGRAM) $(ZSERVER_OBJS)  /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZEBRAIDX) : "$(BINDIR)" $(ZEBRAIDX_OBJS) $(IMPLIB)
-	$(LINK_PROGRAM) \
-		$(ZEBRAIDX_OBJS) \
-		/out:$(ZEBRAIDX)
+	$(LINK_PROGRAM) $(ZEBRAIDX_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(TSTFLOCK) : "$(BINDIR)" $(TSTFLOCK_OBJS) $(IMPLIB)
-	$(LINK_PROGRAM) \
-		$(TSTFLOCK_OBJS) \
-		/out:$(TSTFLOCK) 
+	$(LINK_PROGRAM) $(TSTFLOCK_OBJS) /out:$@
+	$(MT) -manifest $@.manifest -outputresource:$@;1
+
+# Resources
+RES=$(OBJDIR)\zebra.res
+RC=$(WINDIR)\zebra.rc
+
+RSC=rc.exe
+!if $(DEBUG)
+RSOPT=/d_DEBUG
+!else
+RSOPT=/d_NDEBUG
+!endif
+
+
+$(RES): $(RC)
+	$(RSC) $(RSOPT) /I"../include" /I"$(YAZDIR)\include" /fo"$(RES)" $(RC)
 
-$(DLL) $(IMPLIB): "$(BINDIR)" $(ZEBRALIB_OBJS)
+$(DLL) $(IMPLIB): "$(BINDIR)" $(ZEBRALIB_OBJS) $(RES)
 	$(LINK) \
 		$(LNKOPT) \
 		$(LINK_LIBS) \
 		$(DLL_LINK_OPTIONS) \
 		$(ZEBRALIB_OBJS) \
-		/out:$(DLL) \
-		$(YAZLIBS) \
+		$(RES) \
+		/out:$@ \
+		$(YAZLIB) \
 		/implib:"$(IMPLIB)" \
-		/map:"$(LIBDIR)\idzebra.map" \
+		/map:"$(LIBDIR)\idzebra.map" 
+	$(MT) -manifest $@.manifest -outputresource:$@;2
 
 # Other rules
 
@@ -498,7 +544,7 @@ $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):
 yaz: $(YAZ_DLL_TARGET)
 
 $(YAZ_DLL_TARGET) : $(YAZ_DLL_SOURCE)
-#	copy $(YAZBINDIR)\*.dll.manifest $(BINDIR)
-	copy $(YAZBINDIR)\*.dll $(BINDIR)
+#	copy "$(YAZBINDIR)\*.dll.manifest" $(BINDIR)
+	copy "$(YAZBINDIR)\*.dll" $(BINDIR)