Show
Ignore:
Timestamp:
09.08.2011 17:07:45 (8 years ago)
Author:
ak19
Message:

Dr Bainbridge made some corrections so that we can use the greenstone2 setup.bat in place of the greenstone3\gs2build\setup.bat

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/gs3-setup.bat

    r24336 r24374  
    1919::      +-- ant (!ANT_HOME!) 
    2020 
    21 :: set GSDLSRCHOME to the current directory 
     21:: set GSDL3SRCHOME to the current directory 
    2222cd | winutil\setvar.exe GSDL3SRCHOME > !TMP!\setgsdl3.bat 
    2323call !TMP!\setgsdl3.bat 
    2424del !TMP!\setgsdl3.bat 
    2525 
    26 :: set GSDLHOME to the 'web' subdirectory 
     26:: set GSDL3HOME to the 'web' subdirectory 
    2727set GSDL3HOME=!GSDL3SRCHOME!\web 
    2828 
     
    4040 
    4141:: Override Imagemagick and Ghostscript paths to the bundled applications shipped with greenstone if they exists otherwise use default environment variables. 
    42 if exist "!GSDL3SRCHOME!\gs2build\bin\windows\ghostscript\bin\gsdll32.dll" set GS_DLL=!GSDL3SRCHOME!\gs2build\bin\windows\ghostscript\bin\gsdll32.dll 
    43 if exist "!GSDL3SRCHOME!\gs2build\bin\windows\ghostscript\lib\*.*" set GS_LIB=!GSDL3SRCHOME!\gs2build\bin\windows\ghostscript\lib 
    44 if exist "!GSDL3SRCHOME!\gs2build\bin\windows\ghostscript\bin\*.*" set PATH=!GSDL3SRCHOME!\gs2build\bin\windows\ghostscript\bin;!PATH! 
    45 if exist "!GSDL3SRCHOME!\gs2build\bin\windows\imagemagick\*.*" set PATH=!GSDL3SRCHOME!\gs2build\bin\windows\imagemagick;!PATH! 
     42:: if exist "!GSDL3SRCHOME!\gs2build\bin\windows\ghostscript\bin\gsdll32.dll" set GS_DLL=!GSDL3SRCHOME!\gs2build\bin\windows\ghostscript\bin\gsdll32.dll 
     43:: if exist "!GSDL3SRCHOME!\gs2build\bin\windows\ghostscript\lib\*.*" set GS_LIB=!GSDL3SRCHOME!\gs2build\bin\windows\ghostscript\lib 
     44:: if exist "!GSDL3SRCHOME!\gs2build\bin\windows\ghostscript\bin\*.*" set PATH=!GSDL3SRCHOME!\gs2build\bin\windows\ghostscript\bin;!PATH! 
     45:: if exist "!GSDL3SRCHOME!\gs2build\bin\windows\imagemagick\*.*" set PATH=!GSDL3SRCHOME!\gs2build\bin\windows\imagemagick;!PATH! 
    4646 
    4747:: a little dynamic set cp stuff 
     
    6161 
    6262:: ---- if gs2build is there, run its setup.bat file ---- 
     63endlocal & set RUNJAVA=%RUNJAVA%& set PATH=%PATH%& set GSDLOS=%GSDLOS%& set GSDLHOME=%GSDLHOME%& set GSDL3HOME=%GSDL3HOME%& set GSDL3SRCHOME=%GSDL3SRCHOME%& set JAVA_HOME=%JAVA_HOME%& set JRE_HOME=%JRE_HOME%& set ANT_HOME=%ANT_HOME%& set CLASSPATH=%CLASSPATH% 
    6364 
    6465if exist gs2build\setup.bat ( 
     
    9192  cd .. 
    9293) 
     94 
     95setlocal enabledelayedexpansion 
    9396 
    9497:: ---- Search for java ----