diff -r 5b9bc956cec6 -r 97f8b7c0f420 lib/scripts/getsettings --- a/lib/scripts/getsettings Fri Aug 15 22:59:01 2008 +0200 +++ b/lib/scripts/getsettings Fri Aug 15 22:59:02 2008 +0200 @@ -44,13 +44,30 @@ echo "$RESULT" } -#Java path wrapper +#JVM path wrappers if [ "$OSTYPE" = cygwin ]; then - function javapath() { cygpath -w "$@"; } + CLASSPATH="$(cygpath -u -p "$CLASSPATH")" + function jvmpath() { cygpath -w -p "$@"; } + function javawrapper() { env CLASSPATH="$(javapath "$CLASSPATH")" java "$@"; } + function scalawrapper() { env CLASSPATH="$(javapath "$CLASSPATH")" scala "$@"; } else - function javapath() { echo "$@"; } + function jvmpath() { echo "$@"; } + function javawrapper() { java "$@"; } + function scalawrapper() { scala "$@"; } fi +#CLASSPATH convenience +function classpath () { + for X in "$@" + do + if [ -z "$CLASSPATH" ]; then + CLASSPATH="$X" + else + CLASSPATH="$CLASSPATH:$X" + fi + done +} + #get actual settings source "$ISABELLE_HOME/etc/settings" || exit 2 ISABELLE_SITE_SETTINGS_PRESENT=true