Changeset 26615 for main/trunk

Timestamp:

2013-01-09T13:34:58+13:00 (11 years ago)

Author:

sjm84

Message:

Created a 64-bit compatible makegs2.bat file

Location:

main/trunk/greenstone2

Files:

• makegs2.bat (modified) (6 diffs)
• makegs2x64.bat (added)

main/trunk/greenstone2/makegs2.bat

@@ -5 +5 @@
 :: This will be helpful during compiling if there are spaces (or brackets) in the filepath,
 :: since apache's own batch scripts do not allow for the possibility of spaces or brackets.
-command /c rem
+if "%1"=="amd64" (
+    cmd /c rem
+) else (
+    command /c rem
+)
 
 pushd "%CD%"
@@ -22 +26 @@
 set SDK_ENV=
 
-
 rem Checking for Winbin and Unzip utility
 IF NOT EXIST .\bin\windows\*.* GOTO ENDNOWINBIN
-IF NOT EXIST .\bin\windows\choice.exe GOTO ENDNOWINBIN
-
+IF NOT EXIST .\bin\windows\choice32.exe GOTO ENDNOWINBIN
 
 echo.
@@ -57 +59 @@
 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.
-.\bin\windows\choice.exe /T:Y,10 /C:YN
+if "%1"=="amd64" (.\bin\windows\choice64.exe /D Y /T 10 /C YN
     IF errorlevel 2 GOTO COMPILE
     IF errorlevel 1 GOTO UNZIP
     IF errorlevel 0 GOTO END
+) else (.\bin\windows\choice32.exe /T:Y,10 /C:YN
+    IF errorlevel 2 GOTO COMPILE
+    IF errorlevel 1 GOTO UNZIP
+    IF errorlevel 0 GOTO END
+)
     
-
 :UNZIP
 IF NOT EXIST .\bin\windows\unzip.exe GOTO ENDNOUNZIP
@@ -145 +151 @@
 echo.
 echo Please choose a number from the menu. Otherwise both libraries will be compiled in 15 seconds.
-.\bin\windows\choice.exe /N /T:3,15 /C:1234567
+if "%1"=="amd64" (.\bin\windows\choice64.exe /N /D 3 /T 15 /C 1234567
     IF errorlevel 7 GOTO END
     IF errorlevel 6 GOTO DOCLEAN
@@ -154 +160 @@
     IF errorlevel 1 GOTO WITHLOCALLIB
     IF errorlevel 0 GOTO END
+) else (.\bin\windows\choice32.exe /N /T:3,15 /C:1234567
+    IF errorlevel 7 GOTO END
+    IF errorlevel 6 GOTO DOCLEAN
+    IF errorlevel 5 GOTO WITHALLDEBUG
+    IF errorlevel 4 GOTO WITHALL
+    IF errorlevel 3 GOTO WITHAPACHE
+    IF errorlevel 2 GOTO WITHOUTLOCALLIB
+    IF errorlevel 1 GOTO WITHLOCALLIB
+    IF errorlevel 0 GOTO END
+)
 
 :DOCLEAN
@@ -213 +229 @@
 rem Ask to Unzip the packages now otherwise quit
 echo Do you want to unzip these required packages now? This will be the default action in 10 seconds.
-.\bin\windows\choice.exe /T:Y,10 /c:YN
+if "%1"=="amd64" (.\bin\windows\choice64.exe /D Y /T 10 /C YN
     IF errorlevel 2 GOTO END
     IF errorlevel 1 GOTO UNZIP
     IF errorlevel 0 GOTO END
+) else (.\bin\windows\choice32.exe /T:Y,10 /c:YN
+    IF errorlevel 2 GOTO END
+    IF errorlevel 1 GOTO UNZIP
+    IF errorlevel 0 GOTO END
+)
 
 :ENDNOWINBIN