--- a/Admin/PLATFORMS Wed Sep 30 21:05:14 2015 +0200
+++ b/Admin/PLATFORMS Wed Sep 30 21:32:44 2015 +0200
@@ -11,10 +11,10 @@
The basic Isabelle system infrastructure provides some facilities to
make this work, e.g. see the ML and Scala modules File and Path, or
functions like Isabelle_System.bash. The settings environment also
-provides some means for portability, e.g. the bash function "jvmpath"
-to keep the impression that Java on Windows/Cygwin adheres to
-Isabelle/POSIX standards, although inside the JVM itself there are
-many Windows-specific things.
+provides some means for portability, e.g. the bash function
+"platform_path" to keep the impression that Windows/Cygwin adheres to
+Isabelle/POSIX standards, although Poly/ML and the JVM are
+Windows-specific things.
When producing add-on tools, it is important to stay within this clean
room of Isabelle, and refrain from overly ambitious system hacking.
@@ -97,7 +97,7 @@
* Perl as largely portable system programming language, with its
fairly robust support for processes, signals, sockets etc.
-* Scala with Java 1.7. Isabelle/Scala irons out many oddities and
+* Scala with Java 1.8. Isabelle/Scala irons out many oddities and
portability issues of the Java platform.
--- a/NEWS Wed Sep 30 21:05:14 2015 +0200
+++ b/NEWS Wed Sep 30 21:32:44 2015 +0200
@@ -408,6 +408,9 @@
- isabelle build: settings
ISABELLE_BUILD_JAVA_OPTIONS32 vs. ISABELLE_BUILD_JAVA_OPTIONS64
+* Bash shell function "jvmpath" has been renamed to "platform_path": it
+is relevant both for Poly/ML and JVM processes.
+
New in Isabelle2015 (May 2015)
--- a/lib/Tools/browser Wed Sep 30 21:05:14 2015 +0200
+++ b/lib/Tools/browser Wed Sep 30 21:32:44 2015 +0200
@@ -86,9 +86,9 @@
esac
if [ -z "$OUTFILE" ]; then
- "$ISABELLE_TOOL" java GraphBrowser.GraphBrowser "$(jvmpath "$PRIVATE_FILE")"
+ "$ISABELLE_TOOL" java GraphBrowser.GraphBrowser "$(platform_path "$PRIVATE_FILE")"
else
- "$ISABELLE_TOOL" java GraphBrowser.Console "$(jvmpath "$PRIVATE_FILE")" "$(jvmpath "$OUTFILE")"
+ "$ISABELLE_TOOL" java GraphBrowser.Console "$(platform_path "$PRIVATE_FILE")" "$(platform_path "$OUTFILE")"
fi
RC="$?"
--- a/lib/Tools/getenv Wed Sep 30 21:05:14 2015 +0200
+++ b/lib/Tools/getenv Wed Sep 30 21:32:44 2015 +0200
@@ -76,7 +76,7 @@
fi
if [ -n "$DUMP" ]; then
- export PATH_JVM="$(jvmpath "$PATH")"
+ export PATH_JVM="$(platform_path "$PATH")"
exec perl -w -e 'for $key (keys %ENV) { print $key, "=", $ENV{$key}, "\x00"; }' > "$DUMP"
fi
--- a/lib/Tools/java Wed Sep 30 21:05:14 2015 +0200
+++ b/lib/Tools/java Wed Sep 30 21:32:44 2015 +0200
@@ -10,5 +10,5 @@
unset CLASSPATH
isabelle_java java "${JAVA_ARGS[@]}" \
- -classpath "$(jvmpath "$ISABELLE_CLASSPATH")" "$@"
+ -classpath "$(platform_path "$ISABELLE_CLASSPATH")" "$@"
--- a/lib/Tools/scala Wed Sep 30 21:05:14 2015 +0200
+++ b/lib/Tools/scala Wed Sep 30 21:32:44 2015 +0200
@@ -14,4 +14,4 @@
done
isabelle_scala scala "${SCALA_ARGS[@]}" \
- -classpath "$(jvmpath "$ISABELLE_CLASSPATH")" "$@"
+ -classpath "$(platform_path "$ISABELLE_CLASSPATH")" "$@"
--- a/lib/Tools/scalac Wed Sep 30 21:05:14 2015 +0200
+++ b/lib/Tools/scalac Wed Sep 30 21:32:44 2015 +0200
@@ -7,5 +7,5 @@
isabelle_admin_build jars || exit $?
isabelle_scala scalac -Dfile.encoding=UTF-8 \
- -classpath "$(jvmpath "$ISABELLE_CLASSPATH")" "$@"
+ -classpath "$(platform_path "$ISABELLE_CLASSPATH")" "$@"
--- a/lib/browser/build Wed Sep 30 21:05:14 2015 +0200
+++ b/lib/browser/build Wed Sep 30 21:32:44 2015 +0200
@@ -65,7 +65,7 @@
isabelle_jdk javac -d classes -source 1.4 "${SOURCES[@]}" || \
fail "Failed to compile sources"
- isabelle_jdk jar cf "$(jvmpath "$TARGET")" -C classes . ||
+ isabelle_jdk jar cf "$(platform_path "$TARGET")" -C classes . ||
fail "Failed to produce $TARGET"
rm -rf classes
--- a/lib/scripts/getsettings Wed Sep 30 21:05:14 2015 +0200
+++ b/lib/scripts/getsettings Wed Sep 30 21:32:44 2015 +0200
@@ -36,9 +36,9 @@
USER_HOME="$(cygpath -u "$USERPROFILE")"
fi
- function jvmpath() { cygpath -i -C UTF8 -w -p "$@"; }
- CYGWIN_ROOT="$(jvmpath "/")"
- ISABELLE_ROOT="$(jvmpath "$ISABELLE_HOME")"
+ function platform_path() { cygpath -i -C UTF8 -w -p "$@"; }
+ CYGWIN_ROOT="$(platform_path "/")"
+ ISABELLE_ROOT="$(platform_path "$ISABELLE_HOME")"
ISABELLE_CLASSPATH="$(cygpath -i -u -p "$CLASSPATH")"
unset CLASSPATH
@@ -49,7 +49,7 @@
ISABELLE_ROOT="$ISABELLE_HOME"
- function jvmpath() { echo "$@"; }
+ function platform_path() { echo "$@"; }
ISABELLE_CLASSPATH="$CLASSPATH"
unset CLASSPATH
--- a/lib/scripts/run-polyml-5.5.3 Wed Sep 30 21:05:14 2015 +0200
+++ b/lib/scripts/run-polyml-5.5.3 Wed Sep 30 21:32:44 2015 +0200
@@ -42,8 +42,8 @@
case "$ML_PLATFORM" in
*-windows)
- PLATFORM_INFILE="$(jvmpath -m "$INFILE")"
- PLATFORM_OUTFILE="$(jvmpath -m "$OUTFILE")"
+ PLATFORM_INFILE="$(platform_path -m "$INFILE")"
+ PLATFORM_OUTFILE="$(platform_path -m "$OUTFILE")"
;;
*)
PLATFORM_INFILE="$INFILE"
--- a/src/Pure/build-jars Wed Sep 30 21:05:14 2015 +0200
+++ b/src/Pure/build-jars Wed Sep 30 21:32:44 2015 +0200
@@ -238,7 +238,7 @@
(
classpath "$JAVA_HOME/lib/jfxrt.jar"
classpath classes
- export CLASSPATH="$(jvmpath "$ISABELLE_CLASSPATH")"
+ export CLASSPATH="$(platform_path "$ISABELLE_CLASSPATH")"
if [ "$TEST_PIDE" = true ]; then
isabelle_scala scalac $SCALAC_OPTIONS "${PIDE_SOURCES[@]}" || \
@@ -262,7 +262,7 @@
cp "$ISABELLE_HOME/lib/logo/isabelle_transparent-32.gif" isabelle/.
cp "$ISABELLE_HOME/lib/logo/isabelle_transparent.gif" isabelle/.
- isabelle_jdk jar cfe "$(jvmpath "$TARGET")" isabelle.Main META-INF isabelle || \
+ isabelle_jdk jar cfe "$(platform_path "$TARGET")" isabelle.Main META-INF isabelle || \
fail "Failed to produce $TARGET"
popd >/dev/null
--- a/src/Tools/jEdit/lib/Tools/jedit Wed Sep 30 21:05:14 2015 +0200
+++ b/src/Tools/jEdit/lib/Tools/jedit Wed Sep 30 21:32:44 2015 +0200
@@ -197,10 +197,10 @@
# args
if [ "$#" -eq 0 ]; then
- ARGS["${#ARGS[@]}"]="$(jvmpath "$USER_HOME/Scratch.thy")"
+ ARGS["${#ARGS[@]}"]="$(platform_path "$USER_HOME/Scratch.thy")"
else
while [ "$#" -gt 0 ]; do
- ARGS["${#ARGS[@]}"]="$(jvmpath "$1")"
+ ARGS["${#ARGS[@]}"]="$(platform_path "$1")"
shift
done
fi
@@ -332,7 +332,7 @@
do
classpath "$JAR"
done
- export CLASSPATH="$(jvmpath "$ISABELLE_CLASSPATH")"
+ export CLASSPATH="$(platform_path "$ISABELLE_CLASSPATH")"
exec "$SCALA_HOME/bin/scalac" $ISABELLE_SCALA_BUILD_OPTIONS -d dist/classes "${SOURCES[@]}"
) || fail "Failed to compile sources"
--- a/src/Tools/jEdit/lib/Tools/jedit_client Wed Sep 30 21:05:14 2015 +0200
+++ b/src/Tools/jEdit/lib/Tools/jedit_client Wed Sep 30 21:32:44 2015 +0200
@@ -85,7 +85,7 @@
while [ "$#" -gt 0 ]
do
- ARGS["${#ARGS[@]}"]="$(jvmpath "$1")"
+ ARGS["${#ARGS[@]}"]="$(platform_path "$1")"
shift
done
@@ -109,7 +109,7 @@
if [ -f "$JEDIT_SETTINGS/$SERVER_NAME" ]
then
exec "$ISABELLE_TOOL" java "${JAVA_ARGS[@]}" -jar "$JEDIT_HOME/dist/jedit.jar" \
- "-settings=$(jvmpath "$JEDIT_SETTINGS")" -server="$SERVER_NAME" -reuseview "${ARGS[@]}"
+ "-settings=$(platform_path "$JEDIT_SETTINGS")" -server="$SERVER_NAME" -reuseview "${ARGS[@]}"
else
fail "Isabelle/jEdit server \"$SERVER_NAME\" not active"
fi