Show
Ignore:
Timestamp:
26.10.2016 18:39:50 (3 years ago)
Author:
ak19
Message:

New yaz 2.1.56 was needed to get GS2 compiling to work again on Macs after going from producing dynamic linked to statically linked gnome-lib libraries. The new yaz finally compiles (see recent and current commits). Tested z3950server (built by configuring with --enable-z3950) against built yaz-client, and tested GLI's use of yaz-client against Library of Congress' z3950 server. It all works. Need to test Windows next.

Location:
main/trunk/greenstone2/runtime-src
Files:
9 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/runtime-src/packages/Makefile.in

    r28888 r30954  
    4040ifeq ($(USE_YAZ), 1) 
    4141# we only compile the src and client dirs for now. 
    42 YAZ=yaz/yaz-2.1.4/src yaz/yaz-2.1.4/client  
     42YAZ=yaz/yaz-2.1.56/src yaz/yaz-2.1.56/client  
    4343else 
    4444YAZ= 
     
    126126# need to do make install in include and src dirs to get the header files and 
    127127# lib file into the right place 
    128     cd yaz/yaz-2.1.4/include; $(MAKE)  $(MDEFINES) install 
    129     cd yaz/yaz-2.1.4/src; $(MAKE)  $(MDEFINES) install 
     128    cd yaz/yaz-2.1.56/include; $(MAKE)  $(MDEFINES) install 
     129    cd yaz/yaz-2.1.56/src; $(MAKE)  $(MDEFINES) install 
    130130endif 
    131131 
  • main/trunk/greenstone2/runtime-src/packages/configure

    r26977 r30954  
    192192  echo "" 
    193193  cd "$PACKAGES/yaz"  
    194   gzip -dc yaz-2.1.4.tar.gz | tar -xf - 
    195   cd yaz-2.1.4 && \ 
     194  gzip -dc yaz-2.1.56.tar.gz | tar -xf - 
     195  cd yaz-2.1.56 && \ 
    196196    ./configure $CACHE_FILE --prefix="$PACKAGES/yaz" --bindir="$bindir" $HOSTTARGETFLAGS 
    197197else 
  • main/trunk/greenstone2/runtime-src/packages/yaz/README.gsdl

    r30893 r30954  
    11The YAZ toolkit is used by the GSDL receptionist 
    22when acting as a z39.50 client. 
     3 
     44. We've moved to Yaz-2.1.56, ak19 
     5End Oct 2016 
     6 
     7EXPLANATION: We've moved to this slightly newer version, the newest in 2.1.* but without changing major version numbers, in order to get a version of yaz that compiles on Macs after changes to make (gnome-lib) libraries statically linked rather than dymamically linked libraries needed for El Capitan. 
     8 
     9MODIFIED FILE: yaz-2.1.56/client/client.c 
     10Still require the same change as in number 3 below. 
     11 
     12Ahead of changing to a newer yaz, we've also made changes to the runtime-src/src's z3950 and recpt Makefile.in files, to grab whatever dependencies yaz's configuration step worked out for its Makefile, and then using the same for linking libyaz in z3950 and recept to. 
     13 
     14TESTED: bin/linux/z3950server (compile after configuring with --enable-z3950) against yaz-client. Then also tested GLI with Library of Congress's z3950 server at lx2.loc.gov at port 210. 
    315 
    4163. CHANGES TO YAZ-2.1.4 TO CREATE THE GREENSTONE VERSION OF IT, ak19 
  • main/trunk/greenstone2/runtime-src/src/recpt/Makefile.in

    r30948 r30954  
    136136# Need LIBS to contain all the dependencies for libyaz that yaz had worked out (from yaz's Makefile) 
    137137# http://stackoverflow.com/questions/2019989/how-to-assign-the-output-of-a-command-to-a-makefile-variable 
    138 YAZ_LIBS = $(shell egrep "^LIBS\s?=" $(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.4/Makefile | sed 's/^LIBS\s\?=\s\?//') 
     138YAZ_LIBS = $(shell egrep "^LIBS\s?=" $(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.56/Makefile | sed 's/^LIBS\s\?=\s\?//') 
    139139Z3950_LIBS = $(Z3950_DIR)/gsdlz3950.a $(RUNTIME_PACKAGES_DIR)/yaz/lib/libyaz.a $(YAZ_LIBS) 
    140140else 
  • main/trunk/greenstone2/runtime-src/src/recpt/win32.mak

    r29047 r30954  
    129129Z3950_DEFS = -DUSE_Z3950 
    130130Z3950_INCLUDES = -I$(Z3950_DIR) 
    131 Z3950_LIBS = $(Z3950_DIR)\gsdlz3950.lib $(PACKAGES_DIR)\yaz\yaz-2.1.4\lib\yaz.lib 
     131Z3950_LIBS = $(Z3950_DIR)\gsdlz3950.lib $(PACKAGES_DIR)\yaz\yaz-2.1.56\lib\yaz.lib 
    132132!ELSE 
    133133Z3950_DEFS =  
  • main/trunk/greenstone2/runtime-src/src/z3950/Makefile.in

    r30948 r30954  
    105105# Do NOT add the "recpt" directory here: the z39.50 code should be independent of the receptionist! 
    106106INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_DIR)/src/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \ 
    107     $(MGPP_INCLUDES) -I$(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.4/include \ 
    108     -I$(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.4/client -I$(RUNTIME_PACKAGES_DIR)/d2m 
     107    $(MGPP_INCLUDES) -I$(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.56/include \ 
     108    -I$(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.56/client -I$(RUNTIME_PACKAGES_DIR)/d2m 
    109109INSTALL = @INSTALL@ 
    110110LDFLAGS = @LDFLAGS@ 
     
    112112# Need LIBS to contain all the dependencies for libyaz that yaz had worked out (from yaz's Makefile) 
    113113# http://stackoverflow.com/questions/2019989/how-to-assign-the-output-of-a-command-to-a-makefile-variable 
    114 YAZ_LIBS = $(shell egrep "^LIBS\s?=" $(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.4/Makefile | sed 's/^LIBS\s\?=\s\?//') 
     114YAZ_LIBS = $(shell egrep "^LIBS\s?=" $(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.56/Makefile | sed 's/^LIBS\s\?=\s\?//') 
    115115LIBS = @LIBS@ $(GDBM_LIBS) -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat \ 
    116116    $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) \ 
     
    182182gsdlz3950.a: $(LIBRARY_OBJECTS) 
    183183    rm -f $(LIBRARY) 
    184     $(AR) cru $(LIBRARY) $(LIBRARY_OBJECTS) $(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.4/client/tabcomplete.o 
     184    $(AR) cru $(LIBRARY) $(LIBRARY_OBJECTS) $(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.56/client/tabcomplete.o 
    185185    $(RANLIB) $(LIBRARY) 
    186186 
  • main/trunk/greenstone2/runtime-src/src/z3950/win32.mak

    r25178 r30954  
    141141# Do NOT add the "recpt" directory here: the z39.50 code should be independent of the receptionist! 
    142142INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \ 
    143     $(MGPP_INCLUDES) -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\include" \ 
    144     -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\client" -I"$(PACKAGES_DIR)\d2m" \ 
     143    $(MGPP_INCLUDES) -I"$(PACKAGES_DIR)\yaz\yaz-2.1.56\include" \ 
     144    -I"$(PACKAGES_DIR)\yaz\yaz-2.1.56\client" -I"$(PACKAGES_DIR)\d2m" \ 
    145145    $(GDBM_INCLUDES) 
    146146LIBS = "$(COMMON_PACKAGES_DIR)\expat\lib\libexpat.lib" $(GDBM_LIBS) \ 
    147         "$(PACKAGES_DIR)\d2m\libd2m.lib" "$(PACKAGES_DIR)\yaz\yaz-2.1.4\lib\yaz.lib" $(ACCENTFOLD_LIBS) \ 
     147        "$(PACKAGES_DIR)\d2m\libd2m.lib" "$(PACKAGES_DIR)\yaz\yaz-2.1.56\lib\yaz.lib" $(ACCENTFOLD_LIBS) \ 
    148148    $(SQLITE_LIBS) 
    149149 
     
    217217gsdlz3950.lib: $(LIBRARY_OBJECTS) 
    218218    if EXIST $(LIBRARY) del $(LIBRARY) 
    219     $(AR) -nologo /out:$(LIBRARY) $(LIBRARY_OBJECTS) $(PACKAGES_DIR)/yaz/yaz-2.1.4/win/obj/tabcomplete.obj 
     219    $(AR) -nologo /out:$(LIBRARY) $(LIBRARY_OBJECTS) $(PACKAGES_DIR)/yaz/yaz-2.1.56/win/obj/tabcomplete.obj 
    220220 
    221221z3950server.exe: $(EXECUTABLE_OBJECTS) 
  • main/trunk/greenstone2/runtime-src/src/z3950/yaz_zclient.h

    r15492 r30954  
    66/* the new yaz_zclient made for use with Greenstone. Based on client.c  
    77 * (version 2.1.4) and the old yaz_zclient (version 1.6 for greenstone) 
     8 * Note: from end Oct 2016, moved to yaz version 2.1.56. 
    89 */ 
    910void z_initialize(void); 
  • main/trunk/greenstone2/runtime-src/win32.mak

    r22090 r30954  
    5151PACKAGEDIRS =  
    5252 
    53 YAZ_DIR = packages\yaz\yaz-2.1.4\win 
     53YAZ_DIR = packages\yaz\yaz-2.1.56\win 
    5454 
    5555MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)"