Ignore:
Timestamp:
02/16/17 18:46:38 (4 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:
1 edited

Legend:

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

    r31421 r31422  
    2121CD /D "%~dp0"
    2222
     23:: Change this if the extracted folder name of the apache-httpd2 within runtime-src\packages\apache-httpd ever changes
     24set httpddir=httpd-2.2.11
    2325
    2426:: Set this to "true" if this script can attempt to setup the environment for compilation for you (leave empty if you will do it)
     
    199201:WITHAPACHE
    200202:: Only compile up the Apache web server if we're asked to
     203:: After unpacking apache httpd 2, patch up the .mak files to prevent the compile failure
     204:: due to a race condition. (The release kit does this patch for GS2 using custom ant tasks)
     205:: Then can finally start compiling GS2 with apache-httpd.
    201206
    202207:: Now unpack the custom GS2 apache web server tar.gz file
    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
    206 IF 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
     208IF NOT EXIST .\runtime-src\packages\apache-httpd\%httpddir%\nul (
     209    .\bin\windows\gunzip.exe -cd .\runtime-src\packages\apache-httpd\httpd-*.tar.gz | .\bin\windows\tar.exe xv --directory=./runtime-src/packages/apache-httpd
     210    call runtime-src\packages\apache-httpd\adjust-winmak-files.bat %httpddir%   
    209211)
    210212nmake /f win32.mak APACHE_HTTPD=1
     
    226228:WITHALL
    227229:: Now unpack the custom GS2 apache web server tar.gz file, if not already unpacked
    228 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
     230IF NOT EXIST .\runtime-src\packages\apache-httpd\%httpddir%\nul (
     231    .\bin\windows\gunzip.exe -cd .\runtime-src\packages\apache-httpd\httpd-*.tar.gz | .\bin\windows\tar.exe xv --directory=./runtime-src/packages/apache-httpd
     232    call runtime-src\packages\apache-httpd\adjust-winmak-files.bat %httpddir%
     233)
    229234
    230235echo.
     
    237242:WITHALLDEBUG
    238243:: Now unpack the custom GS2 apache web server tar.gz file, if not already unpacked
    239 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
     244IF NOT EXIST .\runtime-src\packages\apache-httpd\%httpddir%\nul (
     245    .\bin\windows\gunzip.exe -cd .\runtime-src\packages\apache-httpd\httpd-*.tar.gz | .\bin\windows\tar.exe xv --directory=./runtime-src/packages/apache-httpd
     246    call runtime-src\packages\apache-httpd\adjust-winmak-files.bat %httpddir%
     247)
    240248
    241249echo.
Note: See TracChangeset for help on using the changeset viewer.