Changeset 24461 for main/trunk

Timestamp:

2011-08-24T15:59:28+12:00 (13 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).

File:

• main/trunk/greenstone2/makegs2.bat (modified) (2 diffs)

main/trunk/greenstone2/makegs2.bat

@@ -131 +131 @@
 echo 1. Local library only
 echo 2. Web library only
-echo 3. Both
-echo 4. Apache local library (needs Microsoft Platform SDK)
-echo 5. Quit
+echo 3. Apache local library (needs Microsoft Platform SDK)
+echo 4. All (with Debugging turned on)
+echo 5. Clean (when re-compiling all, do this before step 4)
+echo 6. Quit
 echo.
 echo Please choose a number from the menu. Otherwise both libraries will be compiled in 15 seconds.
 .\bin\windows\choice.exe /N /T:3,15 /C:12345
-    IF errorlevel 5 GOTO END
-    IF errorlevel 4 GOTO WITHAPACHE
-    IF errorlevel 3 GOTO WITHBOTH
+    IF errorlevel 6 GOTO END
+    IF errorlevel 5 GOTO DOCLEAN
+    IF errorlevel 4 GOTO WITHALL
+    IF errorlevel 3 GOTO WITHAPACHE
     IF errorlevel 2 GOTO WITHOUTLOCALLIB
     IF errorlevel 1 GOTO WITHLOCALLIB
     IF errorlevel 0 GOTO END
 
-
+:DOCLEAN
+echo.
+echo.
+nmake /f win32.mak CLEAN
+GOTO ENDOK
+    
 :WITHAPACHE
 :: Only compile up the Apache web server if we're asked to
@@ -167 +174 @@
 GOTO ENDOK
 
-:WITHBOTH
-echo.
-echo.
-nmake /f win32.mak
-nmake /f win32.mak LOCAL_LIBRARY=1
+:WITHALL
+:: Now unpack the custom GS2 apache web server tar.gz file, if not already unpacked
+IF 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
+
+echo.
+echo.
+nmake /f win32.mak DEBUG=1
+nmake /f win32.mak LOCAL_LIBRARY=1 DEBUG=1
+nmake /f win32.mak APACHE_HTTPD=1 DEBUG=1
 GOTO ENDOK