# HG changeset patch # User wenzelm # Date 1477163402 -7200 # Node ID 3af8566788e72f967569439f7854039b0cedf596 # Parent 26bc905be09dcde1d3f167aba867dd53e4200147 remote_builds has PAR-SEQ semantics of old isatest-makedist; tuned signature; diff -r 26bc905be09d -r 3af8566788e7 src/Pure/Admin/isabelle_cronjob.scala --- a/src/Pure/Admin/isabelle_cronjob.scala Sat Oct 22 20:09:30 2016 +0200 +++ b/src/Pure/Admin/isabelle_cronjob.scala Sat Oct 22 21:10:02 2016 +0200 @@ -103,11 +103,11 @@ private val remote_builds = List( - Remote_Build("lxbroy10", options = "-m32 -B -M1x4,2,4,6 -N", args = "-g timing"), - Remote_Build("macbroy2", options = "-m32 -M4"), - Remote_Build("macbroy30", options = "-m32 -M2"), - Remote_Build("macbroy31", options = "-m32 -M2"), - Remote_Build("vmnipkow9", options = "-m32 -M4", shared_home = false)) + List(Remote_Build("lxbroy10", options = "-m32 -B -M1x4,2,4,6 -N", args = "-g timing")), + List(Remote_Build("macbroy2", options = "-m32 -M4")), + List(Remote_Build("macbroy30", options = "-m32 -M2")), + List(Remote_Build("macbroy31", options = "-m32 -M2")), + List(Remote_Build("vmnipkow9", options = "-m32 -M4", shared_home = false))) private def remote_build_history(rev: String, r: Remote_Build): Logger_Task = { @@ -246,11 +246,11 @@ /* structured tasks */ - def SEQ(tasks: Logger_Task*): Logger_Task = Logger_Task(body = _ => + def SEQ(tasks: List[Logger_Task]): Logger_Task = Logger_Task(body = _ => for (task <- tasks.iterator if !exclude_task(task.name) || task.name == "") run_now(task)) - def PAR(tasks: Logger_Task*): Logger_Task = Logger_Task(body = _ => + def PAR(tasks: List[Logger_Task]): Logger_Task = Logger_Task(body = _ => { @tailrec def join(running: List[Task]) { @@ -262,7 +262,7 @@ } val start_date = Date.now() val running = - for (task <- tasks.toList if !exclude_task(task.name)) + for (task <- tasks if !exclude_task(task.name)) yield log_service.fork_task(start_date, task) join(running) }) @@ -278,8 +278,8 @@ run(main_start_date, Logger_Task("isabelle_cronjob", _ => run_now( - SEQ(isabelle_identify, build_history_base, build_release, - PAR(remote_builds.map(remote_build_history(rev, _)):_*))))) + SEQ(List(isabelle_identify, build_history_base, build_release, + PAR(remote_builds.map(seq => SEQ(seq.map(remote_build_history(rev, _)))))))))) log_service.shutdown()