# HG changeset patch # User wenzelm # Date 1743948335 -7200 # Node ID 04d4414b2c21a127a2843a3b86a0753b0c75300d # Parent 741f6f6df1449c74974e6e96c01c6fd718f0dbd8# Parent a4a8d98a173b2d8dec27c5187ab67a152efd79ff merged diff -r 741f6f6df144 -r 04d4414b2c21 Admin/components/components.sha1 --- a/Admin/components/components.sha1 Sun Apr 06 14:20:41 2025 +0200 +++ b/Admin/components/components.sha1 Sun Apr 06 16:05:35 2025 +0200 @@ -105,6 +105,7 @@ 230d01c2c7274a17b6410535eb41665b16b41ae6 e-3.0.03.tar.gz e4a617aed36c32125aeeee3efea0eeff8c979481 e-3.1-1.tar.gz 4e436e450775bd971b3247c97d4bba7943ae4762 e-3.1.tar.gz +e3d287ba174f63602195a8f1ce075bd21bbdf39b e-3.2.tar.gz 239e7b8bebbfc29a1c5151e8fb261ffad44877f1 easychair-3.5.tar.gz ea721f9a8a84831313a1b669db76f4ca55794f01 elm-0.19.1.tar.gz 4a3b4b4e0441c4498a0c71dc348f3538be589a15 eptcs-1.7.0.tar.gz diff -r 741f6f6df144 -r 04d4414b2c21 Admin/components/main --- a/Admin/components/main Sun Apr 06 14:20:41 2025 +0200 +++ b/Admin/components/main Sun Apr 06 16:05:35 2025 +0200 @@ -4,7 +4,7 @@ bib2xhtml-20190409 csdp-6.1.1 cvc5-1.2.0-1 -e-3.1-1 +e-3.2 elm-0.19.1 easychair-3.5 eptcs-1.7.0 diff -r 741f6f6df144 -r 04d4414b2c21 src/Pure/Admin/component_e.scala --- a/src/Pure/Admin/component_e.scala Sun Apr 06 14:20:41 2025 +0200 +++ b/src/Pure/Admin/component_e.scala Sun Apr 06 16:05:35 2025 +0200 @@ -10,7 +10,7 @@ object Component_E { /* build E prover */ - val default_version = "3.1" + val default_version = "3.2" val default_download_url = "https://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD" def build_e( @@ -48,18 +48,14 @@ progress.echo("Building E prover for " + platform_name + " ...") // adhoc patch wrt. https://github.com/eprover/eprover/commit/d40e1db7d786 + // obsolete after https://github.com/eprover/eprover/commit/5ae1a2c66da6 if (Platform.is_windows) { File.change_lines(source_dir + Path.explode("PROVER/eprover.c"), strict = true) { _.map(line => if (line.containsSlice("setpgid(0, 0)")) "" else line) } } - val build_options = { - val result = Isabelle_System.bash("./configure --help", cwd = source_dir) - if (result.check.out.containsSlice("--enable-ho")) " --enable-ho" else "" - } - - val build_script = "./configure" + build_options + " && make" + val build_script = "./configure --enable-ho && make" Isabelle_System.bash(build_script, cwd = source_dir, progress_stdout = progress.echo(_, verbose = true), progress_stderr = progress.echo(_, verbose = true)).check @@ -69,13 +65,12 @@ Isabelle_System.copy_file(source_dir + Path.basic("COPYING"), component_dir.LICENSE) - val install_files = List("epclextract", "eprover", "eprover-ho") + val install_files = List("epclextract", "eprover-ho") for (name <- install_files ::: install_files.map(_ + ".exe")) { val path = source_dir + Path.basic("PROVER") + Path.basic(name) if (path.is_file) Isabelle_System.copy_file(path, platform_dir) } - Isabelle_System.bash("if [ -f eprover-ho ]; then mv eprover-ho eprover; fi", - cwd = platform_dir).check + Isabelle_System.bash("mv eprover-ho eprover", cwd = platform_dir).check /* settings */ diff -r 741f6f6df144 -r 04d4414b2c21 src/Pure/ROOT.ML --- a/src/Pure/ROOT.ML Sun Apr 06 14:20:41 2025 +0200 +++ b/src/Pure/ROOT.ML Sun Apr 06 16:05:35 2025 +0200 @@ -1,6 +1,6 @@ (* Title: Pure/ROOT.ML Author: Makarius - UUID: 619a7a37-9241-410f-82a1-be35d8c9e937 + UUID: afd90a19-201a-461b-b4ef-b3adfa88969d Main entry point for the Isabelle/Pure bootstrap process.