jython-checkins

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

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

Revision: 5474
          http://jython.svn.sourceforge.net/jython/?rev=5474&view=rev
Author:   pjenvey
Date:     2008-10-20 00:44:52 +0000 (Mon, 20 Oct 2008)

Log Message:
-----------
bump java's stack size to 768k on solaris, to fix test_cpickle there

Modified Paths:
--------------
    trunk/jython/src/shell/jython

Modified: trunk/jython/src/shell/jython
===================================================================
--- trunk/jython/src/shell/jython	2008-10-19 23:30:32 UTC (rev 5473)
+++ trunk/jython/src/shell/jython	2008-10-20 00:44:52 UTC (rev 5474)
@@ -13,10 +13,12 @@
 # -----------------------------------------------------------------------------
 
 cygwin=false
+solaris=false
 
 # ----- Identify OS we are running under --------------------------------------
 case "`uname`" in
-  CYGWIN*) cygwin=true
+  CYGWIN*) cygwin=true;;
+  SunOS*) solaris=true;;
 esac
 
 # ----- Verify and set required environment variables -------------------------
@@ -81,7 +83,13 @@
 
 # ----- Execute the requested command -----------------------------------------
 
-JAVA_STACK=-Xss512k # minimum requirement for test_cpickle
+# stack size value determined by the minimum requirement for
+# test_cpickle
+if $solaris; then
+  JAVA_STACK=-Xss768k
+else
+  JAVA_STACK=-Xss512k
+fi
 
 # Split out any -J argument for passing to the JVM.
 # Scanning for args is aborted by '--'.


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

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

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

Revision: 5484
          http://jython.svn.sourceforge.net/jython/?rev=5484&view=rev
Author:   pjenvey
Date:     2008-10-20 20:05:02 +0000 (Mon, 20 Oct 2008)

Log Message:
-----------
revert r5474 and bump Java's stack size to 1024k, matching 64 bit Java's
default. 32 bit needs an increase to at least 512k to pass test_cpickle, but we
don't want to shrink 64 bit's default

Modified Paths:
--------------
    trunk/jython/src/shell/jython

Modified: trunk/jython/src/shell/jython
===================================================================
--- trunk/jython/src/shell/jython	2008-10-20 20:01:14 UTC (rev 5483)
+++ trunk/jython/src/shell/jython	2008-10-20 20:05:02 UTC (rev 5484)
@@ -13,12 +13,10 @@
 # -----------------------------------------------------------------------------
 
 cygwin=false
-solaris=false
 
 # ----- Identify OS we are running under --------------------------------------
 case "`uname`" in
-  CYGWIN*) cygwin=true;;
-  SunOS*) solaris=true;;
+  CYGWIN*) cygwin=true
 esac
 
 # ----- Verify and set required environment variables -------------------------
@@ -83,12 +81,11 @@
 
 # ----- Execute the requested command -----------------------------------------
 
-# stack size value determined by the minimum requirement for
-# test_cpickle
-if $solaris; then
-  JAVA_STACK=-Xss768k
-else
-  JAVA_STACK=-Xss512k
+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
+   # default of 1024k
+  JAVA_STACK=-Xss1024k
 fi
 
 # Split out any -J argument for passing to the JVM.


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

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

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

Revision: 5681
          http://jython.svn.sourceforge.net/jython/?rev=5681&view=rev
Author:   nriley
Date:     2008-12-03 09:39:46 +0000 (Wed, 03 Dec 2008)

Log Message:
-----------
--print option for start script

Modified Paths:
--------------
    trunk/jython/src/shell/jython

Modified: trunk/jython/src/shell/jython
===================================================================
--- trunk/jython/src/shell/jython	2008-12-03 09:30:15 UTC (rev 5680)
+++ trunk/jython/src/shell/jython	2008-12-03 09:39:46 UTC (rev 5681)
@@ -125,6 +125,10 @@
     -D*)
       python_args=("${python_args[@]}" "$1")
       ;;
+    # Print the command, don't execute it
+    --print)
+      print_requested=true
+      ;;
     # Run with the instrumented profiler: http://jiprof.sourceforge.net/
     --profile)
       rm -f profile.txt # XXX do this?
@@ -197,12 +201,17 @@
   [ -n "$profile_requested" ] && echo "Running with instrumented profiler"
   java_args=("${java_args[@]}" -classpath "$CP$CP_DELIMITER$CLASSPATH")
 else
-  if [ -z "$help_requested" ] ; then
+  if [ -z "$help_requested" -a -z "$print_requested" ] ; then
     JAVA_CMD=(exec "${JAVA_CMD[@]}")
   fi
-  java_args=("${java_args[@]}" -Xbootclasspath/a:"$CP" -classpath "$CLASSPATH")
+  java_args=("${java_args[@]}" -Xbootclasspath/a:"$CP")
+  [ -n "$CLASSPATH" ] && java_args=("${java_args[@]}" -classpath "$CLASSPATH")
 fi
 
+if [ -n "$print_requested" ] ; then
+  JAVA_CMD=(echo $JAVA_CMD)
+fi
+
 "${JAVA_CMD[@]}" $JAVA_OPTS "${java_args[@]}" -Dpython.home="$JYTHON_HOME" \
   -Dpython.executable="$PRG" org.python.util.jython $JYTHON_OPTS "$@"
 
@@ -213,6 +222,7 @@
   echo "Jython launcher options:" >&2
   echo "-Jarg    : pass argument through to Java VM (e.g. -J-Xmx512m)" >&2
   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 "--       : pass remaining arguments through to Jython" >&2


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

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

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

Revision: 6096
          http://jython.svn.sourceforge.net/jython/?rev=6096&view=rev
Author:   pjenvey
Date:     2009-03-14 23:23:10 +0000 (Sat, 14 Mar 2009)

Log Message:
-----------
maintain the exit code
fixes #1261, test_cmd_line's test_directories

Modified Paths:
--------------
    trunk/jython/src/shell/jython

Modified: trunk/jython/src/shell/jython
===================================================================
--- trunk/jython/src/shell/jython	2009-03-14 23:21:30 UTC (rev 6095)
+++ trunk/jython/src/shell/jython	2009-03-14 23:23:10 UTC (rev 6096)
@@ -214,6 +214,7 @@
 
 "${JAVA_CMD[@]}" $JAVA_OPTS "${java_args[@]}" -Dpython.home="$JYTHON_HOME" \
   -Dpython.executable="$PRG" org.python.util.jython $JYTHON_OPTS "$@"
+JYTHON_STATUS=$?
 
 if [ -n "$profile_requested" ] ; then
   echo "Profiling results:"
@@ -231,3 +232,5 @@
   echo "JYTHON_HOME: Jython installation directory" >&2
   echo "JYTHON_OPTS: default command line arguments" >&2
 fi
+
+exit $JYTHON_STATUS


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

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

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

Revision: 6351
          http://jython.svn.sourceforge.net/jython/?rev=6351&view=rev
Author:   pjenvey
Date:     2009-05-16 01:14:07 +0000 (Sat, 16 May 2009)

Log Message:
-----------
cygwin fixes: tweak term settings/CP_DELIMITER and hardcode to UnixTerminal
thanks Weiqi Gao

Modified Paths:
--------------
    trunk/jython/src/shell/jython

Modified: trunk/jython/src/shell/jython
===================================================================
--- trunk/jython/src/shell/jython	2009-05-15 03:24:44 UTC (rev 6350)
+++ trunk/jython/src/shell/jython	2009-05-16 01:14:07 UTC (rev 6351)
@@ -91,7 +91,9 @@
 fi
 
 if $cygwin; then
-  CP=`cygpath -wp "$CP"`
+  # switch delimiter only after building a Unix style $CP
+  CP_DELIMITER=";"
+  CP=`cygpath -p -w "$CP"`
   PRG=`cygpath -w "$PRG"`
 fi
 
@@ -224,6 +226,10 @@
     win_args=("$win_arg" "$@")
     set -- "${win_args[@]}"
   fi
+
+  # fix JLine to use UnixTerminal
+  stty -icanon min 1 -echo
+  JAVA_OPTS="$JAVA_OPTS -Djline.terminal=jline.UnixTerminal"
 fi
 
 if [ -n "$profile_requested" -o -z "$boot_requested" ] ; then
@@ -262,4 +268,8 @@
   echo "JYTHON_OPTS: default command line arguments" >&2
 fi
 
+if $cygwin; then
+  stty icanon echo
+fi
+
 exit $JYTHON_STATUS


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

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

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

Revision: 6353
          http://jython.svn.sourceforge.net/jython/?rev=6353&view=rev
Author:   pjenvey
Date:     2009-05-16 05:15:28 +0000 (Sat, 16 May 2009)

Log Message:
-----------
handle stty failures and don't hardcode UnixTerminal when they happen
thanks Weiqi Gao

Modified Paths:
--------------
    trunk/jython/src/shell/jython

Modified: trunk/jython/src/shell/jython
===================================================================
--- trunk/jython/src/shell/jython	2009-05-16 01:58:51 UTC (rev 6352)
+++ trunk/jython/src/shell/jython	2009-05-16 05:15:28 UTC (rev 6353)
@@ -228,8 +228,10 @@
   fi
 
   # fix JLine to use UnixTerminal
-  stty -icanon min 1 -echo
-  JAVA_OPTS="$JAVA_OPTS -Djline.terminal=jline.UnixTerminal"
+  stty -icanon min 1 -echo > /dev/null 2>&1
+  if [ $? = 0 ]; then
+    JAVA_OPTS="$JAVA_OPTS -Djline.terminal=jline.UnixTerminal"
+  fi
 fi
 
 if [ -n "$profile_requested" -o -z "$boot_requested" ] ; then
@@ -269,7 +271,7 @@
 fi
 
 if $cygwin; then
-  stty icanon echo
+  stty icanon echo > /dev/null 2>&1
 fi
 
 exit $JYTHON_STATUS


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

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

[<fwi...@us...>]

Revision: 6696
          http://jython.svn.sourceforge.net/jython/?rev=6696&view=rev
Author:   fwierzbicki
Date:     2009-08-19 14:30:14 +0000 (Wed, 19 Aug 2009)

Log Message:
-----------
Added support for "jython -J-classpath cp_arg_goes_here" in jython unix shell.

Modified Paths:
--------------
    trunk/jython/src/shell/jython

Modified: trunk/jython/src/shell/jython
===================================================================
--- trunk/jython/src/shell/jython	2009-08-19 13:23:14 UTC (rev 6695)
+++ trunk/jython/src/shell/jython	2009-08-19 14:30:14 UTC (rev 6696)
@@ -135,6 +135,12 @@
           $JAVA_CMD -X
           echo "(Prepend -J in front of these options when using 'jython' command)" 
           exit
+        elif [ "${val}" = "-classpath" ]; then
+            CP="$CP$CP_DELIMITER$2"
+            shift
+        elif [ "${val}" = "-cp" ]; then
+            CP="$CP$CP_DELIMITER$2"
+            shift
       else
           if [ "${val:0:16}" = "-Dfile.encoding=" ]; then
               JAVA_ENCODING=$val


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

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

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

Revision: 6998
          http://jython.svn.sourceforge.net/jython/?rev=6998&view=rev
Author:   nriley
Date:     2010-04-02 16:15:48 +0000 (Fri, 02 Apr 2010)

Log Message:
-----------
Invalid and redundant regex anchor causes some systems to output a warning.  Fixes #1588; thanks, Richard Shaffer.

Modified Paths:
--------------
    trunk/jython/src/shell/jython

Modified: trunk/jython/src/shell/jython
===================================================================
--- trunk/jython/src/shell/jython	2010-04-02 01:56:15 UTC (rev 6997)
+++ trunk/jython/src/shell/jython	2010-04-02 16:15:48 UTC (rev 6998)
@@ -29,7 +29,7 @@
   ls=`ls -ld "$PRG"`
   link=`expr "$ls" : '.*-> \(.*\)$'`
   if expr "$link" : '.*/.*' > /dev/null; then
-    if expr "$link" : '^/' > /dev/null; then
+    if expr "$link" : '/' > /dev/null; then
       PRG="$link"
     else
       PRG="`dirname ${PRG}`/${link}"


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