merged
authorwenzelm
Fri, 07 May 2021 13:37:48 +0200
changeset 73900 0da9e824255f
parent 73896 f4778e08dcd7 (current diff)
parent 73899 9b4579e5bced (diff)
child 73901 dea7f6a2485e
merged
--- a/Admin/components/components.sha1	Fri May 07 12:43:03 2021 +0200
+++ b/Admin/components/components.sha1	Fri May 07 13:37:48 2021 +0200
@@ -284,6 +284,7 @@
 9043828803483ca14df64488dff014ad050a6d34  polyml-5.8.1-20200228.tar.gz
 1186607e2c43b77db86731f12fbedb531ca50a21  polyml-5.8.1-20200708.tar.gz
 22ae16bf7850e73b903d2ca8eb506da05b441cf3  polyml-5.8.1.tar.gz
+cb8e85387315f62dcfc6b21ec378186e58068f76  polyml-5.8.2.tar.gz
 d1fd6eced69dc1df7226432fcb824568e0994ff2  polyml-5.8.tar.gz
 49f1adfacdd6d29fa9f72035d94a31eaac411a97  polyml-test-0a6ebca445fc.tar.gz
 2a8c4421e0a03c0d6ad556b3c36c34eb11568adb  polyml-test-1236652ebd55.tar.gz
--- a/Admin/components/main	Fri May 07 12:43:03 2021 +0200
+++ b/Admin/components/main	Fri May 07 13:37:48 2021 +0200
@@ -14,7 +14,7 @@
 kodkodi-1.5.6-1
 nunchaku-0.5
 opam-2.0.7
-polyml-test-f86ae3dc1686
+polyml-5.8.2
 postgresql-42.2.18
 scala-2.13.5
 smbc-0.4.1
--- a/Admin/etc/options	Fri May 07 12:43:03 2021 +0200
+++ b/Admin/etc/options	Fri May 07 13:37:48 2021 +0200
@@ -12,6 +12,9 @@
   -- "unpacked components for remote build services"
 
 
+option build_host_linux_arm : string = ""
+  -- "SSH user@host for remote build of heaps"
+
 option build_host_linux : string = ""
   -- "SSH user@host for remote build of heaps"
 
--- a/Admin/polyml/README	Fri May 07 12:43:03 2021 +0200
+++ b/Admin/polyml/README	Fri May 07 13:37:48 2021 +0200
@@ -1,9 +1,10 @@
 Poly/ML for Isabelle
 ====================
 
-This compilation of Poly/ML (http://www.polyml.org) is based on the
-repository version
-https://github.com/polyml/polyml/commit/f86ae3dc1686
+This compilation of Poly/ML (https://www.polyml.org) is based on the
+source distribution from
+https://github.com/polyml/polyml/commits/fixes-5.8.2 up to commit
+e6a463e1614f.
 
 The Isabelle repository provides an administrative tool "isabelle
 build_polyml", which can be used in the polyml component directory as
@@ -48,4 +49,4 @@
 
 
         Makarius
-        19-Nov-2020
+        07-May-2021
--- a/src/Pure/Admin/build_release.scala	Fri May 07 12:43:03 2021 +0200
+++ b/src/Pure/Admin/build_release.scala	Fri May 07 13:37:48 2021 +0200
@@ -487,11 +487,13 @@
     }
   }
 
+  def default_platform_families: List[Platform.Family.Value] = Platform.Family.list0
+
   def build_release(
     options: Options,
     context: Release_Context,
     afp_rev: String = "",
-    platform_families: List[Platform.Family.Value] = Platform.Family.list,
+    platform_families: List[Platform.Family.Value] = default_platform_families,
     more_components: List[Path] = Nil,
     website: Option[Path] = None,
     build_sessions: List[String] = Nil,
@@ -855,7 +857,7 @@
       var parallel_jobs = 1
       var build_library = false
       var options = Options.init()
-      var platform_families = Platform.Family.list
+      var platform_families = default_platform_families
       var rev = ""
 
       val getopts = Getopts("""
@@ -874,7 +876,7 @@
     -j INT       maximum number of parallel jobs (default 1)
     -l           build library
     -o OPTION    override Isabelle system OPTION (via NAME=VAL or NAME)
-    -p NAMES     platform families (default: """ + Platform.Family.list.mkString(",") + """)
+    -p NAMES     platform families (default: """ + default_platform_families.mkString(",") + """)
     -r REV       Mercurial changeset id (default: ARCHIVE or RELEASE or tip)
 
   Build Isabelle release in base directory, using the local repository clone.
--- a/src/Pure/System/platform.scala	Fri May 07 12:43:03 2021 +0200
+++ b/src/Pure/System/platform.scala	Fri May 07 13:37:48 2021 +0200
@@ -28,6 +28,7 @@
   object Family extends Enumeration
   {
     val linux_arm, linux, macos, windows = Value
+    val list0: List[Value] = List(linux, windows, macos)
     val list: List[Value] = List(linux_arm, linux, windows, macos)
 
     def unapply(name: String): Option[Value] =