# HG changeset patch # User wenzelm # Date 1455376769 -3600 # Node ID 98df25a6e2ac725f0e11b074fffde443d737baaa # Parent 658276428cfc6d08a4388e8c5fe7031ad879697e tuned signature; diff -r 658276428cfc -r 98df25a6e2ac src/Pure/System/cygwin.scala --- a/src/Pure/System/cygwin.scala Sat Feb 13 12:39:00 2016 +0100 +++ b/src/Pure/System/cygwin.scala Sat Feb 13 16:19:29 2016 +0100 @@ -25,7 +25,7 @@ { val cwd = new JFile(isabelle_root) val env = Map("CYGWIN" -> "nodosfilewarning") - val proc = Isabelle_System.raw_execute(cwd, env, true, args: _*) + val proc = Isabelle_System.process(cwd, env, true, args: _*) val (output, rc) = Isabelle_System.process_output(proc) if (rc != 0) error(output) } diff -r 658276428cfc -r 98df25a6e2ac src/Pure/System/isabelle_system.scala --- a/src/Pure/System/isabelle_system.scala Sat Feb 13 12:39:00 2016 +0100 +++ b/src/Pure/System/isabelle_system.scala Sat Feb 13 16:19:29 2016 +0100 @@ -112,7 +112,7 @@ List(isabelle_root1 + JFile.separator + "bin" + JFile.separator + "isabelle", "getenv", "-d", dump.toString) - val (output, rc) = process_output(raw_execute(null, env, true, (cmd1 ::: cmd2): _*)) + val (output, rc) = process_output(process(null, env, true, (cmd1 ::: cmd2): _*)) if (rc != 0) error(output) val entries = @@ -175,9 +175,9 @@ /** external processes **/ - /* raw execute for bootstrapping */ + /* raw process */ - def raw_execute(cwd: JFile, env: Map[String, String], redirect: Boolean, args: String*): Process = + def process(cwd: JFile, env: Map[String, String], redirect: Boolean, args: String*): Process = { val cmdline = new java.util.LinkedList[String] for (s <- args) cmdline.add(s) @@ -217,7 +217,7 @@ if (Platform.is_windows) List(cygwin_root() + "\\bin\\env.exe") ::: args.toList else args val env1 = if (env == null) settings else settings ++ env - raw_execute(cwd, env1, redirect, cmdline: _*) + process(cwd, env1, redirect, cmdline: _*) } def execute(redirect: Boolean, args: String*): Process = @@ -297,7 +297,7 @@ if (Platform.is_windows) List(cygwin_root() + "\\bin\\bash.exe") else List("/usr/bin/env", "bash") val cmdline = bash ::: List("-c", "kill -" + signal + " -" + group_pid) - process_output(raw_execute(null, null, true, cmdline: _*)) + process_output(process(null, null, true, cmdline: _*)) }