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

Timestamp:

2017-02-16T18:46:38+13:00 (7 years ago)

Author:

ak19

Message:

Corrections to previous commit: need to CALL the new adjust-winmak-fils.bat script else the current script does not continue from where it left out. Also need to add the calls to the script in 3 batch labels that deal with compiling apache httpd. Using a variable instead of hardcoding the version of apache httpd2.

File:

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

main/trunk/greenstone2/makegs2.bat

@@ -21 +21 @@
 CD /D "%~dp0"
 
+:: Change this if the extracted folder name of the apache-httpd2 within runtime-src\packages\apache-httpd ever changes
+set httpddir=httpd-2.2.11
 
 :: Set this to "true" if this script can attempt to setup the environment for compilation for you (leave empty if you will do it)
@@ -199 +201 @@
 :WITHAPACHE
 :: Only compile up the Apache web server if we're asked to
+:: After unpacking apache httpd 2, patch up the .mak files to prevent the compile failure
+:: due to a race condition. (The release kit does this patch for GS2 using custom ant tasks)
+:: Then can finally start compiling GS2 with apache-httpd.
 
 :: Now unpack the custom GS2 apache web server tar.gz file
-:: 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
+IF NOT EXIST .\runtime-src\packages\apache-httpd\%httpddir%\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
+    call runtime-src\packages\apache-httpd\adjust-winmak-files.bat %httpddir%   
 )
 nmake /f win32.mak APACHE_HTTPD=1
@@ -226 +228 @@
 :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
+IF NOT EXIST .\runtime-src\packages\apache-httpd\%httpddir%\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
+    call runtime-src\packages\apache-httpd\adjust-winmak-files.bat %httpddir%
+)
 
 echo.
@@ -237 +242 @@
 :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
+IF NOT EXIST .\runtime-src\packages\apache-httpd\%httpddir%\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
+    call runtime-src\packages\apache-httpd\adjust-winmak-files.bat %httpddir%
+)
 
 echo.