Skip to content

Commit

Permalink
make curl flags more robust in msys_build.sh
Browse files Browse the repository at this point in the history
use https://status.julialang.org

set MARCH on appveyor
  • Loading branch information
tkelman committed Nov 28, 2014
1 parent 91efa39 commit ce29d78
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
6 changes: 4 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
environment:
# USEMSVC: "1"
matrix:
- ARCH: "i686"
- ARCH: "x86_64"
- ARCH: "i686"
MARCH: "pentium4"
- ARCH: "x86_64"
MARCH: "x86-64"

# Only build on master and PR's for now, not personal branches
# Whether or not PR's get built is determined in the webhook settings
Expand Down
10 changes: 6 additions & 4 deletions contrib/windows/msys_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,13 @@ case $(uname) in
;;
esac

curlflags="curl --retry 10 -k -L -y 5"

# Download most recent Julia binary for dependencies
if ! [ -e julia-installer.exe ]; then
f=julia-nightly-win$bits.exe
echo "Downloading $f"
curl -kLsSo $f http://status.julialang.org/download/win$bits
$curlflags -o $f https://status.julialang.org/download/win$bits
echo "Extracting $f"
$SEVENZIP x -y $f >> get-deps.log
fi
Expand All @@ -79,7 +81,7 @@ if [ -z "$USEMSVC" ]; then
f=mingw-w$bits-bin-$ARCH-20140102.7z
if ! [ -e $f ]; then
echo "Downloading $f"
curl -kLOsS $mingw-w64-dgn/files/mingw-w64/$f
$curlflags -O $mingw-w64-dgn/files/mingw-w64/$f
fi
echo "Extracting $f"
$SEVENZIP x -y $f >> get-deps.log
Expand Down Expand Up @@ -116,7 +118,7 @@ fi

if ! [ -e $f ]; then
echo "Downloading $f"
curl -kLOsS http://sourceforge.net/projects/juliadeps-win/files/$f
$curlflags -O http://sourceforge.net/projects/juliadeps-win/files/$f
fi
echo "Extracting $f"
$SEVENZIP x -y $f >> get-deps.log
Expand All @@ -130,7 +132,7 @@ if [ -z "`which make 2>/dev/null`" ]; then
f="/make/make-3.81-2/make-3.81-2-msys-1.0.11-bin.tar"
if ! [ -e `basename $f.lzma` ]; then
echo "Downloading `basename $f`"
curl -kLOsS $mingw/files/MSYS/Base$f.lzma
$curlflags -O $mingw/files/MSYS/Base$f.lzma
fi
$SEVENZIP x -y `basename $f.lzma` >> get-deps.log
tar -xf `basename $f`
Expand Down

0 comments on commit ce29d78

Please sign in to comment.