X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=b82ddf4e7710f077c39ac53dd97db2691402e285;hp=eaabe2257d0b94faf9c7d53be915af3c68beb5b3;hb=dca8928db421aa8750ac9ffead1a5c09a85f4f8b;hpb=db05fbd0f2d1daf9ab9dc33b9876fe37a53c0037 diff --git a/win/makefile b/win/makefile index eaabe22..b82ddf4 100644 --- a/win/makefile +++ b/win/makefile @@ -4,34 +4,32 @@ # Parameters DEBUG=0 # 0 for release, 1 for debug -USE_MANIFEST = 1 +USE_MANIFEST = 0 # TCL -TCL="C:\Tcl\bin\tclsh85.exe" -#TCL="C:\Program Files\Tcl\bin\tclsh83.exe" +TCL=tclsh +#TCL="C:\Tcl\bin\tclsh85.exe" HAVE_TCL=1 # iconv charcter conversion utility -HAVE_ICONV=1 +HAVE_ICONV=0 ICONV_DIR = c:\iconv-1.9.2.win32 # icu charcter conversion utility # get icu libraries from http://www.icu-project.org HAVE_ICU=1 +ICU_VER=54 ICU_LIB = c:\icu\lib ICU_BIN = c:\icu\bin ICU_INCLUDE = c:\icu\include # libxslt HAVE_LIBXSLT=1 -LIBXSLT_DIR=c:\libxslt-1.1.26.win32 +LIBXSLT_DIR=c:\libxslt-1.1.28.win32 # 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.win32 # get WIN32 binaries libxml2 & iconv & zlib from here: # http://www.zlatkovic.com/libxml.en.html @@ -45,8 +43,10 @@ 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" +allj: all yaz4j + +NSIS="c:\program files (x86)\nsis\makensis.exe" +HHC="c:\program files (x86)\html help workshop\hhc.exe" YAZ4J_DIR="..\..\yaz4j" @@ -54,7 +54,7 @@ YAZPATH="$(MAKEDIR)\.." dist: yaz.win32.nsi yaz.nsi distclean - nmake DEBUG=0 all yaz4j + nmake DEBUG=0 allj $(NSIS) yaz.win32.nsi dist64: yaz.win64.nsi yaz.nsi distclean @@ -62,7 +62,7 @@ dist64: yaz.win64.nsi yaz.nsi distclean $(NSIS) yaz.win64.nsi 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 HAVE_LIBXSLT=1 HAVE_LIBXML2=1 HAVE_ICONV=0 HAVE_ICU=1 LIBXML2_DIR=c:\libxml2-2.9.2.win64 LIBXSLT_DIR=c:\libxslt-1.1.28.win64 ICU_LIB=\icu\lib64 ICU_INCLUDE=\icu\include ICU_BIN=\icu\bin64 YAZ4J_DIR=..\..\..\yaz4j allj distclean: @@ -190,19 +190,21 @@ iconv: !endif !if $(HAVE_ICU) -ICU_DEF= +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 +216,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 +237,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= @@ -292,14 +290,16 @@ LINK=link.exe !if $(USE_MANIFEST) MT=mt.exe /nologo +MTOPT=/manifest !else MT=echo +MTOPT= !endif LINK_LIBS= kernel32.lib ws2_32.lib advapi32.lib \ $(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB) -COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no +COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no $(MTOPT) DEBUG_LNK_OPTIONS= /debug @@ -457,6 +457,7 @@ MISC_OBJS= \ $(OBJDIR)\readconf.obj \ $(OBJDIR)\tpath.obj \ $(OBJDIR)\wrbuf.obj \ + $(OBJDIR)\wrbuf_sha1.obj \ $(OBJDIR)\xmalloc.obj \ $(OBJDIR)\matchstr.obj \ $(OBJDIR)\siconv.obj \ @@ -497,6 +498,7 @@ MISC_OBJS= \ $(OBJDIR)\srwutil.obj \ $(OBJDIR)\zoom-c.obj \ $(OBJDIR)\zoom-event.obj \ + $(OBJDIR)\zoom-memcached.obj \ $(OBJDIR)\zoom-record-cache.obj \ $(OBJDIR)\zoom-z3950.obj \ $(OBJDIR)\zoom-sru.obj \ @@ -507,6 +509,7 @@ MISC_OBJS= \ $(OBJDIR)\zoom-socket.obj \ $(OBJDIR)\initopt.obj \ $(OBJDIR)\init_diag.obj \ + $(OBJDIR)\init_globals.obj \ $(OBJDIR)\xmlquery.obj \ $(OBJDIR)\xmlerror.obj \ $(OBJDIR)\mime.obj \ @@ -549,7 +552,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\ @@ -856,11 +860,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) @@ -876,7 +880,7 @@ $(INCLDIR)\yaz\yaz-version.h: $(ROOTDIR)/IDMETA !if $(HAVE_BISON) $(SRCDIR)\cql.c: $(SRCDIR)\cql.y @cd $(SRCDIR) - $(BISON) -y -o cql.c cql.y + $(BISON) -y -p cql_ -o cql.c cql.y !endif @@ -1026,6 +1030,7 @@ clean: -del $(BINDIR)\*.exe -del $(BINDIR)\*.dll -del $(BINDIR)\*.pdb + -del $(BINDIR)\*.manifest -del $(TMPDIR)\*. -del $(LIBDIR)\*.LIB -del $(OBJDIR)\*.OBJ