Changeset 22766

Show
Ignore:
Timestamp:
24.08.2010 16:58:15 (9 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:
1 removed
8 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/Install.txt

    r19177 r22766  
    6161   * Greenstone\common-src\packages\windows\gdbm\gdbm.zip 
    6262   * Greenstone\common-src\packages\windows\crypt\crypt.zip 
    63    * Greenstone\common-src\packages\windows\expat\expat.zip 
    6463   * Greenstone\common-src\packages\windows\stlport\stlport.zip (VC++ 4.2 only) 
    6564 
  • main/trunk/greenstone2/common-src/win32.mak

    r22090 r22766  
    5151 
    5252COMPILEDIRS = packages\windows\crypt\crypt \ 
    53           packages\windows\expat\expat packages\search4j src\lib  
     53          packages\expat packages\search4j src\lib  
    5454 
    5555INSTALLDIRS =  
     
    5959PACKAGEDIRS =  
    6060 
     61EXPAT_DIR = packages\expat\expat-1.95.8 
    6162SQLITE_DIR = packages\sqlite\sqlite-amalgamation-3.6.23.1 
    6263JDBM_DIR = packages\jdbm 
     
    136137    if NOT EXIST "crypt" unzip crypt.zip 
    137138    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 
    140143    cd "$(COMMONHOME)" 
    141144    cd indexers\packages\windows\iconv 
     
    166169!ENDIF 
    167170    cd "$(COMMONHOME)" 
    168     cd packages\windows\expat\expat 
     171    cd packages\expat 
    169172    $(MAKECLEANCMD) 
    170173    cd "$(COMMONHOME)" 
  • main/trunk/greenstone2/makegs2.bat

    r20765 r22766  
    3838IF NOT EXIST .\common-src\packages\windows\crypt\crypt\nul IF NOT EXIST .\common-src\packages\windows\crypt\crypt.zip GOTO ENDNOWINPACK 
    3939 
    40 IF NOT EXIST .\common-src\packages\windows\expat\expat\nul IF NOT EXIST .\common-src\packages\windows\expat\expat.zip GOTO ENDNOWINPACK 
     40IF NOT EXIST .\common-src\packages\expat\expat* IF NOT EXIST .\common-src\packages\expat\expat*.tar.gz GOTO ENDNOWINPACK 
    4141 
    4242:: IF NOT EXIST .\common-src\packages\windows\gdbm\gdbm\nul IF NOT EXIST .\common-src\packages\windows\gdbm\gdbm.zip GOTO ENDNOWINPACK 
     
    6464IF 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\ 
    6565 
    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\ 
     66IF 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 
    6767 
    6868IF 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\ 
     
    8181rem Last check if all the packages have been extracted prior compilation 
    8282IF NOT EXIST .\common-src\packages\windows\crypt\crypt\*.* GOTO NEEDUNZIP 
    83 IF NOT EXIST .\common-src\packages\windows\expat\expat\*.* GOTO NEEDUNZIP 
     83IF NOT EXIST .\common-src\packages\expat\expat* GOTO NEEDUNZIP 
    8484:: IF NOT EXIST .\common-src\packages\windows\gdbm\gdbm\*.* GOTO NEEDUNZIP 
    8585IF NOT EXIST .\common-src\packages\windows\stlport\stlport\*.* GOTO NEEDUNZIP 
  • main/trunk/greenstone2/runtime-src/src/colservr/win32.mak

    r22062 r22766  
    146146    $(MG_INCLUDES) \ 
    147147    $(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) 
    149149 
    150150!IF $(GSDL_VC4) 
  • main/trunk/greenstone2/runtime-src/src/oaiservr/win32.mak

    r22090 r22766  
    143143        $(MGPP_INCLUDES) -I"$(COMMON_PACKAGES_DIR)\windows\crypt\crypt" \ 
    144144    $(GDBM_INCLUDES) \ 
    145     -I"$(COMMON_PACKAGES_DIR)\windows\expat\expat" 
     145    -I"$(COMMON_PACKAGES_DIR)\expat\include" 
    146146LDFLAGS =  
    147 LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \ 
     147LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\expat\lib\libexpat.lib" \ 
    148148        $(GDBM_LIBS) $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) 
    149149 
  • main/trunk/greenstone2/runtime-src/src/recpt/win32.mak

    r22188 r22766  
    162162INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \ 
    163163    $(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" \ 
    165165    $(GDBM_INCLUDES) \ 
    166166    $(Z3950_INCLUDES) 
    167167LDFLAGS =  
    168 LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \ 
     168LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\expat\lib\libexpat.lib" \ 
    169169       $(GDBM_LIBS) $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS) 
    170170 
  • main/trunk/greenstone2/runtime-src/src/w32server/win32.mak

    r22090 r22766  
    139139        $(MGPP_INCLUDES) 
    140140 
    141 LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \ 
     141LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\expat\lib\libexpat.lib" \ 
    142142        $(GDBM_LIBS) $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) 
    143143RSC = rc 
  • main/trunk/greenstone2/runtime-src/src/z3950/win32.mak

    r22090 r22766  
    143143    $(GDBM_INCLUDES) 
    144144LDFLAGS =  
    145 LIBS = "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" $(GDBM_LIBS) \ 
     145LIBS = "$(COMMON_PACKAGES_DIR)\expat\lib\libexpat.lib" $(GDBM_LIBS) \ 
    146146        "$(PACKAGES_DIR)\d2m\libd2m.lib" "$(PACKAGES_DIR)\yaz\yaz-2.1.4\lib\yaz.lib" $(ACCENTFOLD_LIBS) \ 
    147147    $(SQLITE_LIBS)