--- a/src/Pure/Admin/build_history.scala Mon Jan 23 15:43:09 2023 +0100
+++ b/src/Pure/Admin/build_history.scala Mon Jan 23 16:15:45 2023 +0100
@@ -191,7 +191,7 @@
other_isabelle.init_components(
component_repository = component_repository,
components_base = components_base,
- catalogs = List("main", "optional"))
+ catalogs = Components.optional_catalogs)
other_isabelle.init_settings(component_settings ::: init_settings)
other_isabelle.resolve_components(echo = verbose)
val ml_platform =
--- a/src/Pure/Admin/build_release.scala Mon Jan 23 15:43:09 2023 +0100
+++ b/src/Pure/Admin/build_release.scala Mon Jan 23 16:15:45 2023 +0100
@@ -467,8 +467,7 @@
val other_isabelle = context.other_isabelle(context.dist_dir)
other_isabelle.init_settings(
- other_isabelle.init_components(
- components_base = context.components_base, catalogs = List("main")))
+ other_isabelle.init_components(components_base = context.components_base))
other_isabelle.resolve_components(echo = true)
try {
--- a/src/Pure/Admin/other_isabelle.scala Mon Jan 23 15:43:09 2023 +0100
+++ b/src/Pure/Admin/other_isabelle.scala Mon Jan 23 16:15:45 2023 +0100
@@ -68,7 +68,7 @@
def init_components(
component_repository: String = Components.default_component_repository,
components_base: Path = Components.default_components_base,
- catalogs: List[String] = Nil,
+ catalogs: List[String] = Components.default_catalogs,
components: List[String] = Nil
): List[String] = {
val dir = Components.admin(isabelle_home)
--- a/src/Pure/System/components.scala Mon Jan 23 15:43:09 2023 +0100
+++ b/src/Pure/System/components.scala Mon Jan 23 16:15:45 2023 +0100
@@ -40,6 +40,9 @@
val default_components_base: Path = Path.explode("$ISABELLE_COMPONENTS_BASE")
+ val default_catalogs: List[String] = List("main")
+ val optional_catalogs: List[String] = List("main", "optional")
+
def admin(dir: Path): Path = dir + Path.explode("Admin/components")
def contrib(dir: Path = Path.current, name: String = ""): Path =