[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.