# HG changeset patch
# User wenzelm
# Date 1699454235 -3600
# Node ID 8378354bbdad5036d8d69e3326f6bbed73d12f7c
# Parent  30e0c15a71f7db41904455ed3528e2b8498082e9
avoid option -C: free this latter for build-related configuration;

diff -r 30e0c15a71f7 -r 8378354bbdad src/Pure/Admin/build_history.scala
--- a/src/Pure/Admin/build_history.scala	Wed Nov 08 15:10:19 2023 +0100
+++ b/src/Pure/Admin/build_history.scala	Wed Nov 08 15:37:15 2023 +0100
@@ -405,7 +405,6 @@
     Command_Line.tool {
       var afp = false
       var multicore_base = false
-      var components_base = Components.dynamic_components_base
       var heap: Option[Int] = None
       var max_heap: Option[Int] = None
       var multicore_list = List(default_multicore)
@@ -413,6 +412,7 @@
       var clean_platforms: Option[List[Platform.Family]] = None
       var clean_archives = false
       var component_repository = Components.static_component_repository
+      var components_base = Components.dynamic_components_base
       var arch_apple = false
       var more_settings: List[String] = Nil
       var more_preferences: List[String] = Nil
@@ -431,8 +431,6 @@
   Options are:
     -A           include $ISABELLE_HOME/AFP directory
     -B           first multicore build serves as base for scheduling information
-    -C DIR       base directory for Isabelle components (default: """ +
-      quote(Components.dynamic_components_base) + """)
     -H SIZE      minimal ML heap in MB (default: """ + default_heap + """ for 32bit, """ +
       default_heap * 2 + """ for 64bit)
     -M MULTICORE multicore configurations (see below)
@@ -442,6 +440,8 @@
     -Q           clean archives of downloaded components
     -R URL       remote repository for Isabelle components (default: """ +
       Components.static_component_repository + """)
+    -S DIR       base directory for Isabelle components (default: """ +
+      quote(Components.dynamic_components_base) + """)
     -U SIZE      maximal ML heap in MB (default: unbounded)
     -a           processor architecture is Apple Silicon (ARM64)
     -e TEXT      additional text for generated etc/settings
@@ -465,13 +465,13 @@
 """,
         "A" -> (_ => afp = true),
         "B" -> (_ => multicore_base = true),
-        "C:" -> (arg => components_base = arg),
         "H:" -> (arg => heap = Some(Value.Int.parse(arg))),
         "M:" -> (arg => multicore_list = space_explode(',', arg).map(Multicore.parse)),
         "N:" -> (arg => isabelle_identifier = arg),
         "O:" -> (arg => clean_platforms = Some(space_explode(',',arg).map(Platform.Family.parse))),
         "Q" -> (_ => clean_archives = true),
         "R:" -> (arg => component_repository = arg),
+        "S:" -> (arg => components_base = arg),
         "U:" -> (arg => max_heap = Some(Value.Int.parse(arg))),
         "a" -> (_ => arch_apple = true),
         "e:" -> (arg => more_settings = more_settings ::: List(arg)),
@@ -587,7 +587,7 @@
           val script =
             ssh.bash_path(Path.explode("Admin/build_other")) +
               " -R " + Bash.string(component_repository) +
-              " -C " + Bash.string(components_base) +
+              " -S " + Bash.string(components_base) +
               (clean_platforms match {
                 case Some(ps) => " -O " + Bash.string(ps.mkString(","))
                 case None => ""
diff -r 30e0c15a71f7 -r 8378354bbdad src/Pure/Admin/isabelle_cronjob.scala
--- a/src/Pure/Admin/isabelle_cronjob.scala	Wed Nov 08 15:10:19 2023 +0100
+++ b/src/Pure/Admin/isabelle_cronjob.scala	Wed Nov 08 15:37:15 2023 +0100
@@ -386,7 +386,7 @@
         Remote_Build("Windows", "vmnipkow9", history = 90,
           components_base = "/cygdrive/d/isatest/contrib",
           options = "-m64 -M4" +
-            " -C /cygdrive/d/isatest/contrib" +
+            " -S /cygdrive/d/isatest/contrib" +
             " -e ISABELLE_OCAML=ocaml -e ISABELLE_OCAMLC=ocamlc -e ISABELLE_OCAML_SETUP=true" +
             " -e ISABELLE_GHC_SETUP=true" +
             " -e ISABELLE_SMLNJ=/usr/local/smlnj-110.81/bin/sml",