Changeset 22766 for main/trunk
- Timestamp:
- 2010-08-24T16:58:15+12:00 (14 years ago)
- Location:
- main/trunk/greenstone2
- Files:
-
- 1 deleted
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/Install.txt
r19177 r22766 61 61 * Greenstone\common-src\packages\windows\gdbm\gdbm.zip 62 62 * Greenstone\common-src\packages\windows\crypt\crypt.zip 63 * Greenstone\common-src\packages\windows\expat\expat.zip64 63 * Greenstone\common-src\packages\windows\stlport\stlport.zip (VC++ 4.2 only) 65 64 -
main/trunk/greenstone2/common-src/win32.mak
r22090 r22766 51 51 52 52 COMPILEDIRS = packages\windows\crypt\crypt \ 53 packages\ windows\expat\expat packages\search4j src\lib53 packages\expat packages\search4j src\lib 54 54 55 55 INSTALLDIRS = … … 59 59 PACKAGEDIRS = 60 60 61 EXPAT_DIR = packages\expat\expat-1.95.8 61 62 SQLITE_DIR = packages\sqlite\sqlite-amalgamation-3.6.23.1 62 63 JDBM_DIR = packages\jdbm … … 136 137 if NOT EXIST "crypt" unzip crypt.zip 137 138 cd "$(COMMONHOME)" 138 cd packages\windows\expat 139 if NOT EXIST "expat" unzip expat.zip 139 cd packages\expat 140 IF NOT EXIST $(EXPAT_DIR) IF EXIST "$(GSDLHOME)\bin\windows\gunzip.exe" IF EXIST "$(GSDLHOME)\bin\windows\tar.exe" "$(GSDLHOME)\bin\windows\gunzip.exe" -cd "$(EXPAT_DIR).tar.gz" | "$(GSDLHOME)\bin\windows\tar.exe" xv --directory=./packages/expat 141 @IF NOT EXIST $(EXPAT_DIR) echo ****** Couldn't extract archive $(EXPAT_DIR).tar.gz. Extract it manually, or check that gunzip.exe and tar.exe exist in GSDLHOME\bin\windows. ****** 142 @IF NOT EXIST $(EXPAT_DIR) exit /b 1 140 143 cd "$(COMMONHOME)" 141 144 cd indexers\packages\windows\iconv … … 166 169 !ENDIF 167 170 cd "$(COMMONHOME)" 168 cd packages\ windows\expat\expat171 cd packages\expat 169 172 $(MAKECLEANCMD) 170 173 cd "$(COMMONHOME)" -
main/trunk/greenstone2/makegs2.bat
r20765 r22766 38 38 IF NOT EXIST .\common-src\packages\windows\crypt\crypt\nul IF NOT EXIST .\common-src\packages\windows\crypt\crypt.zip GOTO ENDNOWINPACK 39 39 40 IF NOT EXIST .\common-src\packages\ windows\expat\expat\nul IF NOT EXIST .\common-src\packages\windows\expat\expat.zipGOTO ENDNOWINPACK40 IF NOT EXIST .\common-src\packages\expat\expat* IF NOT EXIST .\common-src\packages\expat\expat*.tar.gz GOTO ENDNOWINPACK 41 41 42 42 :: IF NOT EXIST .\common-src\packages\windows\gdbm\gdbm\nul IF NOT EXIST .\common-src\packages\windows\gdbm\gdbm.zip GOTO ENDNOWINPACK … … 64 64 IF EXIST .\common-src\packages\windows\crypt\crypt.zip .\bin\windows\unzip.exe -o .\common-src\packages\windows\crypt\crypt.zip -d .\common-src\packages\windows\crypt\ 65 65 66 IF EXIST .\common-src\packages\ windows\expat\expat.zip .\bin\windows\unzip.exe -o .\common-src\packages\windows\expat\expat.zip -d .\common-src\packages\windows\expat\66 IF EXIST .\common-src\packages\expat\expat*.tar.gz .\bin\windows\gunzip.exe -cd .\common-src\packages\expat\expat*.tar.gz | .\bin\windows\tar.exe xv --directory=./common-src/packages/expat 67 67 68 68 IF EXIST .\common-src\packages\windows\gdbm\gdbm.zip .\bin\windows\unzip.exe -o .\common-src\packages\windows\gdbm\gdbm.zip -d .\common-src\packages\windows\gdbm\ … … 81 81 rem Last check if all the packages have been extracted prior compilation 82 82 IF NOT EXIST .\common-src\packages\windows\crypt\crypt\*.* GOTO NEEDUNZIP 83 IF NOT EXIST .\common-src\packages\ windows\expat\expat\*.* GOTO NEEDUNZIP83 IF NOT EXIST .\common-src\packages\expat\expat* GOTO NEEDUNZIP 84 84 :: IF NOT EXIST .\common-src\packages\windows\gdbm\gdbm\*.* GOTO NEEDUNZIP 85 85 IF NOT EXIST .\common-src\packages\windows\stlport\stlport\*.* GOTO NEEDUNZIP -
main/trunk/greenstone2/runtime-src/src/colservr/win32.mak
r22062 r22766 146 146 $(MG_INCLUDES) \ 147 147 $(MGPP_INCLUDES) \ 148 -I"$(COMMON_PACKAGES_DIR)\ windows\expat\expat" $(GDBM_INCLUDES) $(SQLITE_INCLUDES)148 -I"$(COMMON_PACKAGES_DIR)\expat\include" $(GDBM_INCLUDES) $(SQLITE_INCLUDES) 149 149 150 150 !IF $(GSDL_VC4) -
main/trunk/greenstone2/runtime-src/src/oaiservr/win32.mak
r22090 r22766 143 143 $(MGPP_INCLUDES) -I"$(COMMON_PACKAGES_DIR)\windows\crypt\crypt" \ 144 144 $(GDBM_INCLUDES) \ 145 -I"$(COMMON_PACKAGES_DIR)\ windows\expat\expat"145 -I"$(COMMON_PACKAGES_DIR)\expat\include" 146 146 LDFLAGS = 147 LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\ windows\expat\expat\libexpat.lib" \147 LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\expat\lib\libexpat.lib" \ 148 148 $(GDBM_LIBS) $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) 149 149 -
main/trunk/greenstone2/runtime-src/src/recpt/win32.mak
r22188 r22766 162 162 INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \ 163 163 $(MG_INCLUDES) $(MGPP_INCLUDES) \ 164 -I"$(COMMON_PACKAGES_DIR)\windows\crypt\crypt" -I"$(COMMON_PACKAGES_DIR)\ windows\expat\expat" \164 -I"$(COMMON_PACKAGES_DIR)\windows\crypt\crypt" -I"$(COMMON_PACKAGES_DIR)\expat\include" \ 165 165 $(GDBM_INCLUDES) \ 166 166 $(Z3950_INCLUDES) 167 167 LDFLAGS = 168 LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\ windows\expat\expat\libexpat.lib" \168 LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\expat\lib\libexpat.lib" \ 169 169 $(GDBM_LIBS) $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS) 170 170 -
main/trunk/greenstone2/runtime-src/src/w32server/win32.mak
r22090 r22766 139 139 $(MGPP_INCLUDES) 140 140 141 LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\ windows\expat\expat\libexpat.lib" \141 LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\expat\lib\libexpat.lib" \ 142 142 $(GDBM_LIBS) $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) 143 143 RSC = rc -
main/trunk/greenstone2/runtime-src/src/z3950/win32.mak
r22090 r22766 143 143 $(GDBM_INCLUDES) 144 144 LDFLAGS = 145 LIBS = "$(COMMON_PACKAGES_DIR)\ windows\expat\expat\libexpat.lib" $(GDBM_LIBS) \145 LIBS = "$(COMMON_PACKAGES_DIR)\expat\lib\libexpat.lib" $(GDBM_LIBS) \ 146 146 "$(PACKAGES_DIR)\d2m\libd2m.lib" "$(PACKAGES_DIR)\yaz\yaz-2.1.4\lib\yaz.lib" $(ACCENTFOLD_LIBS) \ 147 147 $(SQLITE_LIBS)
Note:
See TracChangeset
for help on using the changeset viewer.