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

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

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.