merged
authorwenzelm
Mon Jun 04 23:54:26 2018 +0200 (13 months ago)
changeset 683771d1e9f9f8641
parent 68373 f254e383bfe9
parent 68376 78147871f5b3
child 68378 22680a3f8346
merged
     1.1 --- a/Admin/PLATFORMS	Mon Jun 04 21:03:10 2018 +0100
     1.2 +++ b/Admin/PLATFORMS	Mon Jun 04 23:54:26 2018 +0200
     1.3 @@ -39,7 +39,7 @@
     1.4                      macOS 10.13 High Sierra
     1.5  
     1.6    x86_64-windows    Windows 7
     1.7 -  x86_64-cygwin     Cygwin 2.8 http://isabelle.in.tum.de/cygwin_2017 (x86_64/release)
     1.8 +  x86_64-cygwin     Cygwin 2.10 https://isabelle.sketis.net/cygwin_2018 (x86_64/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 Jun 04 21:03:10 2018 +0100
     2.2 +++ b/Admin/Windows/Cygwin/Cygwin-Setup.bat	Mon Jun 04 23:54:26 2018 +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_2017 --no-verify --only-site --local-package-dir "%TEMP%" --root "%CD%\contrib\cygwin"
     2.7 +"%CD%\contrib\cygwin\isabelle\cygwin" --site "{MIRROR}" --no-verify --only-site --local-package-dir "%TEMP%" --root "%CD%\contrib\cygwin"
     3.1 --- a/Admin/Windows/Cygwin/README	Mon Jun 04 21:03:10 2018 +0100
     3.2 +++ b/Admin/Windows/Cygwin/README	Mon Jun 04 23:54:26 2018 +0200
     3.3 @@ -1,10 +1,10 @@
     3.4  Cygwin
     3.5  ======
     3.6  
     3.7 -* http://www.cygwin.com/
     3.8 +* https://www.cygwin.com/
     3.9  
    3.10  * Mirror with many old versions (not setup.ini)
    3.11 -  http://ftp.eq.uc.pt/software/pc/prog/cygwin
    3.12 +  https://ftp.eq.uc.pt/software/pc/prog/cygwin
    3.13  
    3.14  * Local snapshots:
    3.15    http://isabelle.in.tum.de/cygwin  (Isabelle2012)
    3.16 @@ -15,6 +15,7 @@
    3.17    http://isabelle.in.tum.de/cygwin_2016  (Isabelle2016)
    3.18    http://isabelle.in.tum.de/cygwin_2016-1  (Isabelle2016-1)
    3.19    http://isabelle.in.tum.de/cygwin_2017  (Isabelle2017)
    3.20 +  https://isabelle.sketis.net/cygwin_2018  (Isabelle2018)
    3.21  
    3.22  * Apache2 redirects for virtual host isabelle.conf:
    3.23    Redirect /cygwin/release http://ftp.eq.uc.pt/software/pc/prog/cygwin/release
    3.24 @@ -31,6 +32,9 @@
    3.25    Redirect /cygwin_2017/x86/release http://ftp.eq.uc.pt/software/pc/prog/cygwin/x86/release
    3.26    Redirect /cygwin_2017/x86_64/release http://ftp.eq.uc.pt/software/pc/prog/cygwin/x86_64/release
    3.27    Redirect /cygwin_2017/noarch/release http://ftp.eq.uc.pt/software/pc/prog/cygwin/noarch/release
    3.28 +  Redirect /cygwin_2018/x86/release https://ftp.eq.uc.pt/software/pc/prog/cygwin/x86/release
    3.29 +  Redirect /cygwin_2018/x86_64/release https://ftp.eq.uc.pt/software/pc/prog/cygwin/x86_64/release
    3.30 +  Redirect /cygwin_2018/noarch/release https://ftp.eq.uc.pt/software/pc/prog/cygwin/noarch/release
    3.31  
    3.32  * Quasi-component: "isabelle build_cygwin" (as Administrator)
    3.33  
     4.1 --- a/Admin/components/bundled-windows	Mon Jun 04 21:03:10 2018 +0100
     4.2 +++ b/Admin/components/bundled-windows	Mon Jun 04 23:54:26 2018 +0200
     4.3 @@ -1,3 +1,3 @@
     4.4  #additional components to be bundled for release
     4.5 -cygwin-20170930
     4.6 +cygwin-20180604
     4.7  windows_app-20180417
     5.1 --- a/Admin/components/components.sha1	Mon Jun 04 21:03:10 2018 +0100
     5.2 +++ b/Admin/components/components.sha1	Mon Jun 04 23:54:26 2018 +0200
     5.3 @@ -37,6 +37,7 @@
     5.4  d9ad7aae99d54e3b9813151712eb88a441613f04  cygwin-20161024.tar.gz
     5.5  f8eb6a0f722e3cfe3775d1204c5c7063ee1f008e  cygwin-20170828.tar.gz
     5.6  c22048912b010a5a0b4f2a3eb4d318d6953761e4  cygwin-20170930.tar.gz
     5.7 +5a3919e665947b820fd7f57787280c7512be3782  cygwin-20180604.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/Admin/lib/Tools/makedist_bundle	Mon Jun 04 21:03:10 2018 +0100
     6.2 +++ b/Admin/lib/Tools/makedist_bundle	Mon Jun 04 23:54:26 2018 +0200
     6.3 @@ -284,8 +284,12 @@
     6.4      (
     6.5        cd "$ISABELLE_TARGET"
     6.6  
     6.7 -      cp "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Setup.bat" \
     6.8 -        "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Terminal.bat" .
     6.9 +      cp "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Terminal.bat" .
    6.10 +
    6.11 +      CYGWIN_MIRROR="$(cat contrib/cygwin/isabelle/cygwin_mirror)"
    6.12 +      cat "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Setup.bat" | \
    6.13 +        perl -p > "Cygwin-Setup.bat" -e "s,{MIRROR},$CYGWIN_MIRROR,;"
    6.14 +      chmod +x "Cygwin-Setup.bat"
    6.15  
    6.16        for NAME in postinstall rebaseall
    6.17        do
     7.1 --- a/src/Pure/Admin/build_cygwin.scala	Mon Jun 04 21:03:10 2018 +0100
     7.2 +++ b/src/Pure/Admin/build_cygwin.scala	Mon Jun 04 23:54:26 2018 +0200
     7.3 @@ -9,7 +9,7 @@
     7.4  
     7.5  object Build_Cygwin
     7.6  {
     7.7 -  val default_mirror: String = "http://isabelle.in.tum.de/cygwin_2017"
     7.8 +  val default_mirror: String = "https://isabelle.sketis.net/cygwin_2018"
     7.9  
    7.10    val packages: List[String] =
    7.11      List("curl", "nano", "perl", "perl-libwww-perl", "rlwrap", "unzip")
    7.12 @@ -33,6 +33,8 @@
    7.13            try { Bytes.read(Url(cygwin_exe_name)) }
    7.14            catch { case ERROR(_) => error("Failed to download " + quote(cygwin_exe_name)) })
    7.15  
    7.16 +        File.write(cygwin_isabelle + Path.explode("cygwin_mirror"), mirror)
    7.17 +
    7.18          Isabelle_System.bash(
    7.19            "chmod +x " + File.bash_path(cygwin_exe) + " && " +
    7.20            File.bash_path(cygwin_exe) + " -h </dev/null >/dev/null").check