Mercurial Mercurial > repos > isabelle / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | gz | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
provide minisat-2.2.1 for arm64-darwin, rebuild linux and macos binaries on current platforms, but retain x64_64-cygwin binary;
authorwenzelm
Sat, 13 Sep 2025 14:26:14 +0200
changeset 83146 87c96d455992
parent 83145 c3c278374b5b
child 83147 746983070fca
provide minisat-2.2.1 for arm64-darwin, rebuild linux and macos binaries on current platforms, but retain x64_64-cygwin binary; enforce rebuild of Isabelle/ML;
Admin/components/components.sha1 file | annotate | diff | comparison | revisions
Admin/components/main file | annotate | diff | comparison | revisions
src/Pure/Admin/component_minisat.scala file | annotate | diff | comparison | revisions
src/Pure/ROOT.ML file | annotate | diff | comparison | revisions 
--- a/Admin/components/components.sha1	Fri Sep 12 22:42:03 2025 +0200
+++ b/Admin/components/components.sha1	Sat Sep 13 14:26:14 2025 +0200
@@ -367,6 +367,7 @@
 400af57ec5cd51f96928d9de00d077524a6fe316 macos_app-20181205.tar.gz
 3bc42b8e22f0be5ec5614f1914066164c83498f8 macos_app-20181208.tar.gz
 5fb1a2d21b220d0e588790c0203ac87c10ed0870 minisat-2.2.1-1.tar.gz
+911903afdfe424ea9688f4712717d479145c4f08 minisat-2.2.1-2.tar.gz
 ae76bfaade3bf72ff6b2d3aafcd52fa45609fcd1 minisat-2.2.1.tar.gz
 59aa13f48685326995714cc6028aebb789e445e3 mlton-20210117-1.tar.gz
 7624509ba58b9b8231626a66eda571fba69f7cd3 mlton-20210117-2.tar.gz
--- a/Admin/components/main	Fri Sep 12 22:42:03 2025 +0200
+++ b/Admin/components/main	Sat Sep 13 14:26:14 2025 +0200
@@ -23,7 +23,7 @@
 kodkodi-1.5.7
 lipics-3.1.3
 llncs-2.25
-minisat-2.2.1-1
+minisat-2.2.1-2
 mlton-20241230-1
 nunchaku-0.5
 opam-2.0.7
--- a/src/Pure/Admin/component_minisat.scala	Fri Sep 12 22:42:03 2025 +0200
+++ b/src/Pure/Admin/component_minisat.scala	Sat Sep 13 14:26:14 2025 +0200
@@ -46,7 +46,7 @@
 
       /* platform */
 
-      val platform_name = Isabelle_Platform.local.ISABELLE_PLATFORM()
+      val platform_name = Isabelle_Platform.local.ISABELLE_PLATFORM(apple = true)
       val platform_dir =
         Isabelle_System.make_directory(component_dir.path + Path.basic(platform_name))
 
@@ -86,7 +86,7 @@
       /* settings */
 
       component_dir.write_settings("""
-MINISAT_HOME="$COMPONENT/$ISABELLE_PLATFORM64"
+MINISAT_HOME="$COMPONENT/${ISABELLE_APPLE_PLATFORM64:-$ISABELLE_PLATFORM64}"
 
 ISABELLE_MINISAT="$MINISAT_HOME/minisat"
 """)
--- a/src/Pure/ROOT.ML	Fri Sep 12 22:42:03 2025 +0200
+++ b/src/Pure/ROOT.ML	Sat Sep 13 14:26:14 2025 +0200
@@ -1,6 +1,6 @@
 (*  Title:      Pure/ROOT.ML
     Author:     Makarius
-    UUID:       662938be-f6dc-4b35-a648-908750fa5b7c
+    UUID:       0c987f3d-82bb-46e8-87eb-1fa283759a7d
 
 Main entry point for the Isabelle/Pure bootstrap process.
isabelle