X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fmakefile;h=ec1ea462931dac1a816831daf0e7fdf6bd70bc7f;hp=90d8e973c643db77502084ab1fdc0ea3d2027e0c;hb=4b92c6833026a51cc391840d1157cd5fefede1df;hpb=42bf8d7d53e41f6165e0eb889a7377d3482aeabd

diff --git a/win/makefile b/win/makefile
index 90d8e97..ec1ea46 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,13 +1,10 @@
 # This file is part of the YAZ toolkit.
-# Copyright (C) 1995-2009 Index Data
-#
-# Programmed by
-#  Heikki Levanto & Adam Dickmeiss
+# Copyright (C) 1995-2013 Index Data
 
 # Parameters 
 
 DEBUG=0   # 0 for release, 1 for debug
-USE_MANIFEST = 0
+USE_MANIFEST = 1
 
 # TCL
 TCL="C:\Tcl\bin\tclsh85.exe"
@@ -21,15 +18,17 @@ 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_DIR = c:\icu
+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.24.win32
+LIBXSLT_DIR=c:\libxslt-1.1.26.win32
 
 # libxml2
 HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.7.1.win32
+LIBXML2_DIR=c:\libxml2-2.7.6.win32
 
 # zlib compression (used by libxml2)
 ZLIB_DIR = c:\zlib-1.2.3.win32
@@ -43,19 +42,32 @@ BISON=bison
 
 default: all
 
-all: dirs generate dll sc_test client ztest yazicu zoomsh utilprog testprog iconv icu libxml2 libxslt
+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"
 
-dist: 
+dist: yaz.win32.nsi yaz.nsi distclean
+	nmake DEBUG=0
+	$(NSIS) yaz.win32.nsi
+
+dist64: yaz.win64.nsi yaz.nsi distclean
+	nmake make64
+	$(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
+
+distclean:
 	nmake DEBUG=1 clean
 	nmake DEBUG=0 clean
-	nmake DEBUG=0
-	$(NSIS) yaz.nsi
 
-nsis:
-	$(NSIS) yaz.nsi
+nsis: all yaz32.nsi
+	$(NSIS) yaz.win32.nsi
+
+nsis64: yaz.win64.nsi
+	$(NSIS) yaz.win64.nsi
 
 nsishelp:
 	$(NSIS)
@@ -91,19 +103,24 @@ TMP=$(TMPDIR)
 # Targets - what to make
 
 !if $(DEBUG)
-YAZ_DLL=$(BINDIR)\yaz3d.dll
-YAZ_IMPLIB=$(LIBDIR)\yaz3d.lib
-YAZ_ICU_DLL=$(BINDIR)\yaz_icu3d.dll
-YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu3d.lib
+YAZ_DLL=$(BINDIR)\yaz4d.dll
+YAZ_IMPLIB=$(LIBDIR)\yaz4d.lib
+YAZ_ICU_DLL=$(BINDIR)\yaz_icu4d.dll
+YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu4d.lib
+YAZ_COND_DLL=$(BINDIR)\yaz_cond4d.dll
+YAZ_COND_IMPLIB=$(LIBDIR)\yaz_cond4d.lib
 !else
-YAZ_DLL=$(BINDIR)\yaz3.dll
-YAZ_IMPLIB=$(LIBDIR)\yaz3.lib
-YAZ_ICU_DLL=$(BINDIR)\yaz_icu3.dll
-YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu3.lib
+YAZ_DLL=$(BINDIR)\yaz4.dll
+YAZ_IMPLIB=$(LIBDIR)\yaz4.lib
+YAZ_ICU_DLL=$(BINDIR)\yaz_icu4.dll
+YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu4.lib
+YAZ_COND_DLL=$(BINDIR)\yaz_cond4.dll
+YAZ_COND_IMPLIB=$(LIBDIR)\yaz_cond4.lib
 !endif
 
 CLIENT=$(BINDIR)\yaz-client.exe
 YAZ_ICU=$(BINDIR)\yaz-icu.exe
+YAZ_URL=$(BINDIR)\yaz-url.exe
 ZOOMSH=$(BINDIR)\zoomsh.exe
 ZTEST=$(BINDIR)\yaz-ztest.exe
 SC_TEST=$(BINDIR)\sc_test.exe
@@ -123,11 +140,12 @@ CQL2PQF=$(BINDIR)\cql2pqf.exe
 CQL2XCQL=$(BINDIR)\cql2xcql.exe
 YAZ_MARCDUMP=$(BINDIR)\yaz-marcdump.exe
 
-TSTLOG=$(BINDIR)\tstlog.exe
-TST_TIMING=$(BINDIR)\tst_timing.exe
+TSTLOG=$(BINDIR)\test_log.exe
+TST_TIMING=$(BINDIR)\test_timing.exe
+TEST_MUTEX=$(BINDIR)\test_mutex.exe
 
 # shortcut names defined here
-dll: dirs generate $(YAZ_DLL) 
+dll: dirs generate $(YAZ_DLL) $(YAZ_COND_DLL)
 client: dirs generate $(CLIENT)
 ztest: dirs generate $(ZTEST)
 
@@ -137,8 +155,10 @@ zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
  $(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8) $(ZOOMTST9) \
  $(ZOOMTST10)
 
+yaz_url: $(YAZ_URL)
+
 utilprog: $(CQL2PQF) $(CQL2XCQL) $(YAZ_MARCDUMP) 
-testprog: $(TSTLOG) $(TST_TIMING)
+testprog: $(TSTLOG) $(TST_TIMING) $(TEST_MUTEX)
 
 htmlhelp: $(DOCDIR)\htmlhelp.chm
 
@@ -168,23 +188,22 @@ iconv:
 
 !if $(HAVE_ICU)
 ICU_DEF= \
-  /D YAZ_HAVE_ICU=1 /D HAVE_ICU_H=1 \
-  /I"$(ICU_DIR)\include"
-ICU_LIB= \
-  $(ICU_DIR)\lib\icudt.lib $(ICU_DIR)\lib\icuin.lib $(ICU_DIR)\lib\icuuc.lib
-icu: $(BINDIR)\icudt40.dll $(BINDIR)\icuin40.dll $(BINDIR)\icuuc40.dll
+  /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
 yazicu: dirs generate $(YAZ_ICU) 
 
-$(BINDIR)\icudt40.dll:
-  copy "$(ICU_DIR)\bin\icudt40.dll" $(BINDIR)
-$(BINDIR)\icuin40.dll:
-  copy "$(ICU_DIR)\bin\icuin40.dll" $(BINDIR)
-$(BINDIR)\icuuc40.dll:
-  copy "$(ICU_DIR)\bin\icuuc40.dll" $(BINDIR)
+$(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)
 !else
 ICU_DEF= \
   /D YAZ_HAVE_ICU=0
-ICU_LIB=
+ICU_LIBS=
 icu:
 yazicu:
 !endif
@@ -246,7 +265,8 @@ COMMON_C_OPTIONS=          \
   /Fd"$(OBJDIR)\\" 
 
 COMMON_C_INCLUDES= \
-  /I"$(ROOTDIR)\include"
+  /I"$(ROOTDIR)\include" \
+  /I"$(ROOTDIR)\libstemmer_c\include"
 
 DEBUG_C_OPTIONS=  \
   /D "_DEBUG"      \
@@ -284,7 +304,7 @@ MT=echo
 LINK_LIBS= kernel32.lib ws2_32.lib advapi32.lib \
 	   $(ICONV_LIB) $(LIBXML2_LIB) $(LIBXSLT_LIB)
 
-COMMON_LNK_OPTIONS= /nologo /subsystem:windows /machine:i386 /incremental:no
+COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no
 
 DEBUG_LNK_OPTIONS= /debug 
 
@@ -326,6 +346,8 @@ YAZ_CLIENT_OBJS= \
    $(OBJDIR)\fhistory.obj
 
 YAZ_ICU_OBJS= $(OBJDIR)\yaz-icu.obj 
+YAZ_URL_OBJS= $(OBJDIR)\yaz-url.obj 
+COND_DLL_OBJS= $(OBJDIR)\condvar.obj
 
 ZTEST_OBJS= \
     $(OBJDIR)\dummy-opac.obj \
@@ -369,12 +391,17 @@ YAZ_MARCDUMP_OBJS = \
 
 
 TSTLOG_OBJS = \
-   $(OBJDIR)\tstlog.obj
+   $(OBJDIR)\test_log.obj
 
 TST_TIMING_OBJS = \
-   $(OBJDIR)\tst_timing.obj
+   $(OBJDIR)\test_timing.obj
+
+TEST_MUTEX_OBJS = \
+   $(OBJDIR)\test_mutex.obj
 
 MISC_OBJS= \
+   $(OBJDIR)\diag_map.obj \
+   $(OBJDIR)\base64.obj \
    $(OBJDIR)\version.obj \
    $(OBJDIR)\oid_std.obj \
    $(OBJDIR)\eventl.obj \
@@ -389,6 +416,7 @@ MISC_OBJS= \
    $(OBJDIR)\cclqual.obj \
    $(OBJDIR)\cclstr.obj \
    $(OBJDIR)\ccltoken.obj \
+   $(OBJDIR)\cclxmlconfig.obj \
    $(OBJDIR)\ccl_stop_words.obj \
    $(OBJDIR)\comstack.obj \
    $(OBJDIR)\tcpip.obj \
@@ -447,7 +475,6 @@ MISC_OBJS= \
    $(OBJDIR)\iso5426.obj \
    $(OBJDIR)\record_conv.obj \
    $(OBJDIR)\retrieval.obj \
-   $(OBJDIR)\libxml2_error.obj \
    $(OBJDIR)\test.obj \
    $(OBJDIR)\diagbib1.obj \
    $(OBJDIR)\diagsru_update.obj \
@@ -462,25 +489,39 @@ MISC_OBJS= \
    $(OBJDIR)\sortspec.obj \
    $(OBJDIR)\charneg.obj \
    $(OBJDIR)\grs1disp.obj \
-   $(OBJDIR)\opacdisp.obj \
+   $(OBJDIR)\opac_to_xml.obj \
+   $(OBJDIR)\xml_to_opac.obj \
    $(OBJDIR)\zgdu.obj \
    $(OBJDIR)\soap.obj \
+   $(OBJDIR)\solr.obj \
+   $(OBJDIR)\solrtransform.obj \
    $(OBJDIR)\srw.obj \
    $(OBJDIR)\srwutil.obj \
    $(OBJDIR)\zoom-c.obj \
+   $(OBJDIR)\zoom-event.obj \
+   $(OBJDIR)\zoom-record-cache.obj \
+   $(OBJDIR)\zoom-z3950.obj \
+   $(OBJDIR)\zoom-sru.obj \
+   $(OBJDIR)\zoom-query.obj \
+   $(OBJDIR)\record_render.obj \
+   $(OBJDIR)\facet.obj \
    $(OBJDIR)\zoom-opt.obj \
    $(OBJDIR)\zoom-socket.obj \
    $(OBJDIR)\initopt.obj \
+   $(OBJDIR)\init_diag.obj \
    $(OBJDIR)\xmlquery.obj \
    $(OBJDIR)\xmlerror.obj \
    $(OBJDIR)\mime.obj \
    $(OBJDIR)\cql.obj \
+   $(OBJDIR)\cql2ccl.obj \
+   $(OBJDIR)\cql_sortkeys.obj \
    $(OBJDIR)\cqlstdio.obj \
    $(OBJDIR)\cqlstring.obj \
    $(OBJDIR)\cqltransform.obj \
    $(OBJDIR)\cqlutil.obj \
    $(OBJDIR)\cqlstrer.obj \
    $(OBJDIR)\rpn2cql.obj \
+   $(OBJDIR)\rpn2solr.obj \
    $(OBJDIR)\xcqlutil.obj \
    $(OBJDIR)\elementset.obj \
    $(OBJDIR)\timing.obj \
@@ -499,7 +540,16 @@ MISC_OBJS= \
    $(OBJDIR)\iconv_decode_iso5426.obj \
    $(OBJDIR)\iconv_decode_danmarc.obj \
    $(OBJDIR)\mutex.obj \
-   $(OBJDIR)\sc.obj
+   $(OBJDIR)\thread_create.obj \
+   $(OBJDIR)\spipe.obj \
+   $(OBJDIR)\gettimeofday.obj \
+   $(OBJDIR)\json.obj \
+   $(OBJDIR)\sc.obj \
+   $(OBJDIR)\xml_include.obj \
+   $(OBJDIR)\file_glob.obj \
+   $(OBJDIR)\thread_id.obj \
+   $(OBJDIR)\dirent.obj \
+   $(OBJDIR)\url.obj
 
 Z3950_OBJS= \
    $(OBJDIR)\z-date.obj\
@@ -531,20 +581,36 @@ Z3950_OBJS= \
    $(OBJDIR)\prt-ext.obj \
    $(OBJDIR)\z-charneg.obj \
    $(OBJDIR)\z-mterm2.obj \
-   $(OBJDIR)\z-oclcui.obj
+   $(OBJDIR)\z-oclcui.obj \
+   $(OBJDIR)\z-facet-1.obj
 
 ILL_OBJS= \
    $(OBJDIR)\ill-get.obj\
    $(OBJDIR)\ill-core.obj\
    $(OBJDIR)\item-req.obj
 
+STEMMER_OBJS = \
+   $(OBJDIR)\libstemmer.obj \
+   $(OBJDIR)\api.obj \
+   $(OBJDIR)\utilities.obj \
+   $(OBJDIR)\stem_UTF_8_porter.obj \
+   $(OBJDIR)\stem_UTF_8_english.obj
+
 DLL_OBJS =\
    $(MISC_OBJS) \
    $(Z3950_OBJS) \
-   $(ILL_OBJS) \
+   $(ILL_OBJS)
    
 ICU_DLL_OBJS =\
-   $(OBJDIR)\icu_I18N.obj
+   $(OBJDIR)\icu_chain.obj \
+   $(OBJDIR)\icu_utf16.obj \
+   $(OBJDIR)\icu_utf8.obj \
+   $(OBJDIR)\icu_transform.obj \
+   $(OBJDIR)\icu_casemap.obj \
+   $(OBJDIR)\icu_tokenizer.obj \
+   $(OBJDIR)\icu_sortkey.obj \
+   $(OBJDIR)\stemmer.obj \
+   $(STEMMER_OBJS) 
 
 # Generated C and H files
 
@@ -580,6 +646,10 @@ MTERM2_C_FILES = $(Z3950_C_DIR)\z-mterm2.c
 OCLCUI_H_FILES = $(INCLDIR)\yaz\z-oclcui.h
 OCLCUI_C_FILES = $(Z3950_C_DIR)\z-oclcui.c
 
+# Files generated from facet.asn
+FACET_H_FILES = $(INCLDIR)\yaz\z-facet-1.h
+FACET_C_FILES = $(Z3950_C_DIR)\z-facet-1.c
+
 # Files created from z3950v3.asn
 Z3950V3_H_FILES= \
    $(INCLDIR)\yaz\z-accdes1.h \
@@ -634,6 +704,7 @@ ITEM_REQ_FILES= $(ITEM_REQ_C_FILES) $(ITEM_REQ_H_FILES)
 CHARNEG_FILES = $(CHARNEG_C_FILES) $(CHARNEG_H_FILES)
 MTERM2_FILES = $(MTERM2_C_FILES) $(MTERM2_H_FILES)
 OCLCUI_FILES = $(OCLCUI_C_FILES) $(OCLCUI_H_FILES)
+FACET_FILES = $(FACET_C_FILES) $(FACET_H_FILES)
 
 GENERATED_C_FILES= \
    $(Z3950V3_C_FILES)  \
@@ -644,6 +715,7 @@ GENERATED_C_FILES= \
    $(CHARNEG_C_FILES) \
    $(MTERM2_C_FILES) \
    $(OCLCUI_C_FILES) \
+   $(FACET_C_FILES) \
    $(ILL_CORE_C_FILES) \
    $(ITEM_REQ_C_FILES)
 
@@ -656,6 +728,7 @@ GENERATED_H_FILES= \
    $(CHARNEG_H_FILES) \
    $(MTERM2_H_FILES) \
    $(OCLCUI_H_FILES) \
+   $(FACET_H_FILES) \
    $(ILL_CORE_H_FILES) \
    $(ITEM_REQ_H_FILES)
 
@@ -697,6 +770,15 @@ generate: \
 {$(TESTDIR)}.c{$(OBJDIR)}.obj:
 	$(CPP) $(COPT) $< 
 
+{$(ROOTDIR)\libstemmer_c\libstemmer}.c{$(OBJDIR)}.obj:
+	$(CPP) $(COPT) $< 
+
+{$(ROOTDIR)\libstemmer_c\runtime}.c{$(OBJDIR)}.obj:
+	$(CPP) $(COPT) $< 
+
+{$(ROOTDIR)\libstemmer_c\src_c}.c{$(OBJDIR)}.obj:
+	$(CPP) $(COPT) $< 
+
 # ASN-generated files
 
 !if $(HAVE_TCL)
@@ -741,6 +823,11 @@ $(OCLCUI_FILES): $(SRCDIR)\oclcui.asn
 	$(TCL) $(TCLOPT) -d z.tcl oclcui.asn
 	@cd $(WINDIR)
 
+$(FACET_FILES): $(SRCDIR)\facet.asn
+	@cd $(SRCDIR)
+	$(TCL) $(TCLOPT) -d z.tcl facet.asn
+	@cd $(WINDIR)
+
 $(ILL_CORE_FILES): $(SRCDIR)\ill9702.asn
 	@cd $(SRCDIR)
 	$(TCL) $(TCLOPT) -d ill.tcl ill9702.asn
@@ -779,9 +866,9 @@ $(SRCDIR)\diagsru_update.c: $(SRCDIR)\sru_update.csv
 	@cd $(SRCDIR)
 	$(TCL) csvtosru_update.tcl $(SRCDIR)
 
-$(INCLDIR)\yaz\yaz-version.h:
+$(INCLDIR)\yaz\yaz-version.h: $(ROOTDIR)/IDMETA
 	@cd $(SRCDIR)
-	$(TCL) mk_version.tcl $(ROOTDIR)/configure.ac $(INCLDIR)\yaz\yaz-version.h
+	$(TCL) mk_version.tcl $(ROOTDIR)/IDMETA $(INCLDIR)\yaz\yaz-version.h
 
 
 !endif
@@ -824,21 +911,32 @@ $(YAZ_DLL) $(YAZ_IMPLIB): "$(BINDIR)" $(DLL_OBJS) $(YAZ_RES)
 	$(MT) -manifest $@.manifest -outputresource:$@;2
 
 $(YAZ_ICU_DLL) $(YAZ_ICU_IMPLIB): "$(BINDIR)" $(ICU_DLL_OBJS) $(YAZ_ICU_RES)
-	$(LINK_DLL) $(ICU_LIB) $(YAZ_IMPLIB)\
+	$(LINK_DLL) $(ICU_LIBS) $(YAZ_IMPLIB)\
 		$(ICU_DLL_OBJS) \
 		$(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)\
+		$(COND_DLL_OBJS) \
+		$(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_LIB) $(YAZ_ICU_IMPLIB) $(YAZ_ICU_OBJS) /out:$@
+	$(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:$@
@@ -913,6 +1011,10 @@ $(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
 
 $(DOCDIR)\htmlhelp.chm: $(DOCDIR)\htmlhelp.hhp