[Jython-checkins] SF.net SVN: jython:[5213] trunk/jython/src/shell/jython.bat

[<nr...@us...>]

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.