merged
authorwenzelm
Mon Aug 28 21:18:47 2017 +0200 (22 months ago)
changeset 66531d9641709f2df
parent 66528 65c3c8fc83e4
parent 66530 a3a847c4fbdb
child 66540 1f955cdd9e59
merged
     1.1 --- a/Admin/PLATFORMS	Mon Aug 28 18:27:21 2017 +0200
     1.2 +++ b/Admin/PLATFORMS	Mon Aug 28 21:18:47 2017 +0200
     1.3 @@ -40,7 +40,7 @@
     1.4  
     1.5    x86-windows       Windows 7
     1.6    x86_64-windows    Windows 7
     1.7 -  x86-cygwin        Cygwin 2.6 http://isabelle.in.tum.de/cygwin_2016-1 (x86/release)
     1.8 +  x86-cygwin        Cygwin 2.8 http://isabelle.in.tum.de/cygwin_2017 (x86/release)
     1.9  
    1.10  All of the above platforms are 100% supported by Isabelle -- end-users
    1.11  should not have to care about the differences (at least in theory).
     2.1 --- a/Admin/Windows/Cygwin/Cygwin-Setup.bat	Mon Aug 28 18:27:21 2017 +0200
     2.2 +++ b/Admin/Windows/Cygwin/Cygwin-Setup.bat	Mon Aug 28 21:18:47 2017 +0200
     2.3 @@ -1,3 +1,3 @@
     2.4  @echo off
     2.5  
     2.6 -"%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"
     2.7 +"%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"
     3.1 --- a/Admin/Windows/Cygwin/README	Mon Aug 28 18:27:21 2017 +0200
     3.2 +++ b/Admin/Windows/Cygwin/README	Mon Aug 28 21:18:47 2017 +0200
     3.3 @@ -14,6 +14,7 @@
     3.4    http://isabelle.in.tum.de/cygwin_2015  (Isabelle2015)
     3.5    http://isabelle.in.tum.de/cygwin_2016  (Isabelle2016)
     3.6    http://isabelle.in.tum.de/cygwin_2016-1  (Isabelle2016-1)
     3.7 +  http://isabelle.in.tum.de/cygwin_2017  (Isabelle2017)
     3.8  
     3.9  * Quasi-component: "isabelle build_cygwin" (as Administrator)
    3.10  
     4.1 --- a/Admin/components/bundled-windows	Mon Aug 28 18:27:21 2017 +0200
     4.2 +++ b/Admin/components/bundled-windows	Mon Aug 28 21:18:47 2017 +0200
     4.3 @@ -1,3 +1,3 @@
     4.4  #additional components to be bundled for release
     4.5 -cygwin-20161024
     4.6 +cygwin-20170828
     4.7  windows_app-20150821
     5.1 --- a/Admin/components/components.sha1	Mon Aug 28 18:27:21 2017 +0200
     5.2 +++ b/Admin/components/components.sha1	Mon Aug 28 21:18:47 2017 +0200
     5.3 @@ -30,6 +30,7 @@
     5.4  44f3a530f727e43a9413226c2423c9ca3e4c0cf5  cygwin-20161002.tar.gz
     5.5  dd56dd16d861fc6e1a008bf5e9da6f33ed6eb820  cygwin-20161022.tar.gz
     5.6  d9ad7aae99d54e3b9813151712eb88a441613f04  cygwin-20161024.tar.gz
     5.7 +f8eb6a0f722e3cfe3775d1204c5c7063ee1f008e  cygwin-20170828.tar.gz
     5.8  0fe549949a025d65d52d6deca30554de8fca3b6e  e-1.5.tar.gz
     5.9  2e293256a134eb8e5b1a283361b15eb812fbfbf1  e-1.6-1.tar.gz
    5.10  e1919e72416cbd7ac8de5455caba8901acc7b44d  e-1.6-2.tar.gz
     6.1 --- a/src/Pure/Admin/build_cygwin.scala	Mon Aug 28 18:27:21 2017 +0200
     6.2 +++ b/src/Pure/Admin/build_cygwin.scala	Mon Aug 28 21:18:47 2017 +0200
     6.3 @@ -9,7 +9,7 @@
     6.4  
     6.5  object Build_Cygwin
     6.6  {
     6.7 -  val default_mirror: String = "http://isabelle.in.tum.de/cygwin_2016-1"
     6.8 +  val default_mirror: String = "http://isabelle.in.tum.de/cygwin_2017"
     6.9  
    6.10    val packages: List[String] =
    6.11      List("curl", "nano", "perl", "perl-libwww-perl", "rlwrap", "unzip")
     7.1 --- a/src/Pure/System/isabelle_tool.scala	Mon Aug 28 18:27:21 2017 +0200
     7.2 +++ b/src/Pure/System/isabelle_tool.scala	Mon Aug 28 21:18:47 2017 +0200
     7.3 @@ -115,7 +115,7 @@
     7.4        Options.isabelle_tool,
     7.5        Profiling_Report.isabelle_tool,
     7.6        Remote_DMG.isabelle_tool,
     7.7 -      Server.isabelle_tool,
     7.8 +      // FIXME Server.isabelle_tool,
     7.9        Update_Cartouches.isabelle_tool,
    7.10        Update_Header.isabelle_tool,
    7.11        Update_Then.isabelle_tool,