Changeset 15355

Show
Ignore:
Timestamp:
07.05.2008 14:26:51 (11 years ago)
Author:
oranfry
Message:

In gs3setup.bat, use the temp directory speicified in the TMP environment variable for all temp files

Files:
1 modified

Legend:

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

    r15148 r15355  
    99:start 
    1010:: ---- Set the GSDL3HOME variable to the current directory ---- 
    11 cd | winutil\setvar.exe GSDL3SRCHOME > %SystemRoot%\Temp\setgsdl3.bat 
    12 call %SystemRoot%\Temp\setgsdl3.bat 
    13 del %SystemRoot%\Temp\setgsdl3.bat 
     11cd | winutil\setvar.exe GSDL3SRCHOME > %TMP%\setgsdl3.bat 
     12call %TMP%\setgsdl3.bat 
     13del %TMP%\setgsdl3.bat 
    1414set GSDL3HOME=%GSDL3SRCHOME%\web 
    1515 
     
    2525if "%GS_CP_SET%" == "yes" goto skipSetCp 
    2626set CLASSPATH=.;%GSDL3HOME%\WEB-INF\classes;%GSDL3SRCHOME%\resources\java;%CLASSPATH% 
    27 if exist %SystemRoot%\Temp\setcp.bat del %SystemRoot%\Temp\setcp.bat 
    28 for %%j in ("%GSDL3SRCHOME%"\*.jar) do echo set CLASSPATH=%%CLASSPATH%%;%%j>> %SystemRoot%\Temp\setcp.bat 
    29 for %%j in ("%GSDL3HOME%"\WEB-INF\lib\*.jar) do echo set CLASSPATH=%%CLASSPATH%%;%%j>> %SystemRoot%\Temp\setcp.bat 
    30 for %%j in ("%GSDL3SRCHOME%"\lib\jni\*.jar) do echo set CLASSPATH=%%CLASSPATH%%;%%j>> %SystemRoot%\Temp\setcp.bat 
    31 for %%j in ("%TOMCAT_HOME%"\common\endorsed\*.jar) do echo set CLASSPATH=%%CLASSPATH%%;%%j>> %SystemRoot%\Temp\setcp.bat 
    32 for %%j in ("%GSDL3SRCHOME%"\build\*.jar) do echo set CLASSPATH=%%CLASSPATH%%;%%j>> %SystemRoot%\Temp\setcp.bat 
    33 echo set GS_CP_SET=yes >> %SystemRoot%\Temp\setcp.bat 
    34 call %SystemRoot%\Temp\setcp.bat 
    35 del %SystemRoot%\Temp\setcp.bat 
     27if exist %TMP%\setcp.bat del %TMP%\setcp.bat 
     28for %%j in ("%GSDL3SRCHOME%"\*.jar) do echo set CLASSPATH=%%CLASSPATH%%;%%j>> %TMP%\setcp.bat 
     29for %%j in ("%GSDL3HOME%"\WEB-INF\lib\*.jar) do echo set CLASSPATH=%%CLASSPATH%%;%%j>> %TMP%\setcp.bat 
     30for %%j in ("%GSDL3SRCHOME%"\lib\jni\*.jar) do echo set CLASSPATH=%%CLASSPATH%%;%%j>> %TMP%\setcp.bat 
     31for %%j in ("%TOMCAT_HOME%"\common\endorsed\*.jar) do echo set CLASSPATH=%%CLASSPATH%%;%%j>> %TMP%\setcp.bat 
     32for %%j in ("%GSDL3SRCHOME%"\build\*.jar) do echo set CLASSPATH=%%CLASSPATH%%;%%j>> %TMP%\setcp.bat 
     33echo set GS_CP_SET=yes >> %TMP%\setcp.bat 
     34call %TMP%\setcp.bat 
     35del %TMP%\setcp.bat 
    3636:skipSetCp 
    3737 
    38 winutil\search4j.exe -m %java_min_version% | winutil\setvar.exe _JRE_HOME > %SystemRoot%\Temp\set_jre_home.bat 
    39 call %SystemRoot%\Temp\set_jre_home.bat 
    40 del %SystemRoot%\Temp\set_jre_home.bat 
     38winutil\search4j.exe -m %java_min_version% | winutil\setvar.exe _JRE_HOME > %TMP%\set_jre_home.bat 
     39call %TMP%\set_jre_home.bat 
     40del %TMP%\set_jre_home.bat 
    4141 
    42 echo %_JRE_HOME%\bin\java.exe | winutil\setvar.exe RUNJAVA > %SystemRoot%\Temp\setrunjava.bat 
    43 call %SystemRoot%\Temp\setrunjava.bat 
    44 del %SystemRoot%\Temp\setrunjava.bat 
     42echo %_JRE_HOME%\bin\java.exe | winutil\setvar.exe RUNJAVA > %TMP%\setrunjava.bat 
     43call %TMP%\setrunjava.bat 
     44del %TMP%\setrunjava.bat 
    4545 
    4646if "%JRE_HOME%" == "" set JRE_HOME=%_JRE_HOME%