Changeset 22766 for main/trunk/greenstone2/common-src/win32.mak

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.

File:

• main/trunk/greenstone2/common-src/win32.mak (modified) (4 diffs)

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)"