# HG changeset patch
# User wenzelm
# Date 1503947927 -7200
# Node ID d9641709f2df631a2d807144e3444a4d144bb8a5
# Parent  65c3c8fc83e4a7b9519dca1447c58824a3560579# Parent  a3a847c4fbdbe4e6f7950d41dce5086c6ecf3112
merged

diff -r 65c3c8fc83e4 -r d9641709f2df Admin/PLATFORMS
--- a/Admin/PLATFORMS	Mon Aug 28 18:27:21 2017 +0200
+++ b/Admin/PLATFORMS	Mon Aug 28 21:18:47 2017 +0200
@@ -40,7 +40,7 @@
 
   x86-windows       Windows 7
   x86_64-windows    Windows 7
-  x86-cygwin        Cygwin 2.6 http://isabelle.in.tum.de/cygwin_2016-1 (x86/release)
+  x86-cygwin        Cygwin 2.8 http://isabelle.in.tum.de/cygwin_2017 (x86/release)
 
 All of the above platforms are 100% supported by Isabelle -- end-users
 should not have to care about the differences (at least in theory).
diff -r 65c3c8fc83e4 -r d9641709f2df Admin/Windows/Cygwin/Cygwin-Setup.bat
--- a/Admin/Windows/Cygwin/Cygwin-Setup.bat	Mon Aug 28 18:27:21 2017 +0200
+++ b/Admin/Windows/Cygwin/Cygwin-Setup.bat	Mon Aug 28 21:18:47 2017 +0200
@@ -1,3 +1,3 @@
 @echo off
 
-"%CD%\contrib\cygwin\isabelle\cygwin" --site http://isabelle.in.tum.de/cygwin_2016-1 --no-verify --only-site --local-package-dir "%TEMP%" --root "%CD%\contrib\cygwin"
+"%CD%\contrib\cygwin\isabelle\cygwin" --site http://isabelle.in.tum.de/cygwin_2017 --no-verify --only-site --local-package-dir "%TEMP%" --root "%CD%\contrib\cygwin"
diff -r 65c3c8fc83e4 -r d9641709f2df Admin/Windows/Cygwin/README
--- a/Admin/Windows/Cygwin/README	Mon Aug 28 18:27:21 2017 +0200
+++ b/Admin/Windows/Cygwin/README	Mon Aug 28 21:18:47 2017 +0200
@@ -14,6 +14,7 @@
   http://isabelle.in.tum.de/cygwin_2015  (Isabelle2015)
   http://isabelle.in.tum.de/cygwin_2016  (Isabelle2016)
   http://isabelle.in.tum.de/cygwin_2016-1  (Isabelle2016-1)
+  http://isabelle.in.tum.de/cygwin_2017  (Isabelle2017)
 
 * Quasi-component: "isabelle build_cygwin" (as Administrator)
 
diff -r 65c3c8fc83e4 -r d9641709f2df Admin/components/bundled-windows
--- a/Admin/components/bundled-windows	Mon Aug 28 18:27:21 2017 +0200
+++ b/Admin/components/bundled-windows	Mon Aug 28 21:18:47 2017 +0200
@@ -1,3 +1,3 @@
 #additional components to be bundled for release
-cygwin-20161024
+cygwin-20170828
 windows_app-20150821
diff -r 65c3c8fc83e4 -r d9641709f2df Admin/components/components.sha1
--- a/Admin/components/components.sha1	Mon Aug 28 18:27:21 2017 +0200
+++ b/Admin/components/components.sha1	Mon Aug 28 21:18:47 2017 +0200
@@ -30,6 +30,7 @@
 44f3a530f727e43a9413226c2423c9ca3e4c0cf5  cygwin-20161002.tar.gz
 dd56dd16d861fc6e1a008bf5e9da6f33ed6eb820  cygwin-20161022.tar.gz
 d9ad7aae99d54e3b9813151712eb88a441613f04  cygwin-20161024.tar.gz
+f8eb6a0f722e3cfe3775d1204c5c7063ee1f008e  cygwin-20170828.tar.gz
 0fe549949a025d65d52d6deca30554de8fca3b6e  e-1.5.tar.gz
 2e293256a134eb8e5b1a283361b15eb812fbfbf1  e-1.6-1.tar.gz
 e1919e72416cbd7ac8de5455caba8901acc7b44d  e-1.6-2.tar.gz
diff -r 65c3c8fc83e4 -r d9641709f2df src/Pure/Admin/build_cygwin.scala
--- a/src/Pure/Admin/build_cygwin.scala	Mon Aug 28 18:27:21 2017 +0200
+++ b/src/Pure/Admin/build_cygwin.scala	Mon Aug 28 21:18:47 2017 +0200
@@ -9,7 +9,7 @@
 
 object Build_Cygwin
 {
-  val default_mirror: String = "http://isabelle.in.tum.de/cygwin_2016-1"
+  val default_mirror: String = "http://isabelle.in.tum.de/cygwin_2017"
 
   val packages: List[String] =
     List("curl", "nano", "perl", "perl-libwww-perl", "rlwrap", "unzip")
diff -r 65c3c8fc83e4 -r d9641709f2df src/Pure/System/isabelle_tool.scala
--- a/src/Pure/System/isabelle_tool.scala	Mon Aug 28 18:27:21 2017 +0200
+++ b/src/Pure/System/isabelle_tool.scala	Mon Aug 28 21:18:47 2017 +0200
@@ -115,7 +115,7 @@
       Options.isabelle_tool,
       Profiling_Report.isabelle_tool,
       Remote_DMG.isabelle_tool,
-      Server.isabelle_tool,
+      // FIXME Server.isabelle_tool,
       Update_Cartouches.isabelle_tool,
       Update_Header.isabelle_tool,
       Update_Then.isabelle_tool,