Changeset 24461

Show
Ignore:
Timestamp:
24.08.2011 15:59:28 (8 years ago)
Author:
ak19
Message:

Updated automated compilation script with clean command and a (compile) All command in place of a compile Both command (that used to compile local-lib server and web server, but not apache server).

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/makegs2.bat

    r22766 r24461  
    131131echo 1. Local library only 
    132132echo 2. Web library only 
    133 echo 3. Both 
    134 echo 4. Apache local library (needs Microsoft Platform SDK) 
    135 echo 5. Quit 
     133echo 3. Apache local library (needs Microsoft Platform SDK) 
     134echo 4. All (with Debugging turned on) 
     135echo 5. Clean (when re-compiling all, do this before step 4) 
     136echo 6. Quit 
    136137echo. 
    137138echo Please choose a number from the menu. Otherwise both libraries will be compiled in 15 seconds. 
    138139.\bin\windows\choice.exe /N /T:3,15 /C:12345 
    139     IF errorlevel 5 GOTO END 
    140     IF errorlevel 4 GOTO WITHAPACHE 
    141     IF errorlevel 3 GOTO WITHBOTH 
     140    IF errorlevel 6 GOTO END 
     141    IF errorlevel 5 GOTO DOCLEAN 
     142    IF errorlevel 4 GOTO WITHALL 
     143    IF errorlevel 3 GOTO WITHAPACHE 
    142144    IF errorlevel 2 GOTO WITHOUTLOCALLIB 
    143145    IF errorlevel 1 GOTO WITHLOCALLIB 
    144146    IF errorlevel 0 GOTO END 
    145147 
    146  
     148:DOCLEAN 
     149echo. 
     150echo. 
     151nmake /f win32.mak CLEAN 
     152GOTO ENDOK 
     153     
    147154:WITHAPACHE 
    148155:: Only compile up the Apache web server if we're asked to 
     
    167174GOTO ENDOK 
    168175 
    169 :WITHBOTH 
    170 echo. 
    171 echo. 
    172 nmake /f win32.mak 
    173 nmake /f win32.mak LOCAL_LIBRARY=1 
     176:WITHALL 
     177:: Now unpack the custom GS2 apache web server tar.gz file, if not already unpacked 
     178IF NOT EXIST .\runtime-src\packages\apache-httpd\httpd-2.2.11\nul .\bin\windows\gunzip.exe -cd .\runtime-src\packages\apache-httpd\httpd-*.tar.gz | .\bin\windows\tar.exe xv --directory=./runtime-src/packages/apache-httpd 
     179 
     180echo. 
     181echo. 
     182nmake /f win32.mak DEBUG=1 
     183nmake /f win32.mak LOCAL_LIBRARY=1 DEBUG=1 
     184nmake /f win32.mak APACHE_HTTPD=1 DEBUG=1 
    174185GOTO ENDOK 
    175186