support Cygwin cold-start via Isabelle.exe, assuming layout of bundle;
authorwenzelm
Sun Apr 22 21:43:57 2012 +0200 (2012-04-22)
changeset 4767993e0dada1266
parent 47678 c04b223d661e
child 47681 d9a1b706d569
support Cygwin cold-start via Isabelle.exe, assuming layout of bundle;
Admin/launch4j/isabelle.xml
src/Pure/System/cygwin.scala
     1.1 --- a/Admin/launch4j/isabelle.xml	Sun Apr 22 19:44:40 2012 +0200
     1.2 +++ b/Admin/launch4j/isabelle.xml	Sun Apr 22 21:43:57 2012 +0200
     1.3 @@ -24,6 +24,6 @@
     1.4      <minVersion></minVersion>
     1.5      <maxVersion></maxVersion>
     1.6      <jdkPreference>jdkOnly</jdkPreference>
     1.7 -    <opt>-Disabelle.home=&quot;%EXEDIR%&quot;</opt>
     1.8 +    <opt>-Disabelle.home=&quot;%EXEDIR%&quot; -Dcygwin.root=&quot;%EXEDIR%\\contrib\\cygwin-1.7.9&quot;</opt>
     1.9    </jre>
    1.10  </launch4jConfig>
    1.11 \ No newline at end of file
     2.1 --- a/src/Pure/System/cygwin.scala	Sun Apr 22 19:44:40 2012 +0200
     2.2 +++ b/src/Pure/System/cygwin.scala	Sun Apr 22 21:43:57 2012 +0200
     2.3 @@ -94,12 +94,14 @@
     2.4    def check_root(): String =
     2.5    {
     2.6      val this_cygwin = System.getenv("THIS_CYGWIN")
     2.7 +    val cygwin_root = System.getProperty("cygwin.root")
     2.8      val root =
     2.9        if (this_cygwin != null && this_cygwin != "") this_cygwin
    2.10 +      else if (cygwin_root != null && cygwin_root != "") cygwin_root
    2.11        else
    2.12          query_registry(CYGWIN_SETUP1, "rootdir") orElse
    2.13          query_registry(CYGWIN_SETUP2, "rootdir") getOrElse
    2.14 -        error("Failed to determine Cygwin installation -- version 1.7 required")
    2.15 +        error("Failed to determine Cygwin installation -- version 1.7.x required")
    2.16      sanity_check(new File(root))
    2.17      root
    2.18    }