--- a/src/Pure/Admin/build_history.scala Sat Jan 28 20:21:55 2023 +0100
+++ b/src/Pure/Admin/build_history.scala Sat Jan 28 20:50:45 2023 +0100
@@ -103,8 +103,8 @@
afp_partition: Int = 0,
isabelle_identifier: String = default_isabelle_identifier,
ml_statistics_step: Int = 1,
- component_repository: String = Components.default_component_repository,
- components_base: String = Components.standard_components_base,
+ component_repository: String = Components.static_component_repository,
+ components_base: String = Components.dynamic_components_base,
clean_platforms: Option[List[Platform.Family.Value]] = None,
clean_archives: Boolean = false,
fresh: Boolean = false,
@@ -402,7 +402,7 @@
Command_Line.tool {
var afp = false
var multicore_base = false
- var components_base = Components.standard_components_base
+ var components_base = Components.dynamic_components_base
var heap: Option[Int] = None
var max_heap: Option[Int] = None
var multicore_list = List(default_multicore)
@@ -410,7 +410,7 @@
var clean_platforms: Option[List[Platform.Family.Value]] = None
var afp_partition = 0
var clean_archives = false
- var component_repository = Components.default_component_repository
+ var component_repository = Components.static_component_repository
var more_settings: List[String] = Nil
var more_preferences: List[String] = Nil
var fresh = false
@@ -430,7 +430,7 @@
-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.standard_components_base) + """)
+ quote(Components.dynamic_components_base) + """)
-H SIZE minimal ML heap in MB (default: """ + default_heap + """ for x86, """ +
default_heap * 2 + """ for x86_64)
-M MULTICORE multicore configurations (see below)
@@ -440,7 +440,7 @@
-P NUMBER AFP partition number (0, 1, 2, default: 0=unrestricted)
-Q clean archives of downloaded components
-R URL remote repository for Isabelle components (default: """ +
- Components.default_component_repository + """)
+ Components.static_component_repository + """)
-U SIZE maximal ML heap in MB (default: unbounded)
-e TEXT additional text for generated etc/settings
-f fresh build of Isabelle/Scala components (recommended)
--- a/src/Pure/Admin/isabelle_cronjob.scala Sat Jan 28 20:21:55 2023 +0100
+++ b/src/Pure/Admin/isabelle_cronjob.scala Sat Jan 28 20:50:45 2023 +0100
@@ -412,7 +412,7 @@
afp_rev = afp_rev.getOrElse(""),
options =
" -N " + Bash.string(task_name) + (if (i < 0) "" else "_" + (i + 1).toString) +
- " -R " + Bash.string(Components.default_component_repository) +
+ " -R " + Bash.string(Components.static_component_repository) +
" -f " + r.build_history_options,
args = "-o timeout=10800 " + r.args)
--- a/src/Pure/Admin/other_isabelle.scala Sat Jan 28 20:21:55 2023 +0100
+++ b/src/Pure/Admin/other_isabelle.scala Sat Jan 28 20:50:45 2023 +0100
@@ -75,7 +75,7 @@
/* components */
def init_components(
- components_base: String = Components.standard_components_base,
+ components_base: String = Components.dynamic_components_base,
catalogs: List[String] = Components.default_catalogs,
components: List[String] = Nil
): List[String] = {
@@ -91,7 +91,7 @@
echo: Boolean = false,
clean_platforms: Option[List[Platform.Family.Value]] = None,
clean_archives: Boolean = false,
- component_repository: String = Components.default_component_repository
+ component_repository: String = Components.static_component_repository
): Unit = {
val missing = Path.split(getenv("ISABELLE_COMPONENTS_MISSING"))
for (path <- missing) {
@@ -154,7 +154,7 @@
echo: Boolean = false,
clean_platforms: Option[List[Platform.Family.Value]] = None,
clean_archives: Boolean = false,
- component_repository: String = Components.default_component_repository
+ component_repository: String = Components.static_component_repository
): Unit = {
init_settings(other_settings)
resolve_components(
--- a/src/Pure/System/components.scala Sat Jan 28 20:21:55 2023 +0100
+++ b/src/Pure/System/components.scala Sat Jan 28 20:50:45 2023 +0100
@@ -59,11 +59,11 @@
/* component collections */
- def default_component_repository: String =
+ def static_component_repository: String =
Isabelle_System.getenv("ISABELLE_COMPONENT_REPOSITORY")
val default_components_base: Path = Path.explode("$ISABELLE_COMPONENTS_BASE")
- val standard_components_base: String = "${ISABELLE_COMPONENTS_BASE:-$USER_HOME/.isabelle/contrib}"
+ val dynamic_components_base: String = "${ISABELLE_COMPONENTS_BASE:-$USER_HOME/.isabelle/contrib}"
val default_catalogs: List[String] = List("main")
val optional_catalogs: List[String] = List("main", "optional")
@@ -125,7 +125,7 @@
copy_dir: Option[Path] = None,
clean_platforms: Option[List[Platform.Family.Value]] = None,
clean_archives: Boolean = false,
- component_repository: String = Components.default_component_repository,
+ component_repository: String = Components.static_component_repository,
ssh: SSH.System = SSH.Local,
progress: Progress = new Progress
): Unit = {