X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=40cb077f84e007584ecc876e27d1eed321def2e8;hp=313a2f650725be9fe8464f86076275cbcda6b6c3;hb=b3679b1ecd730266f70a62347f66e5964a2fa030;hpb=571cd02bff379234c2eeaf95fdd6b9c038d5b3de

diff --git a/win/makefile b/win/makefile
index 313a2f6..40cb077 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # Zebra makefile for MS NMAKE
-# $Id: makefile,v 1.61 2006-12-06 13:00:12 adam Exp $
+# $Id: makefile,v 1.75 2008-01-18 11:33:36 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.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.19.win32
 
 # libxml2. Used by libxslt
 HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.6.26.win32
+LIBXML2_DIR=c:\libxml2-2.6.28.win32
 
 # zlib compression.  Used by libxml2
 ZLIB_DIR = c:\zlib-1.2.3.win32
@@ -29,9 +29,14 @@ ZLIB_DIR = c:\zlib-1.2.3.win32
 # get WIN32 binaries libxml2 & iconv & zlib from here:
 #  http://www.zlatkovic.com/libxml.en.html
 
-default: all
+# ICU support
+# get icu libraries from http://www.icu-project.org
+HAVE_ICU=1
+ICU_DIR=c:\icu
+
 
-all: dirs expat iconv libxml2 libxslt yaz dll zserver zebraidx tstflock
+default: all
+all: dirs expat iconv libxml2 libxslt icu yaz dll zserver zebraidx tstflock
 
 # Directories
 # The current directory is supposed to be something like
@@ -41,17 +46,21 @@ ROOTDIR=..   # The home of zebra
 # YAZ include files, libraries, etc.
 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"
+!if $(HAVE_ICU)
+YAZLIB=$(YAZLIB) "$(YAZDIR)\lib\yaz_icu3d.lib"
+!endif
+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"
+!if $(HAVE_ICU)
+YAZLIB=$(YAZLIB) "$(YAZDIR)\lib\yaz_icu3.lib"
+!endif
+YAZ_DLL_SOURCE="$(YAZBINDIR)\yaz3.dll"
+YAZ_DLL_TARGET="$(BINDIR)\yaz3.dll"
 !endif
 
 # BZIP2 settings. Uncomment and specify if you wish to use LIBBZIP2.
@@ -113,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
@@ -129,13 +136,13 @@ 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)"
-	copy "$(EXPAT_DLL_SOURCE)" "$(EXPAT_DLL_TARGET)"
+$(EXPAT_DLL_TARGET) : $(EXPAT_DLL_SOURCE)
+	copy $(EXPAT_DLL_SOURCE) $(EXPAT_DLL_TARGET)
 !else
 EXPAT_DEF= /D HAVE_EXPAT_H=0
 EXPAT_LIB=
@@ -159,7 +166,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:
@@ -190,12 +197,35 @@ libxslt:
 
 !endif
 
+!if $(HAVE_ICU)
+ICU_DEF= /DYAZ_HAVE_ICU=1  /I"$(ICU_DIR)\include"
+ICU_LIB= $(ICU_DIR)\lib\icudt.lib $(ICU_DIR)\lib\icuin.lib $(ICU_DIR)\lib\icuuc.lib
+icu: $(BINDIR)\icudt38.dll $(BINDIR)\icuin38.dll $(BINDIR)\icuuc38.dll
+
+$(BINDIR)\icudt38.dll:
+	  copy "$(ICU_DIR)\bin\icudt38.dll" $(BINDIR)
+$(BINDIR)\icuin38.dll:
+	  copy "$(ICU_DIR)\bin\icuin38.dll" $(BINDIR)
+$(BINDIR)\icuuc38.dll:
+	  copy "$(ICU_DIR)\bin\icuuc38.dll" $(BINDIR)
+!else
+ICU_DEF=  /DYAZ_HAVE_ICU=0
+ICU_LIB=
+icu:
+!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)
@@ -213,6 +243,7 @@ COMMON_C_OPTIONS=          \
   $(EXPAT_DEF)             \
   $(LIBXML2_DEF)           \
   $(LIBXSLT_DEF)           \
+  $(ICU_DEF)               \
   /FR"$(OBJDIR)\\"         \
   /Fo"$(OBJDIR)\\"         \
   /Fd"$(OBJDIR)\\"         \
@@ -225,6 +256,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)
 
@@ -264,7 +296,7 @@ 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)
+	   $(ICONV_LIB) $(EXPAT_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB) $(ICU_LIB)
 
 COMMON_LNK_OPTIONS= /nologo /machine:i386 /incremental:no
 
@@ -296,7 +328,7 @@ LINK_PROGRAM= $(LINK) \
 		$(LNKOPT) \
 		$(CLIENT_LINK_OPTIONS) \
 		$(IMPLIB) \
-		$(YAZLIBS) \
+		$(YAZLIB) \
 		$(BZIP2LIB) \
 		$(LINK_LIBS)
 
@@ -315,6 +347,7 @@ TSTFLOCK_OBJS= \
 
 ZEBRALIB_OBJS= \
         $(MOD_ALVIS_OBJS) \
+        $(MOD_DOM_OBJS) \
 	$(OBJDIR)\atoi_zn.obj \
 	$(OBJDIR)\attribute.obj \
 	$(OBJDIR)\attrfind.obj \
@@ -374,7 +407,7 @@ ZEBRALIB_OBJS= \
 	$(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 \
@@ -385,11 +418,11 @@ 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 \
@@ -397,6 +430,7 @@ ZEBRALIB_OBJS= \
 	$(OBJDIR)\rsbetween.obj \
 	$(OBJDIR)\rsbool.obj \
 	$(OBJDIR)\rset.obj \
+	$(OBJDIR)\rset_isam.obj \
 	$(OBJDIR)\rsisamb.obj \
 	$(OBJDIR)\rsisamc.obj \
 	$(OBJDIR)\rsisams.obj \
@@ -404,21 +438,22 @@ 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)\stream.obj \
+	$(OBJDIR)\strmap.obj \
 	$(OBJDIR)\su_codec.obj \
-	$(OBJDIR)\symtab.obj \
 	$(OBJDIR)\trunc.obj \
 	$(OBJDIR)\untrans.obj \
 	$(OBJDIR)\update_path.obj \
 	$(OBJDIR)\update_file.obj \
-	$(OBJDIR)\xmlread.obj \
+	$(OBJDIR)\version.obj \
+	$(OBJDIR)\mod_grs_xml.obj \
 	$(OBJDIR)\xpath.obj \
 	$(OBJDIR)\zaptterm.obj \
 	$(OBJDIR)\zebra-lock.obj \
@@ -479,14 +514,30 @@ $(TSTFLOCK) : "$(BINDIR)" $(TSTFLOCK_OBJS) $(IMPLIB)
 		$(TSTFLOCK_OBJS) \
 		/out:$(TSTFLOCK) 
 
-$(DLL) $(IMPLIB): "$(BINDIR)" $(ZEBRALIB_OBJS)
+# 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) $(RES)
 	$(LINK) \
 		$(LNKOPT) \
 		$(LINK_LIBS) \
 		$(DLL_LINK_OPTIONS) \
 		$(ZEBRALIB_OBJS) \
+		$(RES) \
 		/out:$(DLL) \
-		$(YAZLIBS) \
+		$(YAZLIB) \
 		/implib:"$(IMPLIB)" \
 		/map:"$(LIBDIR)\idzebra.map" \