Changeset 25525 for main/trunk/greenstone2/makegs2.bat

Timestamp:

2012-05-04T17:36:29+12:00 (12 years ago)

Author:

ak19

Message:

Added a Compile All command without turning debugging on.

File:

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

main/trunk/greenstone2/makegs2.bat

@@ -139 +139 @@
 echo 2. Web library only
 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 4. All
+echo 5. All (with Debugging ON)
+echo 6. Clean (when re-compiling all, do this before step 5)
+echo 7. 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:123456
-    IF errorlevel 6 GOTO END
-    IF errorlevel 5 GOTO DOCLEAN
+.\bin\windows\choice.exe /N /T:3,15 /C:1234567
+    IF errorlevel 7 GOTO END
+    IF errorlevel 6 GOTO DOCLEAN
+    IF errorlevel 5 GOTO WITHALLDEBUG
     IF errorlevel 4 GOTO WITHALL
     IF errorlevel 3 GOTO WITHAPACHE
@@ -182 +184 @@
 
 :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
+nmake /f win32.mak LOCAL_LIBRARY=1
+nmake /f win32.mak APACHE_HTTPD=1
+GOTO ENDOK
+
+:WITHALLDEBUG
 :: 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