Changeset 22766

Timestamp:

2010-08-24T16:58:15+12:00 (14 years ago)

Author:

mdewsnip

Message:

Instead of having two copies of expat in Greenstone (one for Linux and one for Windows), added Windows makefiles into the version in common-src/packages/expat. This means we can remove the Windows-only version in common-src/packages/windows/expat, and also means that expat now works the same as SQLite.

Location:

main/trunk/greenstone2

Files:

• Install.txt (modified) (1 diff)
• common-src/packages/windows/expat/expat.zip (deleted)
• common-src/win32.mak (modified) (4 diffs)
• makegs2.bat (modified) (3 diffs)
• runtime-src/src/colservr/win32.mak (modified) (1 diff)
• runtime-src/src/oaiservr/win32.mak (modified) (1 diff)
• runtime-src/src/recpt/win32.mak (modified) (1 diff)
• runtime-src/src/w32server/win32.mak (modified) (1 diff)
• runtime-src/src/z3950/win32.mak (modified) (1 diff)

main/trunk/greenstone2/Install.txt

@@ -61 +61 @@
    * Greenstone\common-src\packages\windows\gdbm\gdbm.zip
    * Greenstone\common-src\packages\windows\crypt\crypt.zip
-   * Greenstone\common-src\packages\windows\expat\expat.zip
    * Greenstone\common-src\packages\windows\stlport\stlport.zip (VC++ 4.2 only)
 

main/trunk/greenstone2/common-src/win32.mak

@@ -51 +51 @@
 
 COMPILEDIRS = packages\windows\crypt\crypt \
-          packages\windows\expat\expat packages\search4j src\lib 
+          packages\expat packages\search4j src\lib 
 
 INSTALLDIRS = 
@@ -59 +59 @@
 PACKAGEDIRS = 
 
+EXPAT_DIR = packages\expat\expat-1.95.8
 SQLITE_DIR = packages\sqlite\sqlite-amalgamation-3.6.23.1
 JDBM_DIR = packages\jdbm
@@ -136 +137 @@
     if NOT EXIST "crypt" unzip crypt.zip
     cd "$(COMMONHOME)"
-    cd packages\windows\expat
-    if NOT EXIST "expat" unzip expat.zip
+    cd packages\expat
+    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
+    @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. ******
+    @IF NOT EXIST $(EXPAT_DIR) exit /b 1
     cd "$(COMMONHOME)"
     cd indexers\packages\windows\iconv
@@ -166 +169 @@
 !ENDIF
     cd "$(COMMONHOME)"
-    cd packages\windows\expat\expat
+    cd packages\expat
     $(MAKECLEANCMD)
     cd "$(COMMONHOME)"

main/trunk/greenstone2/makegs2.bat

@@ -38 +38 @@
 IF NOT EXIST .\common-src\packages\windows\crypt\crypt\nul IF NOT EXIST .\common-src\packages\windows\crypt\crypt.zip GOTO ENDNOWINPACK
 
-IF NOT EXIST .\common-src\packages\windows\expat\expat\nul IF NOT EXIST .\common-src\packages\windows\expat\expat.zip GOTO ENDNOWINPACK
+IF NOT EXIST .\common-src\packages\expat\expat* IF NOT EXIST .\common-src\packages\expat\expat*.tar.gz GOTO ENDNOWINPACK
 
 :: 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\
 
-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\
+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
 
 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
 IF NOT EXIST .\common-src\packages\windows\crypt\crypt\*.* GOTO NEEDUNZIP
-IF NOT EXIST .\common-src\packages\windows\expat\expat\*.* GOTO NEEDUNZIP
+IF NOT EXIST .\common-src\packages\expat\expat* GOTO NEEDUNZIP
 :: IF NOT EXIST .\common-src\packages\windows\gdbm\gdbm\*.* GOTO NEEDUNZIP
 IF NOT EXIST .\common-src\packages\windows\stlport\stlport\*.* GOTO NEEDUNZIP

main/trunk/greenstone2/runtime-src/src/colservr/win32.mak

@@ -146 +146 @@
     $(MG_INCLUDES) \
     $(MGPP_INCLUDES) \
-    -I"$(COMMON_PACKAGES_DIR)\windows\expat\expat" $(GDBM_INCLUDES) $(SQLITE_INCLUDES)
+    -I"$(COMMON_PACKAGES_DIR)\expat\include" $(GDBM_INCLUDES) $(SQLITE_INCLUDES)
 
 !IF $(GSDL_VC4)

main/trunk/greenstone2/runtime-src/src/oaiservr/win32.mak

@@ -143 +143 @@
         $(MGPP_INCLUDES) -I"$(COMMON_PACKAGES_DIR)\windows\crypt\crypt" \
     $(GDBM_INCLUDES) \
-    -I"$(COMMON_PACKAGES_DIR)\windows\expat\expat"
+    -I"$(COMMON_PACKAGES_DIR)\expat\include"
 LDFLAGS = 
-LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \
+LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\expat\lib\libexpat.lib" \
         $(GDBM_LIBS) $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)
 

main/trunk/greenstone2/runtime-src/src/recpt/win32.mak

@@ -162 +162 @@
 INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \
     $(MG_INCLUDES) $(MGPP_INCLUDES) \
-    -I"$(COMMON_PACKAGES_DIR)\windows\crypt\crypt" -I"$(COMMON_PACKAGES_DIR)\windows\expat\expat" \
+    -I"$(COMMON_PACKAGES_DIR)\windows\crypt\crypt" -I"$(COMMON_PACKAGES_DIR)\expat\include" \
     $(GDBM_INCLUDES) \
     $(Z3950_INCLUDES)
 LDFLAGS = 
-LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \
+LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\expat\lib\libexpat.lib" \
        $(GDBM_LIBS) $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS)
 

main/trunk/greenstone2/runtime-src/src/w32server/win32.mak

@@ -139 +139 @@
         $(MGPP_INCLUDES)
 
-LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \
+LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\expat\lib\libexpat.lib" \
         $(GDBM_LIBS) $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)
 RSC = rc

main/trunk/greenstone2/runtime-src/src/z3950/win32.mak

@@ -143 +143 @@
     $(GDBM_INCLUDES)
 LDFLAGS = 
-LIBS = "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" $(GDBM_LIBS) \
+LIBS = "$(COMMON_PACKAGES_DIR)\expat\lib\libexpat.lib" $(GDBM_LIBS) \
         "$(PACKAGES_DIR)\d2m\libd2m.lib" "$(PACKAGES_DIR)\yaz\yaz-2.1.4\lib\yaz.lib" $(ACCENTFOLD_LIBS) \
     $(SQLITE_LIBS)