Changeset 27622

Timestamp:

2013-06-14T15:49:28+12:00 (11 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:

• makegs2.bat (modified) (6 diffs)
• makegs2x64.bat (modified) (1 diff)

main/trunk/greenstone2/makegs2.bat

@@ -11 +11 @@
 )
 
+:: if running in silent mode (%1 or %2, depending on if "amd64" is passed in in %1), bypass the user-choice sections
+:: auto mode unzips everything and does a compile on ALL (local server, webserver and apache) but no debug
+:: auto mode is used by the diffcol process which checks out gs2, compiles it and tests tutorial collections
+set MODE=user
+if "%1"=="silent" set MODE=auto
+if "%2"=="silent" set MODE=auto
+
 pushd "%CD%"
 CD /D "%~dp0"
@@ -66 +73 @@
 IF NOT EXIST .\common-src\packages\sqlite\sqlite* IF NOT EXIST .\common-src\packages\sqlite\sqlite*.tar.gz GOTO ENDNOSQLITE
 
+
+if "MODE"=="auto" GOTO UNZIP
+
 rem Ask the user to extract now or to directly compile
 echo Do you want to extract the required packages (Recommended)? This will be the default action in 10 seconds.
@@ -101 +111 @@
 :COMPILE
 
-rem Last check if all the packages have been extracted prior compilation
+rem Last check if all the packages have been extracted prior to compilation
 IF NOT EXIST .\common-src\packages\windows\crypt\crypt\*.* GOTO NEEDUNZIP
 IF NOT EXIST .\common-src\packages\expat\expat* GOTO NEEDUNZIP
@@ -147 +157 @@
 
 :PROMPT
+if "MODE"=="auto" GOTO WITHALL
 echo.
 rem Ask the user what to compile
@@ -231 +242 @@
 
 :NEEDUNZIP
+if "MODE"=="auto" GOTO ENDNOUNZIP
 echo.
 echo /!\ Error /!\ - Some or all the packages are not properly extracted.
@@ -253 +265 @@
 echo (FAILED trying to get it from http://svn.greenstone.org/main/trunk/binaries/windows/bin.)
 echo Winbin is required to get the conversion tools used for importing different types of files.
-echo For more info please visit this page
+echo For more info please visit this page:
 echo http://wiki.greenstone.org/wiki/index.php/Installing_Greenstone_2_from_SVN_source_on_Windows#Getting_winbin
 GOTO END

main/trunk/greenstone2/makegs2x64.bat

@@ -1 +1 @@
 @echo off
-call .\makegs2.bat amd64
+call .\makegs2.bat amd64 %*