--- a/Admin/components/components.sha1 Mon Feb 06 10:20:12 2023 +0100
+++ b/Admin/components/components.sha1 Mon Feb 06 10:30:53 2023 +0100
@@ -164,6 +164,7 @@
171df3eb58bdac4cc495f773b797fa578f7d4be6 isabelle_setup-20220817.tar.gz
7b1ce9bd85e33076fa7022eeb66ce15915d078d9 isabelle_setup-20221020.tar.gz
cb9f061ccd7c6f90d00c8aa115aeea8679f3f996 isabelle_setup-20221028.tar.gz
+f582c621471583d06e00007c6acc01376c7395af isabelle_setup-20230206.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 Mon Feb 06 10:20:12 2023 +0100
+++ b/Admin/components/main Mon Feb 06 10:30:53 2023 +0100
@@ -12,7 +12,7 @@
foiltex-2.1.4b
idea-icons-20210508
isabelle_fonts-20211004
-isabelle_setup-20221028
+isabelle_setup-20230206
jdk-17.0.6
jedit-20211103
jfreechart-1.5.3
--- a/src/Tools/Setup/src/Build.java Mon Feb 06 10:20:12 2023 +0100
+++ b/src/Tools/Setup/src/Build.java Mon Feb 06 10:30:53 2023 +0100
@@ -74,6 +74,7 @@
public static String BUILD_PROPS = "build.props";
public static String COMPONENT_BUILD_PROPS = "etc/build.props";
+ public static String META_INFO = "<meta_info>";
public static String TITLE = "title";
public static String MODULE = "module";
@@ -223,14 +224,14 @@
return shasum(file, List.of(path(file)));
}
- public String shasum_props()
+ public String shasum_meta_info()
throws NoSuchAlgorithmException, IOException, InterruptedException
{
TreeMap<String,Object> sorted = new TreeMap<String,Object>();
for (Object x : _props.entrySet()) {
sorted.put(x.toString(), _props.get(x));
}
- return make_shasum("<props>",
+ return make_shasum(META_INFO,
sha -> sha.update(sorted.toString().getBytes(StandardCharsets.UTF_8)));
}
}
@@ -475,7 +476,7 @@
List<Path> compiler_deps = new LinkedList<Path>();
{
StringBuilder _shasum = new StringBuilder();
- _shasum.append(context.shasum_props());
+ _shasum.append(context.shasum_meta_info());
for (String s : requirements) {
List<Path> paths = context.requirement_paths(s);
compiler_deps.addAll(paths);