merged
authorwenzelm
Wed, 26 Oct 2022 21:59:16 +0200
changeset 76380 cb26f923230d
parent 76377 2510e6f7b11c (current diff)
parent 76379 e0f3fda92990 (diff)
child 76382 6ed0dc2ae670
merged
--- a/Admin/Release/CHECKLIST	Wed Oct 26 18:08:44 2022 +0100
+++ b/Admin/Release/CHECKLIST	Wed Oct 26 21:59:16 2022 +0200
@@ -72,14 +72,17 @@
 
 - regular packaging:
 
+  #source archive
+  Admin/build_release -D ~/tmp/isadist -b HOL -R Isabelle2022 -p ""
+
   #on fast Linux machine, with access to Linux + Windows build_host
-  Admin/build_release -D ~/tmp/isadist -b HOL -R Isabelle2022 -c .../naproche-20221024.tar.gz -p linux,windows -l
+  Admin/build_release -D ~/tmp/isadist -b HOL -R Isabelle2022 -p linux,windows -l
 
   #with access Apple ARM build_host
-  Admin/build_release -D ~/tmp/isadist -b HOL -R Isabelle2022 -c .../naproche-20221024.tar.gz -p macos
+  Admin/build_release -D ~/tmp/isadist -b HOL -R Isabelle2022 -p macos
 
   #with access Linux ARM build_host
-  Admin/build_release -D ~/tmp/isadist -b HOL -R Isabelle2022 -c .../naproche-20221024.tar.gz -p linux_arm
+  Admin/build_release -D ~/tmp/isadist -b HOL -R Isabelle2022 -p linux_arm
 
 - Docker image:
 
--- a/Admin/components/bundled	Wed Oct 26 18:08:44 2022 +0100
+++ b/Admin/components/bundled	Wed Oct 26 21:59:16 2022 +0200
@@ -1,2 +1,2 @@
 #additional components to be bundled for release
-
+naproche-20221024
--- a/src/Pure/Admin/build_release.scala	Wed Oct 26 18:08:44 2022 +0100
+++ b/src/Pure/Admin/build_release.scala	Wed Oct 26 21:59:16 2022 +0200
@@ -244,13 +244,17 @@
 
           val build_command =
             "bin/isabelle build -o system_heaps -b -- " + Bash.strings(build_sessions)
+          def system_apple(b: Boolean): String =
+            """{ echo "ML_system_apple = """ + b + """" > "$(bin/isabelle getenv -b ISABELLE_HOME_USER)/etc/preferences"; }"""
+
           val build_script =
             List(
               "cd " + File.bash_path(remote_dir),
               "tar -xf tmp.tar",
+              """mkdir -p "$(bin/isabelle getenv -b ISABELLE_HOME_USER)/etc" """,
+              system_apple(false),
               build_command,
-              """mkdir -p "$(bin/isabelle getenv -b ISABELLE_HOME_USER)/etc" """,
-              """{ echo "ML_system_apple = false" > "$(bin/isabelle getenv -b ISABELLE_HOME_USER)/etc/preferences"; }""",
+              system_apple(true),
               build_command,
               "tar -cf tmp.tar heaps")
           ssh.execute(build_script.mkString(" && "), settings = false).check