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

[<pj...@us...>]

Revision: 6259
          http://jython.svn.sourceforge.net/jython/?rev=6259&view=rev
Author:   pjenvey
Date:     2009-04-24 05:16:57 +0000 (Fri, 24 Apr 2009)

Log Message:
-----------
default to -Xmx512m

Modified Paths:
--------------
    trunk/jython/build.xml
    trunk/jython/src/shell/jython
    trunk/jython/src/shell/jython.bat

Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml	2009-04-23 07:45:20 UTC (rev 6258)
+++ trunk/jython/build.xml	2009-04-24 05:16:57 UTC (rev 6259)
@@ -170,9 +170,6 @@
             <pathelement path="${compile.dir}" />
             <pathelement path="${cpptasks.jar.dir}" />
         </path>
-        <!-- 64 bit Java 6 needs roughly 96m for regrtest on most platforms, but Apple's needs
-         more -->
-        <property name="regrtest.Xmx" value="-Xmx160m" />
         <property name="jython.dev.jar" value="jython-dev.jar" />
         <property name="jython.deploy.jar" value="jython.jar" />
     </target>
@@ -834,7 +831,6 @@
     <target name="regrtest" depends="developer-build,regrtest-unix,regrtest-windows"/>
     <target name="regrtest-unix" if="os.family.unix">
       <exec executable="${dist.dir}/bin/jython">
-        <arg value="-J${regrtest.Xmx}"/>
         <arg value="${dist.dir}/Lib/test/regrtest.py"/>
         <!-- Only run the tests that are expected to work on Jython -->
         <arg value="--expected"/>
@@ -844,7 +840,6 @@
     </target>
     <target name="regrtest-windows" if="os.family.windows">
       <exec executable="${dist.dir}/bin/jython.bat">
-        <arg value="-J${regrtest.Xmx}"/>
         <arg value="${dist.dir}/Lib/test/regrtest.py"/>
         <!-- Only run the tests that are expected to work on Jython -->
         <arg value="--expected"/>

Modified: trunk/jython/src/shell/jython
===================================================================
--- trunk/jython/src/shell/jython	2009-04-23 07:45:20 UTC (rev 6258)
+++ trunk/jython/src/shell/jython	2009-04-24 05:16:57 UTC (rev 6259)
@@ -96,6 +96,10 @@
 
 # ----- Execute the requested command -----------------------------------------
 
+if [ -z "$JAVA_MEM" ] ; then
+  JAVA_MEM=-Xmx512m
+fi
+
 if [ -z "$JAVA_STACK" ]; then
    # 32 bit Java 6 needs the stack increased to at least 512k for
    # test_cpickle to pass, but we don't want to shrink 64 bit Java's
@@ -110,8 +114,18 @@
     # Stuff after '-J' in this argument goes to JVM
     -J*)
       val=${1:2}
-      if [ "${val:0:4}" = "-Xss" ] ; then
+      if [ "${val:0:4}" = "-Xmx" ]; then
+        JAVA_MEM=$val
+      elif [ "${val:0:4}" = "-Xss" ]; then
         JAVA_STACK=$val
+      elif [ "${val}" = "" ]; then
+          $JAVA_CMD -help
+          echo "(Prepend -J in front of these options when using 'jython' command)" 
+          exit
+      elif [ "${val}" = "-X" ]; then
+          $JAVA_CMD -X
+          echo "(Prepend -J in front of these options when using 'jython' command)" 
+          exit
       else
 	java_args=("${java_args[@]}" "${1:2}")
       fi
@@ -187,7 +201,7 @@
 # Put the python_args back into the position arguments $1, $2 etc
 set -- "${python_args[@]}"
 
-JAVA_OPTS="$JAVA_OPTS $JAVA_STACK"
+JAVA_OPTS="$JAVA_OPTS $JAVA_MEM $JAVA_STACK"
 
 if $cygwin; then
   JAVA_HOME=`cygpath --mixed "$JAVA_HOME"`

Modified: trunk/jython/src/shell/jython.bat
===================================================================
--- trunk/jython/src/shell/jython.bat	2009-04-23 07:45:20 UTC (rev 6258)
+++ trunk/jython/src/shell/jython.bat	2009-04-24 05:16:57 UTC (rev 6259)
@@ -76,6 +76,7 @@
 rem ----- Execute the requested command ----------------------------------------
 
 :run
+set _JAVA_MEM=-Xmx512m
 set _JAVA_STACK=-Xss512k
 
 rem Escape any quotes. Use _S for ', _D for ", and _U to escape _ itself.
@@ -152,14 +153,14 @@
 :jvmArg
 set _VAL=%_CMP:~2%
 
-if "%_VAL:~0,4%" == "-Xss" (
+if "%_VAL:~0,4%" == "-Xmx" (
+   set _JAVA_MEM=%_VAL%
+) else if "%_VAL:~0,4%" == "-Xss" (
    set _JAVA_STACK=%_VAL%
-   echo %_VAL%
-   goto nextArg
+) else (
+   set _JAVA_OPTS=%_JAVA_OPTS% %_VAL%
 )
 
-set _JAVA_OPTS=%_JAVA_OPTS% %_VAL%
-
 :nextArg
 set _CMP=
 goto scanArgs
@@ -172,7 +173,7 @@
     set CLASSPATH=%_CP:"=%
   )
 )
-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%
+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%
 ) else (
@@ -190,6 +191,7 @@
 set _FULL_CMD=
 set _JAVA_CMD=
 set _JAVA_OPTS=
+set _JAVA_MEM=
 set _JAVA_STACK=
 set _JYTHON_HOME=
 set _JYTHON_OPTS=


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