Changeset 19909

Show
Ignore:
Timestamp:
24.06.2009 19:08:52 (11 years ago)
Author:
ak19
Message:

1. Unzips iconv if not yet unzipped. 2. Calls winMake on the indexers folder with parameter gs2 only if we're dealing with GS2 (runtime-src exists). Otherwise, we're dealing with GS3 and the parameter gs2 is not passed to the indexers' winMake batfile.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/common-src/win32.mak

    r19908 r19909  
    9090    cd packages\windows\expat 
    9191    if NOT EXIST "expat" unzip expat.zip 
     92    cd "$(COMMONHOME)" 
     93    cd indexers\packages\windows\iconv 
     94    if NOT EXIST "iconv" unzip iconv.zip 
     95    cd "$(COMMONHOME)" 
     96#   cd packages\sqlite 
     97#   if NOT EXIST "sqlite-amalgamation-3.5.9" unzip sqlite-amalgamation-3.5.zip 
     98#   cd "$(COMMONHOME)" 
    9299 
    93100clean: 
     
    162169    cd "$@" 
    163170    set DEBUG=$(DEBUG) 
    164     call winMake.bat all gs2  
    165     call winMake.bat install gs2 
     171    if EXIST "$(GSDLHOME)\runtime-src" call winMake.bat all gs2  
     172    if EXIST "$(GSDLHOME)\runtime-src" call winMake.bat install gs2 
     173    if NOT EXIST "$(GSDLHOME)\runtime-src" call winMake.bat all 
     174    if NOT EXIST "$(GSDLHOME)\runtime-src" call winMake.bat install 
     175 
    166176    set DEBUG= 
    167177    if NOT EXIST "$(GSDLHOME)\bin\windows" mkdir "$(GSDLHOME)\bin\windows"