avoid hardwired cygwin mirror;
authorwenzelm
Mon Jun 04 22:04:45 2018 +0200 (13 months ago)
changeset 683755714e8806060
parent 68374 8740e1241555
child 68376 78147871f5b3
avoid hardwired cygwin mirror;
Admin/Windows/Cygwin/Cygwin-Setup.bat
Admin/lib/Tools/makedist_bundle
     1.1 --- a/Admin/Windows/Cygwin/Cygwin-Setup.bat	Mon Jun 04 21:57:38 2018 +0200
     1.2 +++ b/Admin/Windows/Cygwin/Cygwin-Setup.bat	Mon Jun 04 22:04:45 2018 +0200
     1.3 @@ -1,3 +1,3 @@
     1.4  @echo off
     1.5  
     1.6 -"%CD%\contrib\cygwin\isabelle\cygwin" --site https://isabelle.sketis.net/cygwin_2018 --no-verify --only-site --local-package-dir "%TEMP%" --root "%CD%\contrib\cygwin"
     1.7 +"%CD%\contrib\cygwin\isabelle\cygwin" --site {MIRROR} --no-verify --only-site --local-package-dir "%TEMP%" --root "%CD%\contrib\cygwin"
     2.1 --- a/Admin/lib/Tools/makedist_bundle	Mon Jun 04 21:57:38 2018 +0200
     2.2 +++ b/Admin/lib/Tools/makedist_bundle	Mon Jun 04 22:04:45 2018 +0200
     2.3 @@ -284,8 +284,12 @@
     2.4      (
     2.5        cd "$ISABELLE_TARGET"
     2.6  
     2.7 -      cp "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Setup.bat" \
     2.8 -        "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Terminal.bat" .
     2.9 +      cp "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Terminal.bat" .
    2.10 +
    2.11 +      CYGWIN_MIRROR="$(cat contrib/cygwin/isabelle/cygwin_mirror)"
    2.12 +      cat "$ISABELLE_HOME/Admin/Windows/Cygwin/Cygwin-Setup.bat" | \
    2.13 +        perl -p > "Cygwin-Setup.bat" -e "s,{MIRROR},$CYGWIN_MIRROR,;"
    2.14 +      chmod +x "Cygwin-Setup.bat"
    2.15  
    2.16        for NAME in postinstall rebaseall
    2.17        do