Show
Ignore:
Timestamp:
16.02.2017 17:33:12 (3 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.

Location:
main/trunk/greenstone2
Files:
1 added
1 modified

Legend:

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

    r28097 r31421  
    201201 
    202202:: Now unpack the custom GS2 apache web server tar.gz file 
    203 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 
    204  
     203:: and patch up the .mak files to prevent the compile failure due to a race condition 
     204:: (The release kit does this for GS2 using custom ant tasks) 
     205:: Then can start compiling GS2 with apache-httpd 
     206IF NOT EXIST .\runtime-src\packages\apache-httpd\httpd-2.2.11\nul ( 
     207    .\bin\windows\gunzip.exe -cd .\runtime-src\packages\apache-httpd\httpd-*.tar.gz | .\bin\windows\tar.exe xv --directory=./runtime-src/packages/apache-httpd   
     208    runtime-src\packages\apache-httpd\adjust-winmak-files.bat httpd-2.2.11 
     209) 
    205210nmake /f win32.mak APACHE_HTTPD=1 
    206211GOTO ENDOK