From: <nr...@us...> - 2008-08-20 04:33:04
|
Revision: 5213 http://jython.svn.sourceforge.net/jython/?rev=5213&view=rev Author: nriley Date: 2008-08-20 04:33:02 +0000 (Wed, 20 Aug 2008) Log Message: ----------- Run Jython regrtest (on Windows) with bytecode verification; support -J, --jdb, -- on Windows too. Modified Paths: -------------- trunk/jython/src/shell/jython.bat Modified: trunk/jython/src/shell/jython.bat =================================================================== --- trunk/jython/src/shell/jython.bat 2008-08-20 00:28:55 UTC (rev 5212) +++ trunk/jython/src/shell/jython.bat 2008-08-20 04:33:02 UTC (rev 5213) @@ -18,13 +18,13 @@ set _JAVA_CMD=java if not "%JAVA_HOME%" == "" ( - set _JAVA_CMD="%JAVA_HOME%\bin\java" + set _JAVA_CMD="%JAVA_HOME:"=%\bin\java" ) -set _JYTHON_HOME="%JYTHON_HOME%" +set _JYTHON_HOME=%JYTHON_HOME% if not "%JYTHON_HOME%" == "" goto gotHome pushd "%~dp0%\.." -set _JYTHON_HOME="%CD%" +set _JYTHON_HOME=%CD% popd :gotHome @@ -32,7 +32,7 @@ rem prefer built version set _CP=%_JYTHON_HOME%\jython.jar for %%j in (%_JYTHON_HOME%\javalib\*.jar) do ( - set _CP=!_CP!;"%%j" + set _CP=!_CP!;"%%j" ) goto run @@ -48,13 +48,103 @@ rem ----- Execute the requested command ---------------------------------------- :run -%_JAVA_CMD% %JAVA_OPTS% -Xss512k -Xbootclasspath/a:%_CP% -Dpython.home=%_JYTHON_HOME% -Dpython.executable="%~f0" -classpath "%CLASSPATH%" org.python.util.jython %JYTHON_OPTS% %* +set _JAVA_STACK=-Xss512k + +rem Escape any quotes. Use _S for ', _D for ", and _U to escape _ itself. +rem We have to escape _ itself, otherwise file names with _S and _D +rem will be converted to to wrong ones, when we un-escape. See JRUBY-2821. +set _ARGS=%* +if not defined _ARGS goto argsDone +set _ARGS=%_ARGS:_=_U% +set _ARGS=%_ARGS:'=_S% +set _ARGS=%_ARGS:"=_D% + +set _ARGS="%_ARGS%" + +:scanArgs +rem split args by spaces into first and rest +for /f "tokens=1,*" %%i in (%_ARGS%) do call :getArg "%%i" "%%j" +goto procArg + +:getArg +rem remove quotes around first arg +for %%i in (%1) do set _CMP=%%~i +set _ARGS=%2 +goto :EOF + +:procArg +if ["%_CMP%"] == [""] ( + set _ARGS= + goto argsDone +) + +REM NOTE: If you'd like to use a parameter with underscore in its name, +REM NOTE: use the quoted value: --do_stuff -> --do_Ustuff + +if ["%_CMP%"] == ["--"] goto argsDone + +if ["%_CMP%"] == ["--jdb"] ( + if "%JAVA_HOME%" == "" ( + set _JAVA_CMD=jdb + ) else ( + set _JAVA_CMD="%_JAVA_HOME:"=%\bin\jdb" + ) + goto :nextArg +) + +if ["%_CMP%"] == ["--verify"] ( + set CLASSPATH=%_CP:"=%;%CLASSPATH:"=% + set _CP= + goto :nextArg +) + +rem now unescape _D, _S and _Q +set _CMP=%_CMP:_D="% +set _CMP=%_CMP:_S='% +set _CMP=%_CMP:_U=_% +set _CMP1=%_CMP:~0,1% +set _CMP2=%_CMP:~0,2% + +rem detect first character is a quote; skip directly to jythonArg +rem this avoids a batch syntax error +if "%_CMP1:"=\\%" == "\\" goto jythonArg + +rem removing quote avoids a batch syntax error +if "%_CMP2:"=\\%" == "-J" goto jvmArg + +:jythonArg +set JYTHON_OPTS=%JYTHON_OPTS% %_CMP% +goto nextArg + +:jvmArg +set _VAL=%_CMP:~2% + +if "%_VAL:~0,4%" == "-Xss" ( + set _JAVA_STACK=%_VAL% + echo %_VAL% + goto nextArg +) + +set _JAVA_OPTS=%_JAVA_OPTS% %_VAL% + +:nextArg +set _CMP= +goto scanArgs + +:argsDone +%_JAVA_CMD% %_JAVA_OPTS% %_JAVA_STACK% -Xbootclasspath/a:%_CP% -Dpython.home=%_JYTHON_HOME% -Dpython.executable="%~f0" -classpath "%CLASSPATH%" org.python.util.jython %JYTHON_OPTS% %_ARGS% set E=%ERRORLEVEL% :cleanup +set _ARGS= +set _CMP= +set _CMP1= +set _CMP2= +set _CP= +set _JAVA_CMD= +set _JAVA_OPTS= +set _JAVA_STACK= set _JYTHON_HOME= -set _JAVA_CMD= -set _CP= :finish exit /b %E% This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nr...@us...> - 2008-08-20 05:26:22
|
Revision: 5214 http://jython.svn.sourceforge.net/jython/?rev=5214&view=rev Author: nriley Date: 2008-08-20 05:26:20 +0000 (Wed, 20 Aug 2008) Log Message: ----------- Turned out those quotes were useful after all. Modified Paths: -------------- trunk/jython/src/shell/jython.bat Modified: trunk/jython/src/shell/jython.bat =================================================================== --- trunk/jython/src/shell/jython.bat 2008-08-20 04:33:02 UTC (rev 5213) +++ trunk/jython/src/shell/jython.bat 2008-08-20 05:26:20 UTC (rev 5214) @@ -24,7 +24,7 @@ set _JYTHON_HOME=%JYTHON_HOME% if not "%JYTHON_HOME%" == "" goto gotHome pushd "%~dp0%\.." -set _JYTHON_HOME=%CD% +set _JYTHON_HOME="%CD%" popd :gotHome This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <otm...@us...> - 2008-09-08 14:41:44
|
Revision: 5302 http://jython.svn.sourceforge.net/jython/?rev=5302&view=rev Author: otmarhumbel Date: 2008-09-08 14:41:41 +0000 (Mon, 08 Sep 2008) Log Message: ----------- Fix for issue #1123: Weird "unexpected at this time" error. The tests if environment variables JAVA_HOME or JYTHON_HOME are set did not work: - if the path contained a space - if the variable really was not set The passed (manual, so far) tests can be found in: http://bugs.jython.org/msg3489 Modified Paths: -------------- trunk/jython/src/shell/jython.bat Modified: trunk/jython/src/shell/jython.bat =================================================================== --- trunk/jython/src/shell/jython.bat 2008-09-07 05:57:26 UTC (rev 5301) +++ trunk/jython/src/shell/jython.bat 2008-09-08 14:41:41 UTC (rev 5302) @@ -17,12 +17,12 @@ rem ----- Verify and set required environment variables ----------------------- set _JAVA_CMD=java -if not "%JAVA_HOME%" == "" ( +if not [%JAVA_HOME%] == [] ( set _JAVA_CMD="%JAVA_HOME:"=%\bin\java" ) set _JYTHON_HOME=%JYTHON_HOME% -if not "%JYTHON_HOME%" == "" goto gotHome +if not [%JYTHON_HOME%] == [] goto gotHome pushd "%~dp0%\.." set _JYTHON_HOME="%CD%" popd @@ -84,7 +84,7 @@ if ["%_CMP%"] == ["--"] goto argsDone if ["%_CMP%"] == ["--jdb"] ( - if "%JAVA_HOME%" == "" ( + if [%JAVA_HOME%] == [] ( set _JAVA_CMD=jdb ) else ( set _JAVA_CMD="%_JAVA_HOME:"=%\bin\jdb" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <otm...@us...> - 2008-10-15 05:35:57
|
Revision: 5396 http://jython.svn.sourceforge.net/jython/?rev=5396&view=rev Author: otmarhumbel Date: 2008-10-15 05:35:53 +0000 (Wed, 15 Oct 2008) Log Message: ----------- fixed typo: _JAVA_HOME has to be JAVA_HOME Modified Paths: -------------- trunk/jython/src/shell/jython.bat Modified: trunk/jython/src/shell/jython.bat =================================================================== --- trunk/jython/src/shell/jython.bat 2008-10-15 04:42:15 UTC (rev 5395) +++ trunk/jython/src/shell/jython.bat 2008-10-15 05:35:53 UTC (rev 5396) @@ -87,7 +87,7 @@ if [%JAVA_HOME%] == [] ( set _JAVA_CMD=jdb ) else ( - set _JAVA_CMD="%_JAVA_HOME:"=%\bin\jdb" + set _JAVA_CMD="%JAVA_HOME:"=%\bin\jdb" ) goto :nextArg ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <otm...@us...> - 2008-10-15 08:10:49
|
Revision: 5397 http://jython.svn.sourceforge.net/jython/?rev=5397&view=rev Author: otmarhumbel Date: 2008-10-15 08:10:37 +0000 (Wed, 15 Oct 2008) Log Message: ----------- safely test if JAVA_HOME or JYTHON_HOME is set we can now handle both quoted and unquoted settings like: JAVA_HOME=C:\Program Files\Java\jdk1.6.0_07 JAVA_HOME="C:\Program Files\Java\jdk1.6.0_07" this should fix issue #1125 Modified Paths: -------------- trunk/jython/src/shell/jython.bat Modified: trunk/jython/src/shell/jython.bat =================================================================== --- trunk/jython/src/shell/jython.bat 2008-10-15 05:35:53 UTC (rev 5396) +++ trunk/jython/src/shell/jython.bat 2008-10-15 08:10:37 UTC (rev 5397) @@ -17,12 +17,18 @@ rem ----- Verify and set required environment variables ----------------------- set _JAVA_CMD=java -if not [%JAVA_HOME%] == [] ( +rem remove surrounding quotes from java home, to be able to safely empty-test it +set _TRIMMED_JAVA_HOME=%JAVA_HOME% +for /f "useback tokens=*" %%a in ('%_TRIMMED_JAVA_HOME%') do set _TRIMMED_JAVA_HOME=%%~a +if not "%_TRIMMED_JAVA_HOME%"=="" ( set _JAVA_CMD="%JAVA_HOME:"=%\bin\java" ) set _JYTHON_HOME=%JYTHON_HOME% -if not [%JYTHON_HOME%] == [] goto gotHome +rem remove surrounding quotes from jython home, to be able to safely empty-test it +set _TRIMMED_JYTHON_HOME=%JYTHON_HOME% +for /f "useback tokens=*" %%a in ('%_TRIMMED_JYTHON_HOME%') do set _TRIMMED_JYTHON_HOME=%%~a +if not "%_TRIMMED_JYTHON_HOME%"=="" goto gotHome pushd "%~dp0%\.." set _JYTHON_HOME="%CD%" popd @@ -84,7 +90,7 @@ if ["%_CMP%"] == ["--"] goto argsDone if ["%_CMP%"] == ["--jdb"] ( - if [%JAVA_HOME%] == [] ( + if "%_TRIMMED_JAVA_HOME%"=="" ( set _JAVA_CMD=jdb ) else ( set _JAVA_CMD="%JAVA_HOME:"=%\bin\jdb" @@ -145,6 +151,8 @@ set _JAVA_OPTS= set _JAVA_STACK= set _JYTHON_HOME= +set _TRIMMED_JAVA_HOME= +set _TRIMMED_JYTHON_HOME= :finish exit /b %E% This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <otm...@us...> - 2008-11-05 15:30:36
|
Revision: 5545 http://jython.svn.sourceforge.net/jython/?rev=5545&view=rev Author: otmarhumbel Date: 2008-11-05 15:30:32 +0000 (Wed, 05 Nov 2008) Log Message: ----------- correctly quote _JYTHON_HOME this should fix issue #1125 Modified Paths: -------------- trunk/jython/src/shell/jython.bat Modified: trunk/jython/src/shell/jython.bat =================================================================== --- trunk/jython/src/shell/jython.bat 2008-11-05 07:30:28 UTC (rev 5544) +++ trunk/jython/src/shell/jython.bat 2008-11-05 15:30:32 UTC (rev 5545) @@ -24,11 +24,13 @@ set _JAVA_CMD="%JAVA_HOME:"=%\bin\java" ) -set _JYTHON_HOME=%JYTHON_HOME% rem remove surrounding quotes from jython home, to be able to safely empty-test it set _TRIMMED_JYTHON_HOME=%JYTHON_HOME% for /f "useback tokens=*" %%a in ('%_TRIMMED_JYTHON_HOME%') do set _TRIMMED_JYTHON_HOME=%%~a -if not "%_TRIMMED_JYTHON_HOME%"=="" goto gotHome +if not "%_TRIMMED_JYTHON_HOME%"=="" ( + set _JYTHON_HOME="%_TRIMMED_JYTHON_HOME%" + goto gotHome +) pushd "%~dp0%\.." set _JYTHON_HOME="%CD%" popd This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <otm...@us...> - 2008-12-03 09:30:20
|
Revision: 5680 http://jython.svn.sourceforge.net/jython/?rev=5680&view=rev Author: otmarhumbel Date: 2008-12-03 09:30:15 +0000 (Wed, 03 Dec 2008) Log Message: ----------- prevent JYTHON_OPTS from being enriched with arguments (this could lead to an infinite recursion of subprocesses) test_subprocess_jy.py now passes issue #1187 is fixed now Modified Paths: -------------- trunk/jython/src/shell/jython.bat Modified: trunk/jython/src/shell/jython.bat =================================================================== --- trunk/jython/src/shell/jython.bat 2008-12-03 04:38:04 UTC (rev 5679) +++ trunk/jython/src/shell/jython.bat 2008-12-03 09:30:15 UTC (rev 5680) @@ -24,6 +24,13 @@ set _JAVA_CMD="%JAVA_HOME:"=%\bin\java" ) +rem remove surrounding quotes from jython opts, to be able to safely empty-test it +set _TRIMMED_JYTHON_OPTS=%JYTHON_OPTS% +for /f "useback tokens=*" %%a in ('%_TRIMMED_JYTHON_OPTS%') do set _TRIMMED_JYTHON_OPTS=%%~a +if not "%_TRIMMED_JYTHON_OPTS%"=="" ( + set _JYTHON_OPTS="%_TRIMMED_JYTHON_OPTS%" +) + rem remove surrounding quotes from jython home, to be able to safely empty-test it set _TRIMMED_JYTHON_HOME=%JYTHON_HOME% for /f "useback tokens=*" %%a in ('%_TRIMMED_JYTHON_HOME%') do set _TRIMMED_JYTHON_HOME=%%~a @@ -81,6 +88,7 @@ set _ARGS=%_ARGS:"=_D% set _ARGS="%_ARGS%" +set _JYTHON_ARGS= :scanArgs rem split args by spaces into first and rest @@ -134,7 +142,7 @@ if "%_CMP2:"=\\%" == "-J" goto jvmArg :jythonArg -set JYTHON_OPTS=%JYTHON_OPTS% %_CMP% +set _JYTHON_ARGS=%_JYTHON_ARGS% %_CMP% goto nextArg :jvmArg @@ -153,7 +161,7 @@ goto scanArgs :argsDone -%_JAVA_CMD% %_JAVA_OPTS% %_JAVA_STACK% -Xbootclasspath/a:%_CP% -Dpython.home=%_JYTHON_HOME% -Dpython.executable="%~f0" -classpath "%CLASSPATH%" org.python.util.jython %JYTHON_OPTS% %_ARGS% +%_JAVA_CMD% %_JAVA_OPTS% %_JAVA_STACK% -Xbootclasspath/a:%_CP% -Dpython.home=%_JYTHON_HOME% -Dpython.executable="%~f0" -classpath "%CLASSPATH%" org.python.util.jython %_JYTHON_OPTS% %_JYTHON_ARGS% %_ARGS% set E=%ERRORLEVEL% :cleanup @@ -166,8 +174,11 @@ set _JAVA_OPTS= set _JAVA_STACK= set _JYTHON_HOME= +set _JYTHON_OPTS= +set _JYTHON_ARGS= set _TRIMMED_JAVA_HOME= set _TRIMMED_JYTHON_HOME= +set _TRIMMED_JYTHON_OPTS= :finish exit /b %E% This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <otm...@us...> - 2009-03-06 22:18:35
|
Revision: 6077 http://jython.svn.sourceforge.net/jython/?rev=6077&view=rev Author: otmarhumbel Date: 2009-03-06 22:18:24 +0000 (Fri, 06 Mar 2009) Log Message: ----------- also unset _BOOT_CP (for symmetry) Modified Paths: -------------- trunk/jython/src/shell/jython.bat Modified: trunk/jython/src/shell/jython.bat =================================================================== --- trunk/jython/src/shell/jython.bat 2009-03-06 21:56:19 UTC (rev 6076) +++ trunk/jython/src/shell/jython.bat 2009-03-06 22:18:24 UTC (rev 6077) @@ -170,6 +170,7 @@ set _CMP1= set _CMP2= set _CP= +set _BOOT_CP= set _JAVA_CMD= set _JAVA_OPTS= set _JAVA_STACK= This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <otm...@us...> - 2009-03-10 17:29:44
|
Revision: 6086 http://jython.svn.sourceforge.net/jython/?rev=6086&view=rev Author: otmarhumbel Date: 2009-03-10 17:29:42 +0000 (Tue, 10 Mar 2009) Log Message: ----------- fix for issue 1269: correctly build the -classpath option even if there is no environment variable CLASSPATH defined Modified Paths: -------------- trunk/jython/src/shell/jython.bat Modified: trunk/jython/src/shell/jython.bat =================================================================== --- trunk/jython/src/shell/jython.bat 2009-03-08 04:34:13 UTC (rev 6085) +++ trunk/jython/src/shell/jython.bat 2009-03-10 17:29:42 UTC (rev 6086) @@ -160,7 +160,13 @@ goto scanArgs :argsDone -if not defined _BOOT_CP set CLASSPATH=%_CP:"=%;%CLASSPATH:"=% +if not defined _BOOT_CP ( + if defined CLASSPATH ( + set CLASSPATH=%_CP:"=%;%CLASSPATH:"=% + ) else ( + set CLASSPATH=%_CP:"=% + ) +) %_JAVA_CMD% %_JAVA_OPTS% %_JAVA_STACK% %_BOOT_CP% -Dpython.home=%_JYTHON_HOME% -Dpython.executable="%~f0" -classpath "%CLASSPATH%" org.python.util.jython %_JYTHON_OPTS% %_JYTHON_ARGS% %_ARGS% set E=%ERRORLEVEL% This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <otm...@us...> - 2009-03-11 17:13:16
|
Revision: 6093 http://jython.svn.sourceforge.net/jython/?rev=6093&view=rev Author: otmarhumbel Date: 2009-03-11 17:13:03 +0000 (Wed, 11 Mar 2009) Log Message: ----------- added --print option Modified Paths: -------------- trunk/jython/src/shell/jython.bat Modified: trunk/jython/src/shell/jython.bat =================================================================== --- trunk/jython/src/shell/jython.bat 2009-03-10 19:30:29 UTC (rev 6092) +++ trunk/jython/src/shell/jython.bat 2009-03-11 17:13:03 UTC (rev 6093) @@ -126,6 +126,11 @@ goto :nextArg ) +if ["%_CMP%"] == ["--print"] ( + set _PRINT=print + goto :nextArg +) + rem now unescape _D, _S and _Q set _CMP=%_CMP:_D="% set _CMP=%_CMP:_S='% @@ -167,7 +172,12 @@ set CLASSPATH=%_CP:"=% ) ) -%_JAVA_CMD% %_JAVA_OPTS% %_JAVA_STACK% %_BOOT_CP% -Dpython.home=%_JYTHON_HOME% -Dpython.executable="%~f0" -classpath "%CLASSPATH%" org.python.util.jython %_JYTHON_OPTS% %_JYTHON_ARGS% %_ARGS% +set _FULL_CMD=%_JAVA_CMD% %_JAVA_OPTS% %_JAVA_STACK% %_BOOT_CP% -Dpython.home=%_JYTHON_HOME% -Dpython.executable="%~f0" -classpath "%CLASSPATH%" org.python.util.jython %_JYTHON_OPTS% %_JYTHON_ARGS% %_ARGS% +if defined _PRINT ( + echo %_FULL_CMD% +) else ( + %_FULL_CMD% +) set E=%ERRORLEVEL% :cleanup @@ -177,12 +187,14 @@ set _CMP2= set _CP= set _BOOT_CP= +set _FULL_CMD= set _JAVA_CMD= set _JAVA_OPTS= set _JAVA_STACK= set _JYTHON_HOME= set _JYTHON_OPTS= set _JYTHON_ARGS= +set _PRINT= set _TRIMMED_JAVA_HOME= set _TRIMMED_JYTHON_HOME= set _TRIMMED_JYTHON_OPTS= This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pj...@us...> - 2009-05-23 20:02:07
|
Revision: 6370 http://jython.svn.sourceforge.net/jython/?rev=6370&view=rev Author: pjenvey Date: 2009-05-23 20:01:52 +0000 (Sat, 23 May 2009) Log Message: ----------- "force" the exit code by running exit through COMSPEC /c fixes #1352 Modified Paths: -------------- trunk/jython/src/shell/jython.bat Modified: trunk/jython/src/shell/jython.bat =================================================================== --- trunk/jython/src/shell/jython.bat 2009-05-23 06:22:38 UTC (rev 6369) +++ trunk/jython/src/shell/jython.bat 2009-05-23 20:01:52 UTC (rev 6370) @@ -202,4 +202,4 @@ set _TRIMMED_JYTHON_OPTS= :finish -exit /b %E% +%COMSPEC% /c exit /b %E% This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pj...@us...> - 2009-05-29 02:42:23
|
Revision: 6419 http://jython.svn.sourceforge.net/jython/?rev=6419&view=rev Author: pjenvey Date: 2009-05-29 02:42:15 +0000 (Fri, 29 May 2009) Log Message: ----------- bump stack size on Windows to 1152k, the minimum needed for test_marshal Modified Paths: -------------- trunk/jython/src/shell/jython.bat Modified: trunk/jython/src/shell/jython.bat =================================================================== --- trunk/jython/src/shell/jython.bat 2009-05-29 02:34:44 UTC (rev 6418) +++ trunk/jython/src/shell/jython.bat 2009-05-29 02:42:15 UTC (rev 6419) @@ -77,7 +77,9 @@ :run set _JAVA_MEM=-Xmx512m -set _JAVA_STACK=-Xss512k +rem 1152k is the minimum for test_marshal to pass. Windows' default is +rem apparently 1M, anyway +set _JAVA_STACK=-Xss1152k rem Escape any quotes. Use _S for ', _D for ", and _U to escape _ itself. rem We have to escape _ itself, otherwise file names with _S and _D This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <otm...@us...> - 2010-10-10 11:36:11
|
Revision: 7143 http://jython.svn.sourceforge.net/jython/?rev=7143&view=rev Author: otmarhumbel Date: 2010-10-10 11:36:05 +0000 (Sun, 10 Oct 2010) Log Message: ----------- more reliable handling of JAVA_HOME, JYTHON_HOME and JYTHON_OPTS Modified Paths: -------------- trunk/jython/src/shell/jython.bat Modified: trunk/jython/src/shell/jython.bat =================================================================== --- trunk/jython/src/shell/jython.bat 2010-10-10 10:29:15 UTC (rev 7142) +++ trunk/jython/src/shell/jython.bat 2010-10-10 11:36:05 UTC (rev 7143) @@ -25,28 +25,11 @@ rem ----- Verify and set required environment variables ----------------------- set _JAVA_CMD=java -rem remove surrounding quotes from java home, to be able to safely empty-test it -set _TRIMMED_JAVA_HOME=%JAVA_HOME% -for /f "usebackq tokens=*" %%a in ('%_TRIMMED_JAVA_HOME%') do set _TRIMMED_JAVA_HOME=%%~a -if not "%_TRIMMED_JAVA_HOME%"=="" ( - set _JAVA_CMD="%JAVA_HOME:"=%\bin\java" -) +if defined JAVA_HOME set _JAVA_CMD="%JAVA_HOME:"=%\bin\java" +if defined JYTHON_OPTS set _JYTHON_OPTS="%JYTHON_OPTS:"=%" +if defined JYTHON_HOME set _JYTHON_HOME="%JYTHON_HOME:"=%" +if defined _JYTHON_HOME goto gotHome -rem remove surrounding quotes from jython opts, to be able to safely empty-test it -set _TRIMMED_JYTHON_OPTS=%JYTHON_OPTS% -for /f "usebackq tokens=*" %%a in ('%_TRIMMED_JYTHON_OPTS%') do set _TRIMMED_JYTHON_OPTS=%%~a -if not "%_TRIMMED_JYTHON_OPTS%"=="" ( - set _JYTHON_OPTS="%_TRIMMED_JYTHON_OPTS%" -) - -rem remove surrounding quotes from jython home, to be able to safely empty-test it -set _TRIMMED_JYTHON_HOME=%JYTHON_HOME% -for /f "usebackq tokens=*" %%a in ('%_TRIMMED_JYTHON_HOME%') do set _TRIMMED_JYTHON_HOME=%%~a -if not "%_TRIMMED_JYTHON_HOME%"=="" ( - set _JYTHON_HOME="%_TRIMMED_JYTHON_HOME%" - goto gotHome -) - rem try to dynamically determine jython home rem (this script typically resides in jython home, or in the /bin subdirectory) pushd "%~dp0%" @@ -128,10 +111,10 @@ if ["%_CMP%"] == ["--"] goto argsDone if ["%_CMP%"] == ["--jdb"] ( - if "%_TRIMMED_JAVA_HOME%"=="" ( - set _JAVA_CMD=jdb - ) else ( + if defined JAVA_HOME ( set _JAVA_CMD="%JAVA_HOME:"=%\bin\jdb" + ) else ( + set _JAVA_CMD=jdb ) goto :nextArg ) @@ -216,9 +199,6 @@ set _JYTHON_OPTS= set _JYTHON_ARGS= set _PRINT= -set _TRIMMED_JAVA_HOME= -set _TRIMMED_JYTHON_HOME= -set _TRIMMED_JYTHON_OPTS= goto finish This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |