Changeset 24374 for main/trunk

Timestamp:

2011-08-09T17:07:45+12:00 (13 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

File:

• main/trunk/greenstone3/gs3-setup.bat (modified) (4 diffs)

main/trunk/greenstone3/gs3-setup.bat

@@ -19 +19 @@
 ::      +-- ant (!ANT_HOME!)
 
-:: set GSDLSRCHOME to the current directory
+:: set GSDL3SRCHOME to the current directory
 cd | winutil\setvar.exe GSDL3SRCHOME > !TMP!\setgsdl3.bat
 call !TMP!\setgsdl3.bat
 del !TMP!\setgsdl3.bat
 
-:: set GSDLHOME to the 'web' subdirectory
+:: set GSDL3HOME to the 'web' subdirectory
 set GSDL3HOME=!GSDL3SRCHOME!\web
 
@@ -40 +40 @@
 
 :: Override Imagemagick and Ghostscript paths to the bundled applications shipped with greenstone if they exists otherwise use default environment variables.
-if exist "!GSDL3SRCHOME!\gs2build\bin\windows\ghostscript\bin\gsdll32.dll" set GS_DLL=!GSDL3SRCHOME!\gs2build\bin\windows\ghostscript\bin\gsdll32.dll
-if exist "!GSDL3SRCHOME!\gs2build\bin\windows\ghostscript\lib\*.*" set GS_LIB=!GSDL3SRCHOME!\gs2build\bin\windows\ghostscript\lib
-if exist "!GSDL3SRCHOME!\gs2build\bin\windows\ghostscript\bin\*.*" set PATH=!GSDL3SRCHOME!\gs2build\bin\windows\ghostscript\bin;!PATH!
-if exist "!GSDL3SRCHOME!\gs2build\bin\windows\imagemagick\*.*" set PATH=!GSDL3SRCHOME!\gs2build\bin\windows\imagemagick;!PATH!
+:: if exist "!GSDL3SRCHOME!\gs2build\bin\windows\ghostscript\bin\gsdll32.dll" set GS_DLL=!GSDL3SRCHOME!\gs2build\bin\windows\ghostscript\bin\gsdll32.dll
+:: if exist "!GSDL3SRCHOME!\gs2build\bin\windows\ghostscript\lib\*.*" set GS_LIB=!GSDL3SRCHOME!\gs2build\bin\windows\ghostscript\lib
+:: if exist "!GSDL3SRCHOME!\gs2build\bin\windows\ghostscript\bin\*.*" set PATH=!GSDL3SRCHOME!\gs2build\bin\windows\ghostscript\bin;!PATH!
+:: if exist "!GSDL3SRCHOME!\gs2build\bin\windows\imagemagick\*.*" set PATH=!GSDL3SRCHOME!\gs2build\bin\windows\imagemagick;!PATH!
 
 :: a little dynamic set cp stuff
@@ -61 +61 @@
 
 :: ---- if gs2build is there, run its setup.bat file ----
+endlocal & 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%
 
 if exist gs2build\setup.bat (
@@ -91 +92 @@
   cd ..
 )
+
+setlocal enabledelayedexpansion
 
 :: ---- Search for java ----