# HG changeset patch # User wenzelm # Date 1674938406 -3600 # Node ID 53ce5a39c987a251b90d2ebeb1c0c0682fa04aa3 # Parent c8d34e74a12b3e0ccfc4c4f7d0d529cef160b987 more uniform components context for the managing "self_isabelle" and the managed "other_isabelle"; diff -r c8d34e74a12b -r 53ce5a39c987 src/Pure/Admin/build_history.scala --- a/src/Pure/Admin/build_history.scala Sat Jan 28 21:32:33 2023 +0100 +++ b/src/Pure/Admin/build_history.scala Sat Jan 28 21:40:06 2023 +0100 @@ -530,6 +530,8 @@ isabelle_self: Path, isabelle_other: Path, isabelle_identifier: String = "remote_build_history", + component_repository: String = Components.static_component_repository, + components_base: String = Components.dynamic_components_base, clean_platform: Boolean = false, clean_archives: Boolean = false, progress: Progress = new Progress, @@ -560,7 +562,13 @@ Other_Isabelle(isabelle_self, isabelle_identifier = isabelle_identifier, ssh = ssh, progress = progress) - self_isabelle.init(fresh = true, echo = true) + val clean_platforms = if (clean_platform) Some(List(ssh.isabelle_platform_family)) else None + + self_isabelle.init(fresh = true, echo = true, + component_repository = component_repository, + other_settings = self_isabelle.init_components(components_base = components_base), + clean_platforms = clean_platforms, + clean_archives = clean_archives) sync(isabelle_other, accurate = true, rev = proper_string(rev) getOrElse "tip", @@ -578,9 +586,12 @@ try { val script = ssh.bash_path(Path.explode("Admin/build_other")) + - (if (clean_platform) - " -O " + Bash.string(ssh.isabelle_platform.ISABELLE_PLATFORM_FAMILY) - else "") + + " -R " + Bash.string(component_repository) + + " -C " + Bash.string(components_base) + + (clean_platforms match { + case Some(ps) => " -O " + Bash.string(ps.mkString(",")) + case None => "" + }) + (if (clean_archives) " -Q" else "") + " -o " + ssh.bash_path(output_file) + build_options + " " + ssh.bash_path(isabelle_other) + " " + args diff -r c8d34e74a12b -r 53ce5a39c987 src/Pure/Admin/isabelle_cronjob.scala --- a/src/Pure/Admin/isabelle_cronjob.scala Sat Jan 28 21:32:33 2023 +0100 +++ b/src/Pure/Admin/isabelle_cronjob.scala Sat Jan 28 21:40:06 2023 +0100 @@ -140,6 +140,7 @@ historic: Boolean = false, history: Int = 0, history_base: String = "build_history_base", + components_base: String = Components.dynamic_components_base, clean_components: Boolean = false, java_heap: String = "", options: String = "", @@ -350,8 +351,8 @@ args = "-a -d '~~/src/Benchmarks'")), List( Remote_Build("Windows", "vmnipkow9", historic = true, history = 90, + components_base = "/cygdrive/d/isatest/contrib", options = "-m32 -M4" + - " -C /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", @@ -360,6 +361,7 @@ Build_Log.Settings.ML_PLATFORM.toString + " = " + SQL.string("x86-windows") + " OR " + Build_Log.Settings.ML_PLATFORM + " = " + SQL.string("x86_64_32-windows")), Remote_Build("Windows", "vmnipkow9", historic = true, history = 90, + components_base = "/cygdrive/d/isatest/contrib", options = "-m64 -M4" + " -C /cygdrive/d/isatest/contrib" + " -e ISABELLE_OCAML=ocaml -e ISABELLE_OCAMLC=ocamlc -e ISABELLE_OCAML_SETUP=true" + @@ -405,6 +407,7 @@ isabelle_repos, isabelle_repos.ext(r.host), isabelle_identifier = "cronjob_build_history", + components_base = r.components_base, clean_platform = r.clean_components, clean_archives = r.clean_components, rev = rev, @@ -412,7 +415,6 @@ afp_rev = afp_rev.getOrElse(""), options = " -N " + Bash.string(task_name) + (if (i < 0) "" else "_" + (i + 1).toString) + - " -R " + Bash.string(Components.static_component_repository) + " -f " + r.build_history_options, args = "-o timeout=10800 " + r.args)