- Timestamp:
- 2016-10-26T18:39:50+13:00 (7 years ago)
- Location:
- main/trunk/greenstone2/runtime-src
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/runtime-src/packages/Makefile.in
r28888 r30954 40 40 ifeq ($(USE_YAZ), 1) 41 41 # we only compile the src and client dirs for now. 42 YAZ=yaz/yaz-2.1. 4/src yaz/yaz-2.1.4/client42 YAZ=yaz/yaz-2.1.56/src yaz/yaz-2.1.56/client 43 43 else 44 44 YAZ= … … 126 126 # need to do make install in include and src dirs to get the header files and 127 127 # lib file into the right place 128 cd yaz/yaz-2.1. 4/include; $(MAKE) $(MDEFINES) install129 cd yaz/yaz-2.1. 4/src; $(MAKE) $(MDEFINES) install128 cd yaz/yaz-2.1.56/include; $(MAKE) $(MDEFINES) install 129 cd yaz/yaz-2.1.56/src; $(MAKE) $(MDEFINES) install 130 130 endif 131 131 -
main/trunk/greenstone2/runtime-src/packages/configure
r26977 r30954 192 192 echo "" 193 193 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 && \ 196 196 ./configure $CACHE_FILE --prefix="$PACKAGES/yaz" --bindir="$bindir" $HOSTTARGETFLAGS 197 197 else -
main/trunk/greenstone2/runtime-src/packages/yaz/README.gsdl
r30893 r30954 1 1 The YAZ toolkit is used by the GSDL receptionist 2 2 when acting as a z39.50 client. 3 4 4. We've moved to Yaz-2.1.56, ak19 5 End Oct 2016 6 7 EXPLANATION: 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 9 MODIFIED FILE: yaz-2.1.56/client/client.c 10 Still require the same change as in number 3 below. 11 12 Ahead 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 14 TESTED: 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. 3 15 4 16 3. 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 136 136 # Need LIBS to contain all the dependencies for libyaz that yaz had worked out (from yaz's Makefile) 137 137 # 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\?//')138 YAZ_LIBS = $(shell egrep "^LIBS\s?=" $(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.56/Makefile | sed 's/^LIBS\s\?=\s\?//') 139 139 Z3950_LIBS = $(Z3950_DIR)/gsdlz3950.a $(RUNTIME_PACKAGES_DIR)/yaz/lib/libyaz.a $(YAZ_LIBS) 140 140 else -
main/trunk/greenstone2/runtime-src/src/recpt/win32.mak
r29047 r30954 129 129 Z3950_DEFS = -DUSE_Z3950 130 130 Z3950_INCLUDES = -I$(Z3950_DIR) 131 Z3950_LIBS = $(Z3950_DIR)\gsdlz3950.lib $(PACKAGES_DIR)\yaz\yaz-2.1. 4\lib\yaz.lib131 Z3950_LIBS = $(Z3950_DIR)\gsdlz3950.lib $(PACKAGES_DIR)\yaz\yaz-2.1.56\lib\yaz.lib 132 132 !ELSE 133 133 Z3950_DEFS = -
main/trunk/greenstone2/runtime-src/src/z3950/Makefile.in
r30948 r30954 105 105 # Do NOT add the "recpt" directory here: the z39.50 code should be independent of the receptionist! 106 106 INCLUDES = -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)/d2m107 $(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 109 109 INSTALL = @INSTALL@ 110 110 LDFLAGS = @LDFLAGS@ … … 112 112 # Need LIBS to contain all the dependencies for libyaz that yaz had worked out (from yaz's Makefile) 113 113 # 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\?//')114 YAZ_LIBS = $(shell egrep "^LIBS\s?=" $(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.56/Makefile | sed 's/^LIBS\s\?=\s\?//') 115 115 LIBS = @LIBS@ $(GDBM_LIBS) -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat \ 116 116 $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) \ … … 182 182 gsdlz3950.a: $(LIBRARY_OBJECTS) 183 183 rm -f $(LIBRARY) 184 $(AR) cru $(LIBRARY) $(LIBRARY_OBJECTS) $(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1. 4/client/tabcomplete.o184 $(AR) cru $(LIBRARY) $(LIBRARY_OBJECTS) $(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.56/client/tabcomplete.o 185 185 $(RANLIB) $(LIBRARY) 186 186 -
main/trunk/greenstone2/runtime-src/src/z3950/win32.mak
r25178 r30954 141 141 # Do NOT add the "recpt" directory here: the z39.50 code should be independent of the receptionist! 142 142 INCLUDES = -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" \ 145 145 $(GDBM_INCLUDES) 146 146 LIBS = "$(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) \ 148 148 $(SQLITE_LIBS) 149 149 … … 217 217 gsdlz3950.lib: $(LIBRARY_OBJECTS) 218 218 if EXIST $(LIBRARY) del $(LIBRARY) 219 $(AR) -nologo /out:$(LIBRARY) $(LIBRARY_OBJECTS) $(PACKAGES_DIR)/yaz/yaz-2.1. 4/win/obj/tabcomplete.obj219 $(AR) -nologo /out:$(LIBRARY) $(LIBRARY_OBJECTS) $(PACKAGES_DIR)/yaz/yaz-2.1.56/win/obj/tabcomplete.obj 220 220 221 221 z3950server.exe: $(EXECUTABLE_OBJECTS) -
main/trunk/greenstone2/runtime-src/src/z3950/yaz_zclient.h
r15492 r30954 6 6 /* the new yaz_zclient made for use with Greenstone. Based on client.c 7 7 * (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. 8 9 */ 9 10 void z_initialize(void); -
main/trunk/greenstone2/runtime-src/win32.mak
r22090 r30954 51 51 PACKAGEDIRS = 52 52 53 YAZ_DIR = packages\yaz\yaz-2.1. 4\win53 YAZ_DIR = packages\yaz\yaz-2.1.56\win 54 54 55 55 MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)"
Note:
See TracChangeset
for help on using the changeset viewer.