From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 30 Mar 2011 14:03:04 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/yaz
X-Git-Tag: v4.2.0~54
X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=7c182a7a93e1f99fad3403946776c7167dbb7e08;hp=-c

Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/yaz
---

7c182a7a93e1f99fad3403946776c7167dbb7e08
diff --combined win/makefile
index d4418f1,517ee0a..b850872
--- a/win/makefile
+++ b/win/makefile
@@@ -1,5 -1,5 +1,5 @@@
  # This file is part of the YAZ toolkit.
- # Copyright (C) 1995-2010 Index Data
+ # Copyright (C) 1995-2011 Index Data
  
  # Parameters 
  
@@@ -18,9 -18,7 +18,9 @@@ ICONV_DIR = c:\iconv-1.9.2.win3
  # 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
@@@ -52,8 -50,8 +52,8 @@@ dist: yaz.win32.nsi yaz.nsi distclea
  	$(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 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
 +	$(NSIS) yaz.win64.nsi 
  
  distclean:
  	nmake DEBUG=1 clean
@@@ -181,22 -179,23 +181,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
 +  /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:
 -  copy "$(ICU_DIR)\bin\icudt42.dll" $(BINDIR)
 +  copy "$(ICU_BIN)\icudt42.dll" $(BINDIR)
  $(BINDIR)\icuin42.dll:
 -  copy "$(ICU_DIR)\bin\icuin42.dll" $(BINDIR)
 +  copy "$(ICU_BIN)\icuin42.dll" $(BINDIR)
  $(BINDIR)\icuuc42.dll:
 -  copy "$(ICU_DIR)\bin\icuuc42.dll" $(BINDIR)
 +  copy "$(ICU_BIN)\icuuc42.dll" $(BINDIR)
  !else
  ICU_DEF= \
    /D YAZ_HAVE_ICU=0
 -ICU_LIB=
 +ICU_LIBS=
  icu:
  yazicu:
  !endif
@@@ -258,7 -257,8 +258,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"      \
@@@ -481,6 -481,7 +482,7 @@@ MISC_OBJS= 
     $(OBJDIR)\zgdu.obj \
     $(OBJDIR)\soap.obj \
     $(OBJDIR)\solr.obj \
+    $(OBJDIR)\solrtransform.obj \
     $(OBJDIR)\srw.obj \
     $(OBJDIR)\srwutil.obj \
     $(OBJDIR)\zoom-c.obj \
@@@ -504,6 -505,7 +506,7 @@@
     $(OBJDIR)\cqlutil.obj \
     $(OBJDIR)\cqlstrer.obj \
     $(OBJDIR)\rpn2cql.obj \
+    $(OBJDIR)\rpn2solr.obj \
     $(OBJDIR)\xcqlutil.obj \
     $(OBJDIR)\elementset.obj \
     $(OBJDIR)\timing.obj \
@@@ -570,10 -572,17 +573,17 @@@ ILL_OBJS= 
     $(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_chain.obj \
@@@ -582,7 -591,9 +592,9 @@@
     $(OBJDIR)\icu_transform.obj \
     $(OBJDIR)\icu_casemap.obj \
     $(OBJDIR)\icu_tokenizer.obj \
-    $(OBJDIR)\icu_sortkey.obj
+    $(OBJDIR)\icu_sortkey.obj \
+    $(OBJDIR)\stemmer.obj \
+    $(STEMMER_OBJS) 
  
  # Generated C and H files
  
@@@ -742,6 -753,15 +754,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)
@@@ -874,7 -894,7 +895,7 @@@ $(YAZ_DLL) $(YAZ_IMPLIB): "$(BINDIR)" $
  	$(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:$@ \
@@@ -894,7 -914,7 +915,7 @@@ $(CLIENT) : "$(BINDIR)" $(YAZ_CLIENT_OB
  	$(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