projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Example of punctuals removal at sentence end
[yaz-moved-to-github.git]
/
win
/
makefile
diff --git
a/win/makefile
b/win/makefile
index
517ee0a
..
bf2b663
100644
(file)
--- a/
win/makefile
+++ b/
win/makefile
@@
-18,7
+18,9
@@
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 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
HAVE_LIBXSLT=1
@@
-40,7
+42,8
@@
BISON=bison
default: all
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"
NSIS="c:\program files\nsis\makensis.exe"
HHC="c:\program files\html help workshop\hhc.exe"
@@
-50,8
+53,11
@@
dist: yaz.win32.nsi yaz.nsi distclean
$(NSIS) yaz.win32.nsi
dist64: yaz.win64.nsi yaz.nsi distclean
$(NSIS) yaz.win32.nsi
dist64: yaz.win64.nsi yaz.nsi distclean
- nmake DEBUG=0 HAVE_LIBXSLT=0 HAVE_LIBXML2=0 HAVE_ICONV=0 HAVE_ICU=0
- $(NSIS) yaz.win64.nsi
+ 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
distclean:
nmake DEBUG=1 clean
@@
-114,6
+120,7
@@
YAZ_COND_IMPLIB=$(LIBDIR)\yaz_cond4.lib
CLIENT=$(BINDIR)\yaz-client.exe
YAZ_ICU=$(BINDIR)\yaz-icu.exe
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
ZOOMSH=$(BINDIR)\zoomsh.exe
ZTEST=$(BINDIR)\yaz-ztest.exe
SC_TEST=$(BINDIR)\sc_test.exe
@@
-148,6
+155,8
@@
zoomsh: $(ZOOMSH) $(ZOOMTST1) $(ZOOMTST2) $(ZOOMTST3) \
$(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8) $(ZOOMTST9) \
$(ZOOMTST10)
$(ZOOMTST4) $(ZOOMTST5) $(ZOOMTST6) $(ZOOMTST7) $(ZOOMTST8) $(ZOOMTST9) \
$(ZOOMTST10)
+yaz_url: $(YAZ_URL)
+
utilprog: $(CQL2PQF) $(CQL2XCQL) $(YAZ_MARCDUMP)
testprog: $(TSTLOG) $(TST_TIMING) $(TEST_MUTEX)
utilprog: $(CQL2PQF) $(CQL2XCQL) $(YAZ_MARCDUMP)
testprog: $(TSTLOG) $(TST_TIMING) $(TEST_MUTEX)
@@
-179,23
+188,22
@@
iconv:
!if $(HAVE_ICU)
ICU_DEF= \
!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
+ /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)\icudt42.dll:
icu: $(BINDIR)\icudt42.dll $(BINDIR)\icuin42.dll $(BINDIR)\icuuc42.dll
yazicu: dirs generate $(YAZ_ICU)
$(BINDIR)\icudt42.dll:
- copy "$(ICU_DIR)\bin\icudt42.dll" $(BINDIR)
+ copy "$(ICU_BIN)\icudt42.dll" $(BINDIR)
$(BINDIR)\icuin42.dll:
$(BINDIR)\icuin42.dll:
- copy "$(ICU_DIR)\bin\icuin42.dll" $(BINDIR)
+ copy "$(ICU_BIN)\icuin42.dll" $(BINDIR)
$(BINDIR)\icuuc42.dll:
$(BINDIR)\icuuc42.dll:
- copy "$(ICU_DIR)\bin\icuuc42.dll" $(BINDIR)
+ copy "$(ICU_BIN)\icuuc42.dll" $(BINDIR)
!else
ICU_DEF= \
/D YAZ_HAVE_ICU=0
!else
ICU_DEF= \
/D YAZ_HAVE_ICU=0
-ICU_LIB=
+ICU_LIBS=
icu:
yazicu:
!endif
icu:
yazicu:
!endif
@@
-338,6
+346,7
@@
YAZ_CLIENT_OBJS= \
$(OBJDIR)\fhistory.obj
YAZ_ICU_OBJS= $(OBJDIR)\yaz-icu.obj
$(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= \
COND_DLL_OBJS= $(OBJDIR)\condvar.obj
ZTEST_OBJS= \
@@
-391,6
+400,7
@@
TEST_MUTEX_OBJS = \
$(OBJDIR)\test_mutex.obj
MISC_OBJS= \
$(OBJDIR)\test_mutex.obj
MISC_OBJS= \
+ $(OBJDIR)\base64.obj \
$(OBJDIR)\version.obj \
$(OBJDIR)\oid_std.obj \
$(OBJDIR)\eventl.obj \
$(OBJDIR)\version.obj \
$(OBJDIR)\oid_std.obj \
$(OBJDIR)\eventl.obj \
@@
-405,6
+415,7
@@
MISC_OBJS= \
$(OBJDIR)\cclqual.obj \
$(OBJDIR)\cclstr.obj \
$(OBJDIR)\ccltoken.obj \
$(OBJDIR)\cclqual.obj \
$(OBJDIR)\cclstr.obj \
$(OBJDIR)\ccltoken.obj \
+ $(OBJDIR)\cclxmlconfig.obj \
$(OBJDIR)\ccl_stop_words.obj \
$(OBJDIR)\comstack.obj \
$(OBJDIR)\tcpip.obj \
$(OBJDIR)\ccl_stop_words.obj \
$(OBJDIR)\comstack.obj \
$(OBJDIR)\tcpip.obj \
@@
-499,6
+510,8
@@
MISC_OBJS= \
$(OBJDIR)\xmlerror.obj \
$(OBJDIR)\mime.obj \
$(OBJDIR)\cql.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)\cqlstdio.obj \
$(OBJDIR)\cqlstring.obj \
$(OBJDIR)\cqltransform.obj \
@@
-532,7
+545,8
@@
MISC_OBJS= \
$(OBJDIR)\xml_include.obj \
$(OBJDIR)\file_glob.obj \
$(OBJDIR)\thread_id.obj \
$(OBJDIR)\xml_include.obj \
$(OBJDIR)\file_glob.obj \
$(OBJDIR)\thread_id.obj \
- $(OBJDIR)\dirent.obj
+ $(OBJDIR)\dirent.obj \
+ $(OBJDIR)\url.obj
Z3950_OBJS= \
$(OBJDIR)\z-date.obj\
Z3950_OBJS= \
$(OBJDIR)\z-date.obj\
@@
-894,7
+908,7
@@
$(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)
$(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:$@ \
$(ICU_DLL_OBJS) \
$(YAZ_ICU_RES) \
/out:$@ \
@@
-914,9
+928,12
@@
$(CLIENT) : "$(BINDIR)" $(YAZ_CLIENT_OBJS) $(YAZ_DLL)
$(MT) -manifest $@.manifest -outputresource:$@;1
$(YAZ_ICU) : "$(BINDIR)" $(YAZ_ICU_OBJS) $(YAZ_ICU_DLL)
$(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
$(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:$@
$(SC_TEST) : "$(BINDIR)" $(SC_TEST_OBJS) $(YAZ_DLL)
$(LINK_PROGRAM) $(SC_TEST_OBJS) /out:$@