Separate the logging utilities for queries in two . The multi-line

[yaz-moved-to-github.git] / win / makefile

diff --git a/win/makefile b/win/makefile
index 397c4bf..7414f56 100644 (file)
--- a/win/makefile
+++ b/win/makefile
@@ -1,9 +1,9 @@
-# Copyright (C) 1994-2004, Index Data
+# Copyright (C) 1994-2005, Index Data ApS
 # All rights reserved.
-# $Id: makefile,v 1.85 2004-08-19 07:48:00 adam Exp $
+# $Id: makefile,v 1.98 2006-01-20 10:34:52 adam Exp $
 #
 # Programmed by
-#  HL: Heikki Levanto, Index Data
+#  Heikki Levanto & Adam Dickmeiss
 
 ###########################################################
 ############### Parameters 
@@ -22,13 +22,13 @@ ICONV_DIR = c:\iconv-1.9.1.win32
 
 # libxml2
 HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.6.9.win32
+LIBXML2_DIR=c:\libxml2-2.6.20.win32
 
 # zlib compression (used by libxml2)
-ZLIB_DIR = c:\zlib-1.1.4.win32
+ZLIB_DIR = c:\zlib-1.2.3.win32
 
 # get WIN32 binaries libxml2 & iconv & zlib from here:
-#  http://www.zlatkovic.com/projects/libxml/binaries.html
+#  http://www.zlatkovic.com/libxml.en.html
 
 # bison
 HAVE_BISON=1
@@ -36,9 +36,10 @@ BISON=bison
 
 default: all
 
-all: dirs generate dll client ztest zoomsh utilprog iconv libxml2
+all: dirs generate dll client ztest zoomsh utilprog testprog iconv libxml2
 
 NSIS="c:\program files\nsis\makensis.exe"
+HHC="c:\program files\html help workshop\hhc.exe"
 
 dist: 
        nmake DEBUG=1 clean
@@ -54,6 +55,8 @@ nsishelp:
 
 generate: generated_files
 
+
+
 ###########################################################
 ############### Directories
 ###########################################################
@@ -66,6 +69,7 @@ LIBDIR=$(ROOTDIR)\lib       # We produce .lib, .exp etc there
 BINDIR=$(ROOTDIR)\bin       # We produce exes and dlls there
 WINDIR=$(ROOTDIR)\win       # all these Win make things
 SRCDIR=$(ROOTDIR)\src       # for the case we move them under src
+DOCDIR=$(ROOTDIR)\doc       # where the doc is
 
 # where we store intermediate files
 !if $(DEBUG)
@@ -78,6 +82,7 @@ CLIENTDIR=$(ROOTDIR)\CLIENT
 ZTESTDIR=$(ROOTDIR)\ZTEST
 ZOOMDIR=$(ROOTDIR)\ZOOM
 UTILDIR=$(ROOTDIR)\UTIL
+TESTDIR=$(ROOTDIR)\TEST
 
 TMPDIR=$(ROOTDIR)\win\tmp
 TMP=$(TMPDIR)
@@ -106,21 +111,28 @@ ZOOMTST5=$(BINDIR)\zoomtst5.exe
 ZOOMTST6=$(BINDIR)\zoomtst6.exe
 ZOOMTST7=$(BINDIR)\zoomtst7.exe
 ZOOMTST8=$(BINDIR)\zoomtst8.exe
+ZOOMTST9=$(BINDIR)\zoomtst9.exe
 
 CQL2PQF=$(BINDIR)\cql2pqf.exe
 CQL2XCQL=$(BINDIR)\cql2xcql.exe
 YAZ_MARCDUMP=$(BINDIR)\yaz-marcdump.exe
 
+TSTLOG=$(BINDIR)\tstlog.exe
+
 # shortcut names defined here
 dll: dirs generate $(DLL) 
 client: dirs generate $(CLIENT)
 ztest: dirs generate $(ZTEST)
 
 zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
- $(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8)
+ $(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8) $(ZOOMTST9)
 
 utilprog: $(CQL2PQF) $(CQL2XCQL) $(YAZ_MARCDUMP)
 
+testprog: $(TSTLOG)
+
+htmlhelp: $(DOCDIR)\htmlhelp.chm
+
 ###########################################################
 ############### Compiler and linker options 
 ###########################################################
@@ -134,7 +146,7 @@ ICONV_LIB= \
 iconv: $(BINDIR)\iconv.dll
 
 $(BINDIR)\iconv.dll:
-  copy "$(ICONV_DIR)\lib\iconv.dll" $(BINDIR)
+  copy "$(ICONV_DIR)\bin\iconv.dll" $(BINDIR)
 !else
 ICONV_DEF= \
   /D HAVE_ICONV_H=0
@@ -146,13 +158,13 @@ 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)\zlib.dll
+libxml2: $(BINDIR)\libxml2.dll $(BINDIR)\zlib1.dll
 
 $(BINDIR)\libxml2.dll:
-  copy "$(LIBXML2_DIR)\lib\libxml2.dll" $(BINDIR)
+  copy "$(LIBXML2_DIR)\bin\libxml2.dll" $(BINDIR)
 
-$(BINDIR)\zlib.dll:
-  copy "$(ZLIB_DIR)\lib\zlib.dll" $(BINDIR)
+$(BINDIR)\zlib1.dll:
+  copy "$(ZLIB_DIR)\bin\zlib1.dll" $(BINDIR)
 
 !else
 LIBXML2_LIB=
@@ -172,7 +184,6 @@ COMMON_C_OPTIONS=          \
   $(LIBXML2_DEF)           \
   /D "_WINDOWS"            \
   /D "WIN32"               \
-  /D "HAVE_WCHAR_H=1"      \
   /FR"$(OBJDIR)\\"         \
   /Fo"$(OBJDIR)\\"         \
   /Fd"$(OBJDIR)\\" 
@@ -278,6 +289,8 @@ YAZ_ZOOMTST7_OBJS = \
    $(OBJDIR)\zoomtst7.obj
 YAZ_ZOOMTST8_OBJS = \
    $(OBJDIR)\zoomtst8.obj
+YAZ_ZOOMTST9_OBJS = \
+   $(OBJDIR)\zoomtst9.obj
 
 YAZ_CQL2PQF_OBJS = \
    $(OBJDIR)\cql2pqf.obj
@@ -286,6 +299,9 @@ YAZ_CQL2XCQL_OBJS = \
 YAZ_MARCDUMP_OBJS = \
    $(OBJDIR)\marcdump.obj
 
+TSTLOG_OBJS = \
+   $(OBJDIR)\tstlog.obj
+
 YAZ_SERVER_OBJS= \
    "$(OBJDIR)\eventl.obj" \
    "$(OBJDIR)\requestq.obj" \
@@ -360,8 +376,11 @@ YAZ_UTIL_OBJS= \
 
 YAZ_ZUTIL_OBJS= \
    $(OBJDIR)\diagbib1.obj \
+   $(OBJDIR)\diagsrw.obj \
+   $(OBJDIR)\diag-entry.obj \
    $(OBJDIR)\zget.obj \
    $(OBJDIR)\logrpn.obj \
+   $(OBJDIR)\querytowrbuf.obj \
    $(OBJDIR)\pquery.obj \
    $(OBJDIR)\yaz-ccl.obj \
    $(OBJDIR)\otherinfo.obj \
@@ -582,6 +601,9 @@ generated_files: \
 {$(UTILDIR)}.c{$(OBJDIR)}.obj:
        $(CPP) $(COPT) $< 
 
+{$(TESTDIR)}.c{$(OBJDIR)}.obj:
+       $(CPP) $(COPT) $< 
+
 ############### ASN-generated files
 
 !if $(HAVE_TCL)
@@ -640,6 +662,14 @@ $(SRCDIR)\marc8.c: $(SRCDIR)\codetables.xml $(SRCDIR)\charconv.tcl
        @cd $(SRCDIR)
        $(TCL) charconv.tcl -p marc8 codetables.xml -o marc8.c
 
+$(SRCDIR)\diagbib1.c: $(SRCDIR)\bib1.csv
+       @cd $(SRCDIR)
+       $(TCL) csvtobib1.tcl
+
+$(SRCDIR)\diagsrw.c: $(SRCDIR)\srw.csv
+       @cd $(SRCDIR)
+       $(TCL) csvtosrw.tcl
+
 !endif
 
 !if $(HAVE_BISON)
@@ -808,6 +838,19 @@ $(ZOOMTST8) : "$(BINDIR)" $(YAZ_ZOOMTST8_OBJS)
                /out:$(ZOOMTST8)
 <<
 
+
+$(ZOOMTST9) : "$(BINDIR)" $(YAZ_ZOOMTST9_OBJS) 
+       @echo Linking $(ZOOMTST9)
+       $(LINK) @<<
+        $(LNKOPT) 
+               $(CLIENT_LINK_OPTIONS)
+               $(LINK_LIBS) 
+               $(IMPLIB)
+               $(YAZ_ZOOMTST9_OBJS)
+               /map:"$(LIBDIR)\zoomtst9.map"
+               /out:$(ZOOMTST9)
+<<
+
 $(CQL2PQF) : "$(BINDIR)" $(YAZ_CQL2PQF_OBJS) 
        @echo Linking $(CQL2PQF)
        $(LINK) @<<
@@ -860,6 +903,23 @@ $(YAZ_MARCDUMP) : "$(BINDIR)" $(YAZ_MARCDUMP_OBJS) $(DLL)
 <<
 
 
+$(TSTLOG) : "$(BINDIR)" $(TSTLOG_OBJS) 
+       @echo Linking $(TSTLOG)
+       $(LINK) @<<
+        $(LNKOPT) 
+               $(CLIENT_LINK_OPTIONS)
+               $(LINK_LIBS) 
+               $(IMPLIB)
+               $(TSTLOG_OBJS)
+               /map:"$(LIBDIR)\tstlog.map"
+               /out:$(TSTLOG)
+<<
+
+$(DOCDIR)\htmlhelp.chm: $(DOCDIR)\htmlhelp.hhp
+       @cd $(DOCDIR)
+       -$(HHC) htmlhelp.hhp
+       @cd $(WINDIR)
+
 # note that this links a lib, so it uses completely different options.
 
 ###########################################################