# HG changeset patch
# User wenzelm
# Date 1335124052 -7200
# Node ID d9a1b706d5698f601a702d75e159673e06481f25
# Parent  49aa3686e566a8c034251dcf75b660dfd072aa2b# Parent  93e0dada12662fe40164ec4ee0e4f4775260e2ed
merged

diff -r 49aa3686e566 -r d9a1b706d569 Admin/launch4j/isabelle.xml
--- a/Admin/launch4j/isabelle.xml	Sun Apr 22 20:16:30 2012 +0200
+++ b/Admin/launch4j/isabelle.xml	Sun Apr 22 21:47:32 2012 +0200
@@ -24,6 +24,6 @@
     <minVersion></minVersion>
     <maxVersion></maxVersion>
     <jdkPreference>jdkOnly</jdkPreference>
-    <opt>-Disabelle.home=&quot;%EXEDIR%&quot;</opt>
+    <opt>-Disabelle.home=&quot;%EXEDIR%&quot; -Dcygwin.root=&quot;%EXEDIR%\\contrib\\cygwin-1.7.9&quot;</opt>
   </jre>
 </launch4jConfig>
\ No newline at end of file
diff -r 49aa3686e566 -r d9a1b706d569 src/Pure/System/cygwin.scala
--- a/src/Pure/System/cygwin.scala	Sun Apr 22 20:16:30 2012 +0200
+++ b/src/Pure/System/cygwin.scala	Sun Apr 22 21:47:32 2012 +0200
@@ -94,12 +94,14 @@
   def check_root(): String =
   {
     val this_cygwin = System.getenv("THIS_CYGWIN")
+    val cygwin_root = System.getProperty("cygwin.root")
     val root =
       if (this_cygwin != null && this_cygwin != "") this_cygwin
+      else if (cygwin_root != null && cygwin_root != "") cygwin_root
       else
         query_registry(CYGWIN_SETUP1, "rootdir") orElse
         query_registry(CYGWIN_SETUP2, "rootdir") getOrElse
-        error("Failed to determine Cygwin installation -- version 1.7 required")
+        error("Failed to determine Cygwin installation -- version 1.7.x required")
     sanity_check(new File(root))
     root
   }