Changeset 27622

Show
Ignore:
Timestamp:
14.06.2013 15:49:28 (6 years ago)
Author:
ak19
Message:

Added in an automatic compilation mode, which you can use by passing in the silent flag to makegs2 or makegs2x64

Location:
main/trunk/greenstone2
Files:
2 modified

Legend:

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

    r27221 r27622  
    1111) 
    1212 
     13:: if running in silent mode (%1 or %2, depending on if "amd64" is passed in in %1), bypass the user-choice sections 
     14:: auto mode unzips everything and does a compile on ALL (local server, webserver and apache) but no debug 
     15:: auto mode is used by the diffcol process which checks out gs2, compiles it and tests tutorial collections 
     16set MODE=user 
     17if "%1"=="silent" set MODE=auto 
     18if "%2"=="silent" set MODE=auto 
     19 
    1320pushd "%CD%" 
    1421CD /D "%~dp0" 
     
    6673IF NOT EXIST .\common-src\packages\sqlite\sqlite* IF NOT EXIST .\common-src\packages\sqlite\sqlite*.tar.gz GOTO ENDNOSQLITE 
    6774 
     75 
     76if "MODE"=="auto" GOTO UNZIP 
     77 
    6878rem Ask the user to extract now or to directly compile 
    6979echo Do you want to extract the required packages (Recommended)? This will be the default action in 10 seconds. 
     
    101111:COMPILE 
    102112 
    103 rem Last check if all the packages have been extracted prior compilation 
     113rem Last check if all the packages have been extracted prior to compilation 
    104114IF NOT EXIST .\common-src\packages\windows\crypt\crypt\*.* GOTO NEEDUNZIP 
    105115IF NOT EXIST .\common-src\packages\expat\expat* GOTO NEEDUNZIP 
     
    147157 
    148158:PROMPT 
     159if "MODE"=="auto" GOTO WITHALL 
    149160echo. 
    150161rem Ask the user what to compile 
     
    231242 
    232243:NEEDUNZIP 
     244if "MODE"=="auto" GOTO ENDNOUNZIP 
    233245echo. 
    234246echo /!\ Error /!\ - Some or all the packages are not properly extracted. 
     
    253265echo (FAILED trying to get it from http://svn.greenstone.org/main/trunk/binaries/windows/bin.) 
    254266echo Winbin is required to get the conversion tools used for importing different types of files. 
    255 echo For more info please visit this page 
     267echo For more info please visit this page: 
    256268echo http://wiki.greenstone.org/wiki/index.php/Installing_Greenstone_2_from_SVN_source_on_Windows#Getting_winbin 
    257269GOTO END 
  • main/trunk/greenstone2/makegs2x64.bat

    r26615 r27622  
    11@echo off 
    2 call .\makegs2.bat amd64 
     2call .\makegs2.bat amd64 %*