tuned;
authorwenzelm
Thu, 28 Mar 2024 11:35:39 +0100
changeset 80049 b525f783b784
parent 80048 a213dd3c0b29
child 80050 7d8a24c5559d
tuned;
src/Pure/Admin/component_bash_process.scala
src/Pure/Admin/component_csdp.scala
src/Pure/Admin/component_e.scala
src/Pure/Admin/component_minisat.scala
src/Pure/Admin/component_rsync.scala
src/Pure/Admin/component_spass.scala
src/Pure/Admin/component_vampire.scala
src/Pure/Admin/component_verit.scala
src/Pure/Admin/component_zipperposition.scala
--- a/src/Pure/Admin/component_bash_process.scala	Thu Mar 28 11:29:25 2024 +0100
+++ b/src/Pure/Admin/component_bash_process.scala	Thu Mar 28 11:35:39 2024 +0100
@@ -29,11 +29,7 @@
 
     /* platform */
 
-    val platform_name =
-      proper_string(Isabelle_System.getenv("ISABELLE_APPLE_PLATFORM64")) orElse
-      proper_string(Isabelle_System.getenv("ISABELLE_PLATFORM64")) getOrElse
-      error("Missing ISABELLE_PLATFORM64")
-
+    val platform_name = Isabelle_Platform.self.ISABELLE_PLATFORM(apple = true)
     val platform_dir =
       Isabelle_System.make_directory(component_dir.path + Path.basic(platform_name))
 
--- a/src/Pure/Admin/component_csdp.scala	Thu Mar 28 11:29:25 2024 +0100
+++ b/src/Pure/Admin/component_csdp.scala	Thu Mar 28 11:35:39 2024 +0100
@@ -80,11 +80,7 @@
 
       /* platform */
 
-      val platform_name =
-        proper_string(Isabelle_System.getenv("ISABELLE_WINDOWS_PLATFORM64")) orElse
-        proper_string(Isabelle_System.getenv("ISABELLE_PLATFORM64")) getOrElse
-        error("Missing ISABELLE_PLATFORM64")
-
+      val platform_name = Isabelle_Platform.self.ISABELLE_PLATFORM(windows = true)
       val platform_dir =
         Isabelle_System.make_directory(component_dir.path + Path.basic(platform_name))
 
--- a/src/Pure/Admin/component_e.scala	Thu Mar 28 11:29:25 2024 +0100
+++ b/src/Pure/Admin/component_e.scala	Thu Mar 28 11:35:39 2024 +0100
@@ -26,10 +26,7 @@
       val component_dir =
         Components.Directory(target_dir + Path.basic(component_name)).create(progress = progress)
 
-      val platform_name =
-        proper_string(Isabelle_System.getenv("ISABELLE_APPLE_PLATFORM64")) orElse
-        proper_string(Isabelle_System.getenv("ISABELLE_PLATFORM64")) getOrElse error("Bad platform")
-
+      val platform_name = Isabelle_Platform.self.ISABELLE_PLATFORM(apple = true)
       val platform_dir =
         Isabelle_System.make_directory(component_dir.path + Path.basic(platform_name))
 
--- a/src/Pure/Admin/component_minisat.scala	Thu Mar 28 11:29:25 2024 +0100
+++ b/src/Pure/Admin/component_minisat.scala	Thu Mar 28 11:35:39 2024 +0100
@@ -46,10 +46,7 @@
 
       /* platform */
 
-      val platform_name =
-        proper_string(Isabelle_System.getenv("ISABELLE_PLATFORM64")) getOrElse
-          error("Missing ISABELLE_PLATFORM64")
-
+      val platform_name = Isabelle_Platform.self.ISABELLE_PLATFORM()
       val platform_dir =
         Isabelle_System.make_directory(component_dir.path + Path.basic(platform_name))
 
--- a/src/Pure/Admin/component_rsync.scala	Thu Mar 28 11:29:25 2024 +0100
+++ b/src/Pure/Admin/component_rsync.scala	Thu Mar 28 11:35:39 2024 +0100
@@ -48,10 +48,7 @@
       val component_dir =
         Components.Directory(target_dir + Path.basic(component_name)).create(progress = progress)
 
-      val platform_name =
-        proper_string(Isabelle_System.getenv("ISABELLE_PLATFORM64"))
-          .getOrElse(error("Missing ISABELLE_PLATFORM64"))
-
+      val platform_name = Isabelle_Platform.self.ISABELLE_PLATFORM()
       val platform_dir =
         Isabelle_System.make_directory(component_dir.path + Path.basic("platform_" + platform_name))
 
--- a/src/Pure/Admin/component_spass.scala	Thu Mar 28 11:29:25 2024 +0100
+++ b/src/Pure/Admin/component_spass.scala	Thu Mar 28 11:35:39 2024 +0100
@@ -54,10 +54,7 @@
       val component_dir =
         Components.Directory(target_dir + Path.basic(component_name)).create(progress = progress)
 
-      val platform_name =
-        proper_string(Isabelle_System.getenv("ISABELLE_PLATFORM64"))
-          .getOrElse(error("Missing ISABELLE_PLATFORM64"))
-
+      val platform_name = Isabelle_Platform.self.ISABELLE_PLATFORM()
       val platform_dir =
         Isabelle_System.make_directory(component_dir.path + Path.basic(platform_name))
 
--- a/src/Pure/Admin/component_vampire.scala	Thu Mar 28 11:29:25 2024 +0100
+++ b/src/Pure/Admin/component_vampire.scala	Thu Mar 28 11:35:39 2024 +0100
@@ -48,10 +48,7 @@
 
       /* platform */
 
-      val platform_name =
-        proper_string(Isabelle_System.getenv("ISABELLE_PLATFORM64")) getOrElse
-          error("Missing ISABELLE_PLATFORM64")
-
+      val platform_name = Isabelle_Platform.self.ISABELLE_PLATFORM()
       val platform_dir =
         Isabelle_System.make_directory(component_dir.path + Path.basic(platform_name))
 
--- a/src/Pure/Admin/component_verit.scala	Thu Mar 28 11:29:25 2024 +0100
+++ b/src/Pure/Admin/component_verit.scala	Thu Mar 28 11:35:39 2024 +0100
@@ -46,11 +46,7 @@
 
       /* platform */
 
-      val platform_name =
-        proper_string(Isabelle_System.getenv("ISABELLE_WINDOWS_PLATFORM64")) orElse
-        proper_string(Isabelle_System.getenv("ISABELLE_PLATFORM64")) getOrElse
-        error("Missing ISABELLE_PLATFORM64")
-
+      val platform_name = Isabelle_Platform.self.ISABELLE_PLATFORM(windows = true)
       val platform_dir =
         Isabelle_System.make_directory(component_dir.path + Path.basic(platform_name))
 
--- a/src/Pure/Admin/component_zipperposition.scala	Thu Mar 28 11:29:25 2024 +0100
+++ b/src/Pure/Admin/component_zipperposition.scala	Thu Mar 28 11:35:39 2024 +0100
@@ -31,10 +31,7 @@
 
       /* platform */
 
-      val platform_name =
-        proper_string(Isabelle_System.getenv("ISABELLE_PLATFORM64")) getOrElse
-        error("Missing ISABELLE_PLATFORM64")
-
+      val platform_name = Isabelle_Platform.self.ISABELLE_PLATFORM()
       val platform_dir =
         Isabelle_System.make_directory(component_dir.path + Path.basic(platform_name))