clarified signature;
authorwenzelm
Tue, 31 Oct 2023 17:24:19 +0100
changeset 78871 3b21101c5b6b
parent 78870 674362fd8c96
child 78872 711acefe97a3
clarified signature;
src/Pure/Admin/isabelle_cronjob.scala
src/Pure/Admin/isabelle_devel.scala
--- a/src/Pure/Admin/isabelle_cronjob.scala	Tue Oct 31 17:01:19 2023 +0100
+++ b/src/Pure/Admin/isabelle_cronjob.scala	Tue Oct 31 17:24:19 2023 +0100
@@ -57,8 +57,9 @@
             """ -a --include="*/" --include="plain_identify*" --exclude="*" """ +
             Bash.string(backup + "/log/.") + " " + File.bash_path(main_dir) + "/log/.").check
 
-        if (!Isabelle_Devel.cronjob_log.is_file) {
-          Files.createSymbolicLink(Isabelle_Devel.cronjob_log.java_path, current_log.java_path)
+        val cronjob_log = Isabelle_Devel.isabelle_devel + Path.basic("cronjob-main.log")
+        if (!cronjob_log.is_file) {
+          Files.createSymbolicLink(cronjob_log.java_path, current_log.java_path)
         }
       })
 
@@ -617,7 +618,7 @@
                   logger =>
                     Build_Log.build_log_database(logger.options, build_log_dirs,
                       vacuum = true, ml_statistics = true,
-                      snapshot = Some(Isabelle_Devel.build_log_snapshot))))),
+                      snapshot = Some(Isabelle_Devel.isabelle_devel + Path.explode("build_log.db")))))),
             PAR(
               List(remote_builds1, remote_builds2).map(remote_builds =>
                 SEQUENTIAL(
--- a/src/Pure/Admin/isabelle_devel.scala	Tue Oct 31 17:01:19 2023 +0100
+++ b/src/Pure/Admin/isabelle_devel.scala	Tue Oct 31 17:24:19 2023 +0100
@@ -8,14 +8,7 @@
 
 
 object Isabelle_Devel {
-  val RELEASE_SNAPSHOT = "release_snapshot"
-  val BUILD_LOG_DB = "build_log.db"
-  val BUILD_STATUS = "build_status"
-  val CRONJOB_LOG = "cronjob-main.log"
-
-  val root: Path = Path.explode("~/html-data/devel")
-  val cronjob_log: Path = root + Path.basic(CRONJOB_LOG)
-  val build_log_snapshot: Path = root + Path.explode(BUILD_LOG_DB)
+  val isabelle_devel: Path = Path.explode("~/html-data/devel")
 
 
   /* index */
@@ -23,7 +16,7 @@
   def make_index(): Unit = {
     val redirect = "https://isabelle-dev.sketis.net/home/menu/view/20"
 
-    HTML.write_document(root, "index.html",
+    HTML.write_document(isabelle_devel, "index.html",
       List(
         XML.Elem(Markup("meta",
           List("http-equiv" -> "Refresh", "content" -> ("0; url=" + redirect))), Nil)),
@@ -37,7 +30,7 @@
     progress: Progress = new Progress
   ): Unit = {
     Isabelle_System.with_tmp_dir("isadist") { target_dir =>
-      Isabelle_System.update_directory(root + Path.explode(RELEASE_SNAPSHOT),
+      Isabelle_System.update_directory(isabelle_devel + Path.explode("release_snapshot"),
         { website_dir =>
           val context = Build_Release.Release_Context(target_dir, progress = progress)
           Build_Release.build_release_archive(context, rev)
@@ -53,7 +46,7 @@
   /* present build status */
 
   def build_status(options: Options): Unit = {
-    Isabelle_System.update_directory(root + Path.explode(BUILD_STATUS),
+    Isabelle_System.update_directory(isabelle_devel + Path.explode("build_status"),
       dir => Build_Status.build_status(options, target_dir = dir, ml_statistics = true))
   }
 }