Revision: 6076
http://jython.svn.sourceforge.net/jython/?rev=6076&view=rev
Author: otmarhumbel
Date: 2009-03-06 21:56:19 +0000 (Fri, 06 Mar 2009)
Log Message:
-----------
make byte code verification the default again:
- drop option --verify
- new option --boot
Modified Paths:
--------------
trunk/jython/src/shell/jython
trunk/jython/src/shell/jython.bat
Modified: trunk/jython/src/shell/jython
===================================================================
--- trunk/jython/src/shell/jython 2009-03-06 18:27:15 UTC (rev 6075)
+++ trunk/jython/src/shell/jython 2009-03-06 21:56:19 UTC (rev 6076)
@@ -142,9 +142,9 @@
java_args=("${java_args[@]}" -javaagent:"$agent_path"
-Dprofile.properties="$props_path")
;;
- # Don't put Jython on the boot classpath (enables the verifier)
- --verify)
- verify_requested=true
+ # Put Jython on the boot classpath (disables the verifier)
+ --boot)
+ boot_requested=true
;;
# Run under JDB
--jdb)
@@ -197,7 +197,7 @@
fi
fi
-if [ -n "$profile_requested" -o -n "$verify_requested" ] ; then
+if [ -n "$profile_requested" -o -z "$boot_requested" ] ; then
[ -n "$profile_requested" ] && echo "Running with instrumented profiler"
java_args=("${java_args[@]}" -classpath "$CP$CP_DELIMITER$CLASSPATH")
else
@@ -224,7 +224,7 @@
echo "--jdb : run under JDB" >&2
echo "--print : print the Java command instead of executing it" >&2
echo "--profile: run with the Java Interactive Profiler (http://jiprof.sf.net)" >&2
- echo "--verify : enable bytecode verifier for Jython classes (for development)" >&2
+ echo "--boot : put jython on the boot classpath (disables the bytecode verifier)" >&2
echo "-- : pass remaining arguments through to Jython" >&2
echo "Jython launcher environment variables:" >&2
echo "JAVA_HOME : Java installation directory" >&2
Modified: trunk/jython/src/shell/jython.bat
===================================================================
--- trunk/jython/src/shell/jython.bat 2009-03-06 18:27:15 UTC (rev 6075)
+++ trunk/jython/src/shell/jython.bat 2009-03-06 21:56:19 UTC (rev 6076)
@@ -121,9 +121,8 @@
goto :nextArg
)
-if ["%_CMP%"] == ["--verify"] (
- set CLASSPATH=%_CP:"=%;%CLASSPATH:"=%
- set _CP=
+if ["%_CMP%"] == ["--boot"] (
+ set _BOOT_CP=-Xbootclasspath/a:%_CP%
goto :nextArg
)
@@ -161,7 +160,8 @@
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% %_JYTHON_ARGS% %_ARGS%
+if not defined _BOOT_CP set CLASSPATH=%_CP:"=%;%CLASSPATH:"=%
+%_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%
:cleanup
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
