[Jython-checkins] SF.net SVN: jython:[6965] trunk

[<otm...@us...>]

Revision: 6965
          http://jython.svn.sourceforge.net/jython/?rev=6965&view=rev
Author:   otmarhumbel
Date:     2010-01-30 06:31:45 +0000 (Sat, 30 Jan 2010)

Log Message:
-----------
handle CLASSPATH containing () - fixes issue #1548

Modified Paths:
--------------
    trunk/installer/src/java/org/python/util/install/driver/jython_test.bat.template
    trunk/jython/src/shell/jython.bat

Modified: trunk/installer/src/java/org/python/util/install/driver/jython_test.bat.template
===================================================================
--- trunk/installer/src/java/org/python/util/install/driver/jython_test.bat.template	2010-01-24 01:19:10 UTC (rev 6964)
+++ trunk/installer/src/java/org/python/util/install/driver/jython_test.bat.template	2010-01-30 06:31:45 UTC (rev 6965)
@@ -5,9 +5,10 @@
 set _SCRIPT={1}
 set _JAVA_HOME={2}
 
-rem save old home env vars:
+rem save old home env vars and classpath:
 set _OLD_JAVA_HOME=%JAVA_HOME%
 set _OLD_JYTHON_HOME=%JYTHON_HOME%
+set _OLD_CLASSPATH=%CLASSPATH%
 
 cd /d "%_INSTALL_DIR%\bin"
 
@@ -57,8 +58,16 @@
 call "%_INSTALL_DIR%\bin\jython.bat" "%_SCRIPT%"
 set E=%ERRORLEVEL%
 
+echo {3}: no home, setting CLASSPATH, calling /jython.bat from another working dir:"
+set JAVA_HOME=
+set JYTHON_HOME=
+set CLASSPATH=.;C:\Program Files (x86)\Java\jre6\lib\ext\QTJava.zip
+call "%_INSTALL_DIR%\jython.bat" "%_SCRIPT%"
+set E=%ERRORLEVEL%
+
 rem cleanup:
 set JAVA_HOME=%_OLD_JAVA_HOME%
 set JYTHON_HOME=%_OLD_JYTHON_HOME%
+set CLASSPATH=%_OLD_CLASSPATH%
 cd /d "%~dp0%"
 exit /b %E%

Modified: trunk/jython/src/shell/jython.bat
===================================================================
--- trunk/jython/src/shell/jython.bat	2010-01-24 01:19:10 UTC (rev 6964)
+++ trunk/jython/src/shell/jython.bat	2010-01-30 06:31:45 UTC (rev 6965)
@@ -168,13 +168,15 @@
 goto scanArgs
 
 :argsDone
-if not defined _BOOT_CP (
-  if defined CLASSPATH (
-    set CLASSPATH=%_CP:"=%;%CLASSPATH:"=%
-  ) else (
-    set CLASSPATH=%_CP:"=%
-  )
-)
+rem do not use 'if () else ()': this does not work with CLASSPATH containing '(x86)'
+if defined _BOOT_CP goto fullCmd
+if defined CLASSPATH goto classpathDefined
+set CLASSPATH=%_CP:"=%
+goto fullCmd
+:classpathDefined
+set CLASSPATH=%_CP:"=%;%CLASSPATH:"=%
+
+:fullCmd
 set _FULL_CMD=%_JAVA_CMD% %_JAVA_OPTS% %_JAVA_MEM% %_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%


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.