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

Timestamp:

2017-02-16T17:33:12+13:00 (7 years ago)

Author:

ak19

Message:

New batch file adjust-winmake-files.bat that adjusts the win mak files within an extracted apache httpd 2 in approximately the same way that the release kit does this (changeset 22490), to prevent the race condition that stops GS2 compilation. This script is called from makegs2.bat after extracting the apache httpd, since the makegs2.bat script is not called by the release-kit which does its own regex replacement within the win mak files using custom anttasks.

File:

• main/trunk/greenstone2/makegs2.bat (modified) (1 diff)

main/trunk/greenstone2/makegs2.bat

@@ -201 +201 @@
 
 :: Now unpack the custom GS2 apache web server tar.gz file
-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
-
+:: and patch up the .mak files to prevent the compile failure due to a race condition
+:: (The release kit does this for GS2 using custom ant tasks)
+:: Then can start compiling GS2 with apache-httpd
+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  
+    runtime-src\packages\apache-httpd\adjust-winmak-files.bat httpd-2.2.11
+)
 nmake /f win32.mak APACHE_HTTPD=1
 GOTO ENDOK