X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=335ef68bbb12adbfe7b6272b2511af6cb7ca1a43;hp=8aeab9159a46eec9e55642a406c8a0641eace7d9;hb=7b112287740b44d1dd939cea0ecca217356affd5;hpb=ebcb0cd09361a4b814ad8b7e629938c474af0be2

diff --git a/win/makefile b/win/makefile
index 8aeab91..335ef68 100644
--- a/win/makefile
+++ b/win/makefile
@@ -4,7 +4,7 @@
 # Parameters
 
 DEBUG=0   # 0 for release, 1 for debug
-USE_MANIFEST = 1
+BARCH = 32 # 32=win32/x86 or 64=x64
 
 # TCL
 TCL=tclsh
@@ -12,26 +12,32 @@ TCL=tclsh
 HAVE_TCL=1
 
 # iconv charcter conversion utility
-HAVE_ICONV=1
-ICONV_DIR = c:\iconv-1.9.2.win32
+HAVE_ICONV=0
+ICONV_DIR = c:\iconv-1.9.2.win$(BARCH)
 
 # icu charcter conversion utility
 # get icu libraries from http://www.icu-project.org
 HAVE_ICU=1
-ICU_LIB = c:\icu\lib
-ICU_BIN = c:\icu\bin
-ICU_INCLUDE = c:\icu\include
+ICU_VER=56
+ICU_BASE = c:\icu-56.1-vs2015
+!if $(BARCH) == 32
+ICU_LIB = $(ICU_BASE)\lib
+ICU_BIN = $(ICU_BASE)\bin
+!elseif $(BARCH) == 64
+ICU_LIB = $(ICU_BASE)\lib64
+ICU_BIN = $(ICU_BASE)\bin64
+!else
+!error BARCH must be 32 or 64
+!endif
+ICU_INCLUDE = $(ICU_BASE)\include
 
 # libxslt
 HAVE_LIBXSLT=1
-LIBXSLT_DIR=c:\libxslt-1.1.26.win32
+LIBXSLT_DIR=c:\libxslt-1.1.28.win$(BARCH)
 
 # libxml2
 HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.7.6.win32
-
-# zlib compression (used by libxml2)
-ZLIB_DIR = c:\zlib-1.2.3.win32
+LIBXML2_DIR=c:\libxml2-2.9.2.win$(BARCH)
 
 # get WIN32 binaries libxml2 & iconv & zlib from here:
 #  http://www.zlatkovic.com/libxml.en.html
@@ -45,35 +51,34 @@ default: all
 all: dirs generate dll sc_test client ztest yazicu zoomsh utilprog \
  testprog iconv icu libxml2 libxslt yaz_url
 
-NSIS="c:\program files\nsis\makensis.exe"
-HHC="c:\program files\html help workshop\hhc.exe"
+NSIS="c:\program files (x86)\nsis\makensis.exe"
+HHC="c:\program files (x86)\html help workshop\hhc.exe"
 
 YAZ4J_DIR="..\..\yaz4j"
 
 YAZPATH="$(MAKEDIR)\.."
 
 
-dist: yaz.win32.nsi yaz.nsi distclean
+dist: yaz.nsi version.nsi distclean
 	nmake DEBUG=0 all yaz4j
-	$(NSIS) yaz.win32.nsi
+	nmake nsis
 
-dist64: yaz.win64.nsi yaz.nsi distclean
-	nmake make64
-	$(NSIS) yaz.win64.nsi
+dist64: yaz.nsi version.nsi distclean
+	nmake make64 yaz4j
+	nmake nsis64
 
 make64:
-	nmake DEBUG=0 HAVE_LIBXSLT=1 HAVE_LIBXML2=1 HAVE_ICONV=0 HAVE_ICU=1 LIBXML2_DIR=c:\libxml2-2.7.8.win64 LIBXSLT_DIR=c:\libxslt-1.1.26.win64 ICU_LIB=\icu64\lib64 ICU_INCLUDE=\icu64\include ICU_BIN=\icu64\bin64 YAZ4J_DIR=..\..\..\yaz4j all yaz4j
-
+	nmake DEBUG=0 BARCH=64 all
 
 distclean:
 	nmake DEBUG=1 clean
 	nmake DEBUG=0 clean
 
-nsis: all yaz.win32.nsi
-	$(NSIS) yaz.win32.nsi
+nsis: version.nsi
+	$(NSIS) /DVSARCH=x86 /DVSVER=14 yaz.nsi
 
-nsis64: yaz.win64.nsi
-	$(NSIS) yaz.win64.nsi
+nsis64: version.nsi
+	$(NSIS) /DVSARCH=x64 /DVSVER=14 yaz.nsi
 
 nsishelp:
 	$(NSIS)
@@ -194,15 +199,17 @@ ICU_DEF= \
   /D YAZ_HAVE_ICU=1 /D HAVE_ICU_H=1 /I"$(ICU_INCLUDE)"
 ICU_LIBS= \
   $(ICU_LIB)\icudt.lib $(ICU_LIB)\icuin.lib $(ICU_LIB)\icuuc.lib
-icu: $(BINDIR)\icudt42.dll $(BINDIR)\icuin42.dll $(BINDIR)\icuuc42.dll
+icu: $(BINDIR)\icudt$(ICU_VER).dll \
+	$(BINDIR)\icuin$(ICU_VER).dll \
+	$(BINDIR)\icuuc$(ICU_VER).dll
 yazicu: dirs generate $(YAZ_ICU)
 
-$(BINDIR)\icudt42.dll:
-  copy "$(ICU_BIN)\icudt42.dll" $(BINDIR)
-$(BINDIR)\icuin42.dll:
-  copy "$(ICU_BIN)\icuin42.dll" $(BINDIR)
-$(BINDIR)\icuuc42.dll:
-  copy "$(ICU_BIN)\icuuc42.dll" $(BINDIR)
+$(BINDIR)\icudt$(ICU_VER).dll:
+  copy "$(ICU_BIN)\icudt$(ICU_VER).dll" $(BINDIR)
+$(BINDIR)\icuin$(ICU_VER).dll:
+  copy "$(ICU_BIN)\icuin$(ICU_VER).dll" $(BINDIR)
+$(BINDIR)\icuuc$(ICU_VER).dll:
+  copy "$(ICU_BIN)\icuuc$(ICU_VER).dll" $(BINDIR)
 !else
 ICU_DEF= /D YAZ_HAVE_ICU=0
 ICU_LIBS=
@@ -214,15 +221,11 @@ yazicu:
 
 !if $(HAVE_LIBXML2)
 LIBXML2_LIB="$(LIBXML2_DIR)\lib\libxml2.lib"
-LIBXML2_DEF=/D YAZ_HAVE_XML2=1 /I"$(LIBXML2_DIR)\include"
-libxml2: $(BINDIR)\libxml2.dll $(BINDIR)\zlib1.dll
+LIBXML2_DEF=/D YAZ_HAVE_XML2=1 /I"$(LIBXML2_DIR)\include\libxml2"
+libxml2: $(BINDIR)\libxml2.dll
 
 $(BINDIR)\libxml2.dll:
   copy "$(LIBXML2_DIR)\bin\libxml2.dll" $(BINDIR)
-
-$(BINDIR)\zlib1.dll:
-  copy "$(ZLIB_DIR)\bin\zlib1.dll" $(BINDIR)
-
 !else
 LIBXML2_LIB=
 LIBXML2_DEF=/D YAZ_HAVE_XML2=0
@@ -239,7 +242,7 @@ LIBXSLT_DEF= \
 libxslt: $(BINDIR)\libxslt.dll
 
 $(BINDIR)\libxslt.dll:
-  copy "$(LIBXSLT_DIR)\bin\libxslt.dll" $(BINDIR)
+  copy "$(LIBXSLT_DIR)\lib\libxslt.dll" $(BINDIR)
 
 !else
 LIBXSLT_LIB=
@@ -290,12 +293,6 @@ yaz4j: $(JAVADIR)
 ### Linker options
 LINK=link.exe
 
-!if $(USE_MANIFEST)
-MT=mt.exe /nologo
-!else
-MT=echo
-!endif
-
 LINK_LIBS= kernel32.lib ws2_32.lib advapi32.lib \
 	   $(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
 
@@ -486,6 +483,7 @@ MISC_OBJS= \
    $(OBJDIR)\charneg.obj \
    $(OBJDIR)\grs1disp.obj \
    $(OBJDIR)\opac_to_xml.obj \
+   $(OBJDIR)\xml_get.obj \
    $(OBJDIR)\xml_add.obj \
    $(OBJDIR)\xml_match.obj \
    $(OBJDIR)\xml_to_opac.obj \
@@ -552,7 +550,8 @@ MISC_OBJS= \
    $(OBJDIR)\file_glob.obj \
    $(OBJDIR)\thread_id.obj \
    $(OBJDIR)\dirent.obj \
-   $(OBJDIR)\url.obj
+   $(OBJDIR)\url.obj \
+   $(OBJDIR)\backtrace.obj
 
 Z3950_OBJS= \
    $(OBJDIR)\z-date.obj\
@@ -859,11 +858,11 @@ $(SRCDIR)\oid_std.c: $(SRCDIR)\oid.csv
 
 $(SRCDIR)\diagbib1.c: $(SRCDIR)\bib1.csv
 	@cd $(SRCDIR)
-	$(TCL) csvtobib1.tcl $(SRCDIR)
+	$(TCL) csvtodiag.tcl bib1.csv diagbib1.c $(INCLDIR)\yaz\diagbib1.h bib1 diagbib1_str
 
 $(SRCDIR)\diagsrw.c: $(SRCDIR)\srw.csv
 	@cd $(SRCDIR)
-	$(TCL) csvtosrw.tcl $(SRCDIR)
+	$(TCL) csvtodiag.tcl srw.csv diagsrw.c $(INCLDIR)\yaz\diagsrw.h srw
 
 $(SRCDIR)\diagsru_update.c: $(SRCDIR)\sru_update.csv
 	@cd $(SRCDIR)
@@ -873,6 +872,9 @@ $(INCLDIR)\yaz\yaz-version.h: $(ROOTDIR)/IDMETA
 	@cd $(SRCDIR)
 	$(TCL) mk_version.tcl $(ROOTDIR)/IDMETA $(INCLDIR)\yaz\yaz-version.h
 
+version.nsi: $(ROOTDIR)/IDMETA
+	$(TCL) $(SRCDIR)/mk_version.tcl $(ROOTDIR)/IDMETA version.nsi
+
 
 !endif
 
@@ -911,7 +913,6 @@ $(YAZ_DLL) $(YAZ_IMPLIB): "$(BINDIR)" $(DLL_OBJS) $(YAZ_RES)
 		$(YAZ_RES) \
 		/out:$@ \
 		/implib:"$(YAZ_IMPLIB)"
-	$(MT) -manifest $@.manifest -outputresource:$@;2
 
 $(YAZ_ICU_DLL) $(YAZ_ICU_IMPLIB): "$(BINDIR)" $(ICU_DLL_OBJS) $(YAZ_ICU_RES)
 	$(LINK_DLL) $(ICU_LIBS) $(YAZ_IMPLIB)\
@@ -919,7 +920,6 @@ $(YAZ_ICU_DLL) $(YAZ_ICU_IMPLIB): "$(BINDIR)" $(ICU_DLL_OBJS) $(YAZ_ICU_RES)
 		$(YAZ_ICU_RES) \
 		/out:$@ \
 		/implib:"$(YAZ_ICU_IMPLIB)"
-	$(MT) -manifest $@.manifest -outputresource:$@;2
 
 $(YAZ_COND_DLL) $(YAZ_COND_IMPLIB): "$(BINDIR)" $(COND_DLL_OBJS) $(YAZ_COND_RES)
 	$(LINK_DLL) $(COND_LIB) $(YAZ_IMPLIB)\
@@ -927,96 +927,72 @@ $(YAZ_COND_DLL) $(YAZ_COND_IMPLIB): "$(BINDIR)" $(COND_DLL_OBJS) $(YAZ_COND_RES)
 		$(YAZ_COND_RES) \
 		/out:$@ \
 		/implib:"$(YAZ_COND_IMPLIB)"
-	$(MT) -manifest $@.manifest -outputresource:$@;2
 
 $(CLIENT) : "$(BINDIR)" $(YAZ_CLIENT_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(YAZ_CLIENT_OBJS) /out:$@
-	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(YAZ_ICU) : "$(BINDIR)" $(YAZ_ICU_OBJS) $(YAZ_ICU_DLL)
 	$(LINK_PROGRAM) $(ICU_LIBS) $(YAZ_ICU_IMPLIB) $(YAZ_ICU_OBJS) /out:$@
-	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(YAZ_URL) : "$(BINDIR)" $(YAZ_URL_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(YAZ_URL_OBJS) /out:$@
-	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(SC_TEST) : "$(BINDIR)" $(SC_TEST_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(SC_TEST_OBJS) /out:$@
-	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZOOMSH) : "$(BINDIR)" $(YAZ_ZOOMSH_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(YAZ_ZOOMSH_OBJS) /out:$@
-	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZOOMTST1) : "$(BINDIR)" $(YAZ_ZOOMTST1_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(YAZ_ZOOMTST1_OBJS) /out:$@
-	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZOOMTST2) : "$(BINDIR)" $(YAZ_ZOOMTST2_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(YAZ_ZOOMTST2_OBJS) /out:$@
-	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZOOMTST3) : "$(BINDIR)" $(YAZ_ZOOMTST3_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(YAZ_ZOOMTST3_OBJS) /out:$@
-	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZOOMTST4) : "$(BINDIR)" $(YAZ_ZOOMTST4_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(YAZ_ZOOMTST4_OBJS) /out:$@
-	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZOOMTST5) : "$(BINDIR)" $(YAZ_ZOOMTST5_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(YAZ_ZOOMTST5_OBJS) /out:$@
-	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZOOMTST6) : "$(BINDIR)" $(YAZ_ZOOMTST6_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(YAZ_ZOOMTST6_OBJS) /out:$@
-	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZOOMTST7) : "$(BINDIR)" $(YAZ_ZOOMTST7_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(YAZ_ZOOMTST7_OBJS) /out:$@
-	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZOOMTST8) : "$(BINDIR)" $(YAZ_ZOOMTST8_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(YAZ_ZOOMTST8_OBJS) /out:$@
-	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZOOMTST9) : "$(BINDIR)" $(YAZ_ZOOMTST9_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(YAZ_ZOOMTST9_OBJS) /out:$@
-	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZOOMTST10) : "$(BINDIR)" $(YAZ_ZOOMTST10_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(YAZ_ZOOMTST10_OBJS) /out:$@
-	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(CQL2PQF) : "$(BINDIR)" $(YAZ_CQL2PQF_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(YAZ_CQL2PQF_OBJS) /out:$@
-	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(CQL2XCQL) : "$(BINDIR)" $(YAZ_CQL2XCQL_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(YAZ_CQL2XCQL_OBJS) /out:$@
-	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(ZTEST) : "$(BINDIR)" $(ZTEST_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM)	$(ZTEST_OBJS) /out:$@
-	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(YAZ_MARCDUMP) : "$(BINDIR)" $(YAZ_MARCDUMP_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(YAZ_MARCDUMP_OBJS) /out:$@
-	$(MT) -manifest $@.manifest -outputresource:$@;1
-
 
 $(TSTLOG) : "$(BINDIR)" $(TSTLOG_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(TSTLOG_OBJS) /out:$@
-	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(TST_TIMING) : "$(BINDIR)" $(TST_TIMING_OBJS) $(YAZ_DLL)
 	$(LINK_PROGRAM) $(TST_TIMING_OBJS) /out:$@
-	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 $(TEST_MUTEX) : "$(BINDIR)" $(TEST_MUTEX_OBJS) $(YAZ_COND_DLL)
 	$(LINK_PROGRAM) $(YAZ_COND_IMPLIB) $(TEST_MUTEX_OBJS) /out:$@
-	$(MT) -manifest $@.manifest -outputresource:$@;1
 
 # Other rules