--- a/Admin/components/components.sha1 Thu Oct 20 12:57:06 2022 +0100
+++ b/Admin/components/components.sha1 Thu Oct 20 23:43:59 2022 +0200
@@ -158,6 +158,7 @@
056979bd1c08eb9d0d12cc1118b4ff70bfe2d594 isabelle_setup-20220701.tar.gz
be91402b3e5ef5bc6d4802a45175ee238cd9653e isabelle_setup-20220808.tar.gz
171df3eb58bdac4cc495f773b797fa578f7d4be6 isabelle_setup-20220817.tar.gz
+7b1ce9bd85e33076fa7022eeb66ce15915d078d9 isabelle_setup-20221020.tar.gz
0b2206f914336dec4923dd0479d8cee4b904f544 jdk-11+28.tar.gz
e12574d838ed55ef2845acf1152329572ab0cc56 jdk-11.0.10+9.tar.gz
3e05213cad47dbef52804fe329395db9b4e57f39 jdk-11.0.2+9.tar.gz
--- a/Admin/components/main Thu Oct 20 12:57:06 2022 +0100
+++ b/Admin/components/main Thu Oct 20 23:43:59 2022 +0200
@@ -9,7 +9,7 @@
flatlaf-2.4
idea-icons-20210508
isabelle_fonts-20211004
-isabelle_setup-20220817
+isabelle_setup-20221020
jdk-17.0.4.1+1
jedit-20211103
jfreechart-1.5.3
--- a/bin/isabelle_java Thu Oct 20 12:57:06 2022 +0100
+++ b/bin/isabelle_java Thu Oct 20 23:43:59 2022 +0200
@@ -64,7 +64,7 @@
exit 127
else
unset ISABELLE_HOME
- unset CLASSPATH
+ export CLASSPATH=""
exec "$JAVA_HOME/bin/java" "${JAVA_ARGS[@]}" \
-classpath "$ISABELLE_CLASSPATH" "$@"
fi
--- a/lib/Tools/java Thu Oct 20 12:57:06 2022 +0100
+++ b/lib/Tools/java Thu Oct 20 23:43:59 2022 +0200
@@ -7,7 +7,7 @@
eval "declare -a JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS)"
classpath "$ISABELLE_SETUP_CLASSPATH"; unset ISABELLE_SETUP_CLASSPATH
-classpath "$CLASSPATH"; unset CLASSPATH
+classpath "$CLASSPATH"; export CLASSPATH=""
isabelle_java java "${JAVA_ARGS[@]}" \
-classpath "$(platform_path "$ISABELLE_CLASSPATH")" "$@"
--- a/lib/Tools/scala Thu Oct 20 12:57:06 2022 +0100
+++ b/lib/Tools/scala Thu Oct 20 23:43:59 2022 +0200
@@ -7,7 +7,7 @@
isabelle scala_build || exit $?
classpath "$ISABELLE_SETUP_CLASSPATH"; unset ISABELLE_SETUP_CLASSPATH
-classpath "$CLASSPATH"; unset CLASSPATH
+classpath "$CLASSPATH"; export CLASSPATH=""
export jvm_cp_args="$(platform_path "$ISABELLE_CLASSPATH")"
export JAVA_OPTS="$ISABELLE_JAVA_SYSTEM_OPTIONS -J-Dscala.usejavacp=true"
--- a/lib/Tools/scala_build Thu Oct 20 12:57:06 2022 +0100
+++ b/lib/Tools/scala_build Thu Oct 20 23:43:59 2022 +0200
@@ -57,7 +57,7 @@
"$ISABELLE_HOME/lib/classes/Pure.shasum" \
"$ISABELLE_HOME/src/Tools/jEdit/dist"
-classpath "$CLASSPATH"; unset CLASSPATH
+classpath "$CLASSPATH"; export CLASSPATH=""
eval "declare -a JAVA_ARGS=($ISABELLE_TOOL_JAVA_OPTIONS)"
--- a/lib/Tools/scalac Thu Oct 20 12:57:06 2022 +0100
+++ b/lib/Tools/scalac Thu Oct 20 23:43:59 2022 +0200
@@ -7,7 +7,7 @@
isabelle scala_build || exit $?
classpath "$ISABELLE_SETUP_CLASSPATH"; unset ISABELLE_SETUP_CLASSPATH
-classpath "$CLASSPATH"; unset CLASSPATH
+classpath "$CLASSPATH"; export CLASSPATH=""
isabelle_scala scalac -Dfile.encoding=UTF-8 \
-classpath "$(platform_path "$ISABELLE_CLASSPATH")" "$@"
--- a/lib/scripts/getsettings Thu Oct 20 12:57:06 2022 +0100
+++ b/lib/scripts/getsettings Thu Oct 20 23:43:59 2022 +0200
@@ -41,7 +41,7 @@
ISABELLE_ROOT="$(platform_path "$ISABELLE_HOME")"
ISABELLE_CLASSPATH="$(cygpath -i -u -p "$CLASSPATH")"
- unset CLASSPATH
+ export CLASSPATH=""
else
if [ -z "$USER_HOME" ]; then
USER_HOME="$HOME"
@@ -50,7 +50,7 @@
ISABELLE_ROOT="$ISABELLE_HOME"
ISABELLE_CLASSPATH="$CLASSPATH"
- unset CLASSPATH
+ export CLASSPATH=""
fi
#init cumulative settings
--- a/src/Pure/Thy/sessions.scala Thu Oct 20 12:57:06 2022 +0100
+++ b/src/Pure/Thy/sessions.scala Thu Oct 20 23:43:59 2022 +0200
@@ -1149,6 +1149,7 @@
info_roots += make_info(chapter_defs, options, select, dir, chapter, entry)
case _ =>
}
+ chapter = UNSORTED
}
info_roots.toList
}
--- a/src/Tools/Setup/src/Environment.java Thu Oct 20 12:57:06 2022 +0100
+++ b/src/Tools/Setup/src/Environment.java Thu Oct 20 23:43:59 2022 +0200
@@ -9,6 +9,7 @@
import java.io.File;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.HashMap;
@@ -179,6 +180,11 @@
/* raw process */
+ private static read_file(path: Path): String =
+ {
+ return new String(Files.readAllBytes(path), StandardCharsets.UTF_8);
+ }
+
public static ProcessBuilder process_builder(
List<String> cmd, File cwd, Map<String,String> env, boolean redirect)
{
@@ -242,8 +248,8 @@
}
int rc = proc.exitValue();
- String out = Files.readString(out_file);
- String err = Files.readString(err_file);
+ String out = read_file(out_file);
+ String err = read_file(err_file);
res = new Exec_Result(rc, out, err);
}
finally {
@@ -388,7 +394,7 @@
Exec_Result res = exec_process(cmd, null, env, true);
if (!res.ok()) throw new RuntimeException(res.out());
- for (String s : Files.readString(settings_file).split("\u0000", -1)) {
+ for (String s : read_file(settings_file).split("\u0000", -1)) {
int i = s.indexOf('=');
if (i > 0) { settings.put(s.substring(0, i), s.substring(i + 1)); }
else if (i < 0 && !s.isEmpty()) { settings.put(s, ""); }
--- a/src/Tools/jEdit/src/jedit_main.scala Thu Oct 20 12:57:06 2022 +0100
+++ b/src/Tools/jEdit/src/jedit_main.scala Thu Oct 20 23:43:59 2022 +0200
@@ -128,7 +128,7 @@
catch {
case exn: Throwable =>
GUI.init_laf()
- GUI.dialog(null, "Isabelle", GUI.scrollable_text(Exn.message(exn)))
+ GUI.dialog(null, "Isabelle main", GUI.scrollable_text(Exn.print(exn)))
sys.exit(Process_Result.RC.failure)
}
}
--- a/src/Tools/jEdit/src/session_build.scala Thu Oct 20 12:57:06 2022 +0100
+++ b/src/Tools/jEdit/src/session_build.scala Thu Oct 20 23:43:59 2022 +0200
@@ -29,7 +29,7 @@
}
catch {
case exn: Throwable =>
- GUI.dialog(view, "Isabelle", GUI.scrollable_text(Exn.message(exn)))
+ GUI.dialog(view, "Isabelle build", GUI.scrollable_text(Exn.print(exn)))
}
}
}