Changeset 26615

Show
Ignore:
Timestamp:
09.01.2013 13:34:58 (7 years ago)
Author:
sjm84
Message:

Created a 64-bit compatible makegs2.bat file

Location:
main/trunk/greenstone2
Files:
1 added
1 modified

Legend:

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

    r25525 r26615  
    55:: This will be helpful during compiling if there are spaces (or brackets) in the filepath, 
    66:: since apache's own batch scripts do not allow for the possibility of spaces or brackets. 
    7 command /c rem 
     7if "%1"=="amd64" ( 
     8    cmd /c rem 
     9) else ( 
     10    command /c rem 
     11) 
    812 
    913pushd "%CD%" 
     
    2226set SDK_ENV= 
    2327 
    24  
    2528rem Checking for Winbin and Unzip utility 
    2629IF NOT EXIST .\bin\windows\*.* GOTO ENDNOWINBIN 
    27 IF NOT EXIST .\bin\windows\choice.exe GOTO ENDNOWINBIN 
    28  
     30IF NOT EXIST .\bin\windows\choice32.exe GOTO ENDNOWINBIN 
    2931 
    3032echo. 
     
    5759rem Ask the user to extract now or to directly compile 
    5860echo Do you want to extract the required packages (Recommended)? This will be the default action in 10 seconds. 
    59 .\bin\windows\choice.exe /T:Y,10 /C:YN 
     61if "%1"=="amd64" (.\bin\windows\choice64.exe /D Y /T 10 /C YN 
    6062    IF errorlevel 2 GOTO COMPILE 
    6163    IF errorlevel 1 GOTO UNZIP 
    6264    IF errorlevel 0 GOTO END 
     65) else (.\bin\windows\choice32.exe /T:Y,10 /C:YN 
     66    IF errorlevel 2 GOTO COMPILE 
     67    IF errorlevel 1 GOTO UNZIP 
     68    IF errorlevel 0 GOTO END 
     69) 
    6370     
    64  
    6571:UNZIP 
    6672IF NOT EXIST .\bin\windows\unzip.exe GOTO ENDNOUNZIP 
     
    145151echo. 
    146152echo Please choose a number from the menu. Otherwise both libraries will be compiled in 15 seconds. 
    147 .\bin\windows\choice.exe /N /T:3,15 /C:1234567 
     153if "%1"=="amd64" (.\bin\windows\choice64.exe /N /D 3 /T 15 /C 1234567 
    148154    IF errorlevel 7 GOTO END 
    149155    IF errorlevel 6 GOTO DOCLEAN 
     
    154160    IF errorlevel 1 GOTO WITHLOCALLIB 
    155161    IF errorlevel 0 GOTO END 
     162) else (.\bin\windows\choice32.exe /N /T:3,15 /C:1234567 
     163    IF errorlevel 7 GOTO END 
     164    IF errorlevel 6 GOTO DOCLEAN 
     165    IF errorlevel 5 GOTO WITHALLDEBUG 
     166    IF errorlevel 4 GOTO WITHALL 
     167    IF errorlevel 3 GOTO WITHAPACHE 
     168    IF errorlevel 2 GOTO WITHOUTLOCALLIB 
     169    IF errorlevel 1 GOTO WITHLOCALLIB 
     170    IF errorlevel 0 GOTO END 
     171) 
    156172 
    157173:DOCLEAN 
     
    213229rem Ask to Unzip the packages now otherwise quit 
    214230echo Do you want to unzip these required packages now? This will be the default action in 10 seconds. 
    215 .\bin\windows\choice.exe /T:Y,10 /c:YN 
     231if "%1"=="amd64" (.\bin\windows\choice64.exe /D Y /T 10 /C YN 
    216232    IF errorlevel 2 GOTO END 
    217233    IF errorlevel 1 GOTO UNZIP 
    218234    IF errorlevel 0 GOTO END 
     235) else (.\bin\windows\choice32.exe /T:Y,10 /c:YN 
     236    IF errorlevel 2 GOTO END 
     237    IF errorlevel 1 GOTO UNZIP 
     238    IF errorlevel 0 GOTO END 
     239) 
    219240 
    220241:ENDNOWINBIN