# HG changeset patch # User wenzelm # Date 1707079890 -3600 # Node ID 0e7dd3eaa6e820380b3e0a0bd3e5a37a880b0403 # Parent fb6b448b79391209e32a38af69f6ffb293d9705a updated windows_app based on launch4j-3.50-linux-x64, without rebuilding GNU binutils (missing COFF target pe-i386); diff -r fb6b448b7939 -r 0e7dd3eaa6e8 Admin/components/bundled-windows --- a/Admin/components/bundled-windows Sun Feb 04 21:32:24 2024 +0100 +++ b/Admin/components/bundled-windows Sun Feb 04 21:51:30 2024 +0100 @@ -1,3 +1,3 @@ #additional components to be bundled for release cygwin-20230711-1 -windows_app-20240202 +windows_app-20240204 diff -r fb6b448b7939 -r 0e7dd3eaa6e8 Admin/components/components.sha1 --- a/Admin/components/components.sha1 Sun Feb 04 21:32:24 2024 +0100 +++ b/Admin/components/components.sha1 Sun Feb 04 21:51:30 2024 +0100 @@ -541,6 +541,7 @@ e809e4ab0d33cb413a7c47dd947e7dbdfcca1c24 windows_app-20181002.tar.gz 9e96ba128a0617a9020a178781df49d48c997e19 windows_app-20181006.tar.gz 4883f93efb27ae51fb2cc0e1f52309728f2dc407 windows_app-20240202.tar.gz +5269b9e38fe58be10272d6817dbfd08b67b312e7 windows_app-20240204.tar.gz 1c36a840320dfa9bac8af25fc289a4df5ea3eccb xz-java-1.2-1.tar.gz 2ae13aa17d0dc95ce254a52f1dba10929763a10d xz-java-1.2.tar.gz c22196148fcace5443a933238216cff5112948df xz-java-1.5.tar.gz diff -r fb6b448b7939 -r 0e7dd3eaa6e8 src/Pure/Admin/build_release.scala --- a/src/Pure/Admin/build_release.scala Sun Feb 04 21:32:24 2024 +0100 +++ b/src/Pure/Admin/build_release.scala Sun Feb 04 21:51:30 2024 +0100 @@ -718,8 +718,7 @@ "java.base/java.text", "java.base/java.util", "java.desktop/java.awt.font") - val launch4j_jar = - Path.explode("windows_app/launch4j-" + Platform.family + "/launch4j.jar") + val launch4j_jar = Component_Windows_App.launch4j_jar() execute(tmp_dir, cat_lines(List( @@ -776,7 +775,7 @@ "7z -y -bd a " + File.bash_path(exe_archive) + " " + Bash.string(isabelle_name)) if (!exe_archive.is_file) error("Failed to create archive: " + exe_archive) - val sfx_exe = tmp_dir + Path.explode("windows_app/7zsd_All_x64.sfx") + val sfx_exe = tmp_dir + Component_Windows_App.sfx_path val sfx_txt = File.read(Path.explode("~~/Admin/Windows/Installer/sfx.txt")) .replace("{ISABELLE_NAME}", isabelle_name) @@ -837,9 +836,10 @@ } else { Isabelle_System.with_tmp_dir("build_release") { tmp_dir => - val bundle = - context.dist_dir + Path.explode(context.dist_name + "_" + Platform.family + ".tar.gz") - execute_tar(tmp_dir, "-xzf " + File.bash_path(bundle)) + val windows_app_platform = Isabelle_Platform.self.ISABELLE_PLATFORM64 + val bundle = context.dist_name + "_" + Component_Windows_App.tool_platform() + ".tar.gz" + val bundle_path = context.dist_dir + Path.basic(bundle) + execute_tar(tmp_dir, "-xzf " + File.bash_path(bundle_path)) val other_isabelle = context.other_isabelle(tmp_dir, suffix = "")