# This file is part of the YAZ toolkit.
-# Copyright (C) 1995-2011 Index Data
+# Copyright (C) Index Data
-# Parameters
+# Parameters
DEBUG=0 # 0 for release, 1 for debug
USE_MANIFEST = 1
# 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
NSIS="c:\program files\nsis\makensis.exe"
HHC="c:\program files\html help workshop\hhc.exe"
+YAZ4J_DIR="..\..\yaz4j"
+
+YAZPATH="$(MAKEDIR)\.."
+
+
dist: yaz.win32.nsi yaz.nsi distclean
- nmake DEBUG=0
+ nmake DEBUG=0 all yaz4j
$(NSIS) yaz.win32.nsi
dist64: yaz.win64.nsi yaz.nsi distclean
nmake make64
- $(NSIS) yaz.win64.nsi
+ $(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
+ 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
+
distclean:
nmake DEBUG=1 clean
nmake DEBUG=0 clean
-nsis: all yaz32.nsi
+nsis: all yaz.win32.nsi
$(NSIS) yaz.win32.nsi
nsis64: yaz.win64.nsi
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
+JAVADIR=$(ROOTDIR)\java
# where we store intermediate files
!if $(DEBUG)
UTILDIR=$(ROOTDIR)\UTIL
TESTDIR=$(ROOTDIR)\TEST
-TMPDIR=$(ROOTDIR)\win\tmp
-TMP=$(TMPDIR)
+# TMPDIR=$(ROOTDIR)\win\tmp
+# TMP=$(TMPDIR)
# Targets - what to make
!if $(DEBUG)
-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
+YAZ_DLL=$(BINDIR)\yaz5d.dll
+YAZ_IMPLIB=$(LIBDIR)\yaz5d.lib
+YAZ_ICU_DLL=$(BINDIR)\yaz_icu5d.dll
+YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu5d.lib
+YAZ_COND_DLL=$(BINDIR)\yaz_cond5d.dll
+YAZ_COND_IMPLIB=$(LIBDIR)\yaz_cond5d.lib
!else
-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
+YAZ_DLL=$(BINDIR)\yaz5.dll
+YAZ_IMPLIB=$(LIBDIR)\yaz5.lib
+YAZ_ICU_DLL=$(BINDIR)\yaz_icu5.dll
+YAZ_ICU_IMPLIB=$(LIBDIR)\yaz_icu5.lib
+YAZ_COND_DLL=$(BINDIR)\yaz_cond5.dll
+YAZ_COND_IMPLIB=$(LIBDIR)\yaz_cond5.lib
!endif
CLIENT=$(BINDIR)\yaz-client.exe
yaz_url: $(YAZ_URL)
-utilprog: $(CQL2PQF) $(CQL2XCQL) $(YAZ_MARCDUMP)
+utilprog: $(CQL2PQF) $(CQL2XCQL) $(YAZ_MARCDUMP)
testprog: $(TSTLOG) $(TST_TIMING) $(TEST_MUTEX)
htmlhelp: $(DOCDIR)\htmlhelp.chm
!endif
-###TRYING ICU FLAGS HERE WORKS ####
-## ADAM ARE THESE FLAGS OK and the DLL sufficient ##
-##IT COMPILES AND SEEMS TO WORK
-
!if $(HAVE_ICU)
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
-yazicu: dirs generate $(YAZ_ICU)
+yazicu: dirs generate $(YAZ_ICU)
$(BINDIR)\icudt42.dll:
copy "$(ICU_BIN)\icudt42.dll" $(BINDIR)
$(BINDIR)\icuuc42.dll:
copy "$(ICU_BIN)\icuuc42.dll" $(BINDIR)
!else
-ICU_DEF= \
- /D YAZ_HAVE_ICU=0
+ICU_DEF= /D YAZ_HAVE_ICU=0
ICU_LIBS=
icu:
yazicu:
!endif
-###
+###
!if $(HAVE_LIBXML2)
LIBXML2_LIB="$(LIBXML2_DIR)\lib\libxml2.lib"
!else
LIBXML2_LIB=
LIBXML2_DEF=/D YAZ_HAVE_XML2=0
-libxml2:
+libxml2:
!endif
!else
LIBXSLT_LIB=
LIBXSLT_DEF=/D YAZ_HAVE_XSLT=0
-libxslt:
+libxslt:
!endif
/D "WIN32" \
/FR"$(OBJDIR)\\" \
/Fo"$(OBJDIR)\\" \
- /Fd"$(OBJDIR)\\"
+ /Fd"$(OBJDIR)\\"
COMMON_C_INCLUDES= \
/I"$(ROOTDIR)\include" \
/D "NDEBUG" \
/MD /O2
-# /W3 = warning level
-# /GX = Enable exception handling
-# /FD = Generate file dependencies (what ever they are)
-# /c = compile without linking
-# /FR = Generate browse info (.sbr file that gets combined into .bsc)
-# /Fo = object file name (or at least path)
-# /Fd = debug database name (or path)
-# /MD = Runtime library: Multithread DLL
-# /MDd = Runtime library: Multithread DLL (debug)
-# /Od = Disable optimising (debug)
-# /O2 = Optimize for speed
-# /Gm = Minimal rebuild (some cpp class stuff)
-# /Zi = Program database for debuggers
-# /ZI = Pgm database with special "edit&continue" stuff - not available in C5
-
+MVN_ARGS=-Dyaz.path=$(YAZPATH)
+# without >log below, mvn install does NOT work
+yaz4j: $(JAVADIR)
+ cd $(YAZ4J_DIR)
+ mvn clean
+ mvn $(MVN_ARGS) -DskipTests install >log
+ copy /Y win32\target\yaz4j.dll "$(MAKEDIR)\..\bin"
+ copy /Y any\target\yaz4j.jar "$(MAKEDIR)\..\java"
### Linker options
LINK=link.exe
COMMON_LNK_OPTIONS= /nologo /subsystem:windows /incremental:no
-DEBUG_LNK_OPTIONS= /debug
+DEBUG_LNK_OPTIONS= /debug
RELEASE_LNK_OPTIONS=
-DLL_LINK_OPTIONS= /dll
-CLIENT_LINK_OPTIONS = /subsystem:console
+DLL_LINK_OPTIONS= /dll
+CLIENT_LINK_OPTIONS = /subsystem:console
COMMON_TCL_OPTIONS= ..\util\yaz-asncomp -I$(INCLDIR) -i yaz
TCLOPT= $(COMMON_TCL_OPTIONS)
!else
-COPT= $(COMMON_C_OPTIONS) $(RELEASE_C_OPTIONS) $(COMMON_C_INCLUDES)
+COPT= $(COMMON_C_OPTIONS) $(RELEASE_C_OPTIONS) $(COMMON_C_INCLUDES)
LNKOPT= $(COMMON_LNK_OPTIONS) $(RELEASE_LNK_OPTIONS) $(LNK_LIBS)
TCLOPT= $(COMMON_TCL_OPTIONS)
!endif
# Source and object modules
-# Note: Ordinary source files are not specified here at
+# Note: Ordinary source files are not specified here at
# all, make finds them in suitable dirs. The object modules
# need to be specified, though
$(OBJDIR)\admin.obj \
$(OBJDIR)\fhistory.obj
-YAZ_ICU_OBJS= $(OBJDIR)\yaz-icu.obj
-YAZ_URL_OBJS= $(OBJDIR)\yaz-url.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 \
$(OBJDIR)\read-marc.obj \
$(OBJDIR)\read-grs.obj \
- $(OBJDIR)\ztest.obj
+ $(OBJDIR)\ztest.obj
SC_TEST_OBJS = \
$(OBJDIR)\sc_test.obj
$(OBJDIR)\ccl_stop_words.obj \
$(OBJDIR)\comstack.obj \
$(OBJDIR)\tcpip.obj \
- $(OBJDIR)\waislen.obj \
$(OBJDIR)\ber_any.obj \
$(OBJDIR)\ber_bit.obj \
$(OBJDIR)\ber_bool.obj \
$(OBJDIR)\atoin.obj \
$(OBJDIR)\log.obj \
$(OBJDIR)\marcdisp.obj \
+ $(OBJDIR)\marc_read_json.obj \
$(OBJDIR)\marc_read_xml.obj \
$(OBJDIR)\marc_read_iso2709.obj \
$(OBJDIR)\marc_read_line.obj \
$(OBJDIR)\readconf.obj \
$(OBJDIR)\tpath.obj \
$(OBJDIR)\wrbuf.obj \
+ $(OBJDIR)\wrbuf_sha1.obj \
$(OBJDIR)\xmalloc.obj \
$(OBJDIR)\matchstr.obj \
$(OBJDIR)\siconv.obj \
$(OBJDIR)\sortspec.obj \
$(OBJDIR)\charneg.obj \
$(OBJDIR)\grs1disp.obj \
- $(OBJDIR)\opacdisp.obj \
+ $(OBJDIR)\opac_to_xml.obj \
+ $(OBJDIR)\xml_add.obj \
+ $(OBJDIR)\xml_match.obj \
+ $(OBJDIR)\xml_to_opac.obj \
$(OBJDIR)\zgdu.obj \
$(OBJDIR)\soap.obj \
$(OBJDIR)\solr.obj \
$(OBJDIR)\solrtransform.obj \
+ $(OBJDIR)\sru_facet.obj \
$(OBJDIR)\srw.obj \
$(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 \
$(OBJDIR)\zoom-opt.obj \
$(OBJDIR)\zoom-socket.obj \
$(OBJDIR)\initopt.obj \
+ $(OBJDIR)\init_diag.obj \
+ $(OBJDIR)\init_globals.obj \
$(OBJDIR)\xmlquery.obj \
$(OBJDIR)\xmlerror.obj \
$(OBJDIR)\mime.obj \
+ $(OBJDIR)\cookie.obj \
$(OBJDIR)\cql.obj \
$(OBJDIR)\cql2ccl.obj \
$(OBJDIR)\cql_sortkeys.obj \
$(OBJDIR)\match_glob.obj \
$(OBJDIR)\poll.obj \
$(OBJDIR)\daemon.obj \
+ $(OBJDIR)\iconv_encode_danmarc.obj \
$(OBJDIR)\iconv_encode_iso_8859_1.obj \
$(OBJDIR)\iconv_encode_marc8.obj \
$(OBJDIR)\iconv_decode_marc8.obj \
$(MISC_OBJS) \
$(Z3950_OBJS) \
$(ILL_OBJS)
-
+
ICU_DLL_OBJS =\
$(OBJDIR)\icu_chain.obj \
$(OBJDIR)\icu_utf16.obj \
$(OBJDIR)\icu_tokenizer.obj \
$(OBJDIR)\icu_sortkey.obj \
$(OBJDIR)\stemmer.obj \
- $(STEMMER_OBJS)
+ $(STEMMER_OBJS)
# Generated C and H files
-Z3950_C_DIR=$(SRCDIR)
+Z3950_C_DIR=$(SRCDIR)
ILL_C_DIR=$(SRCDIR)
#!!! Should be moved to OBJ, but that requires too much trickery
$(SRCDIR)\diagsrw.c \
$(SRCDIR)\diagbib1.c \
$(SRCDIR)\diagsru_update.c \
- $(INCLDIR)\yaz\yaz-version.h
+ $(INCLDIR)\yaz\yaz-version.h
-# Compiling
+# Compiling
# Note: This defines where to look for the necessary
# source files. Funny way of doing it, but it works.
# Server
{$(SERVERDIR)}.c{$(OBJDIR)}.obj:
- $(CPP) $(COPT) $<
+ $(CPP) $(COPT) $<
# Various YAZ source directories
{$(SRCDIR)}.c{$(OBJDIR)}.obj:
- $(CPP) $(COPT) /D"YAZ_DLL" $<
+ $(CPP) $(COPT) /D"YAZ_DLL" $<
{$(ZOOMDIR)}.c{$(OBJDIR)}.obj:
- $(CPP) $(COPT) $<
+ $(CPP) $(COPT) $<
{$(UTILDIR)}.c{$(OBJDIR)}.obj:
- $(CPP) $(COPT) $<
+ $(CPP) $(COPT) $<
{$(TESTDIR)}.c{$(OBJDIR)}.obj:
- $(CPP) $(COPT) $<
+ $(CPP) $(COPT) $<
{$(ROOTDIR)\libstemmer_c\libstemmer}.c{$(OBJDIR)}.obj:
- $(CPP) $(COPT) $<
+ $(CPP) $(COPT) $<
{$(ROOTDIR)\libstemmer_c\runtime}.c{$(OBJDIR)}.obj:
- $(CPP) $(COPT) $<
+ $(CPP) $(COPT) $<
{$(ROOTDIR)\libstemmer_c\src_c}.c{$(OBJDIR)}.obj:
- $(CPP) $(COPT) $<
+ $(CPP) $(COPT) $<
# ASN-generated files
@cd $(SRCDIR)
$(TCL) charconv.tcl -r -p iso5426 codetables-iso5426.xml -o iso5426.c
-$(SRCDIR)\oid_std.c: $(SRCDIR)\oid.csv
+$(SRCDIR)\oid_std.c: $(SRCDIR)\oid.csv
@cd $(SRCDIR)
$(TCL) oidtoc.tcl $(SRCDIR) oid.csv oid_std.c oid_std.h
!endif
$(YAZ_RES): $(YAZ_RC)
- $(RSC) $(RSOPT) /I"../include" /fo"$(YAZ_RES)" $(YAZ_RC)
+ $(RSC) $(RSOPT) /I"../include" /fo"$(YAZ_RES)" $(YAZ_RC)
$(YAZ_ICU_RES): $(YAZ_RC)
- $(RSC) $(RSOPT) /DICU=1 /I"../include" /fo"$(YAZ_ICU_RES)" $(YAZ_RC)
+ $(RSC) $(RSOPT) /DICU=1 /I"../include" /fo"$(YAZ_ICU_RES)" $(YAZ_RC)
# Linking
$(DLL_OBJS) \
$(YAZ_RES) \
/out:$@ \
- /implib:"$(YAZ_IMPLIB)"
+ /implib:"$(YAZ_IMPLIB)"
$(MT) -manifest $@.manifest -outputresource:$@;2
$(YAZ_ICU_DLL) $(YAZ_ICU_IMPLIB): "$(BINDIR)" $(ICU_DLL_OBJS) $(YAZ_ICU_RES)
$(ICU_DLL_OBJS) \
$(YAZ_ICU_RES) \
/out:$@ \
- /implib:"$(YAZ_ICU_IMPLIB)"
+ /implib:"$(YAZ_ICU_IMPLIB)"
$(MT) -manifest $@.manifest -outputresource:$@;2
$(YAZ_COND_DLL) $(YAZ_COND_IMPLIB): "$(BINDIR)" $(COND_DLL_OBJS) $(YAZ_COND_RES)
$(COND_DLL_OBJS) \
$(YAZ_COND_RES) \
/out:$@ \
- /implib:"$(YAZ_COND_IMPLIB)"
+ /implib:"$(YAZ_COND_IMPLIB)"
$(MT) -manifest $@.manifest -outputresource:$@;2
$(CLIENT) : "$(BINDIR)" $(YAZ_CLIENT_OBJS) $(YAZ_DLL)
# check directories and create if needed
dirs: $(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR)
-$(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR):
+$(OBJDIR) $(WINDIR) $(LIBDIR) $(BINDIR) $(TMPDIR) $(JAVADIR):
if not exist "$@/$(NUL)" mkdir "$@"