diff --git a/appveyor.yml b/appveyor.yml index 7947415bea34c..063c9ebf03ce6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,11 +29,10 @@ init: - git config --global core.autocrlf input cache: -# Cache any downloads from sourceforge because it's really unreliable - - i686-4.9.2-release-win32-sjlj-rt_v4-rev3.7z - - x86_64-4.9.2-release-win32-seh-rt_v4-rev3.7z - - llvm-3.7.1-i686-w64-mingw32-juliadeps-r04.7z - - llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r04.7z + - i686-5.3.0-opensuse-win32-sjlj.7z + - x86_64-5.3.0-opensuse-win32-seh.7z + - llvm-3.7.1-i686-w64-mingw32-juliadeps-r06.7z + - llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r06.7z build_script: # If there's a newer build queued for the same PR, cancel this one diff --git a/contrib/windows/msys_build.sh b/contrib/windows/msys_build.sh index 854b3312850d6..3c4c9b84c5ff5 100755 --- a/contrib/windows/msys_build.sh +++ b/contrib/windows/msys_build.sh @@ -109,18 +109,16 @@ rm -f usr/bin/libjulia-debug.dll if [ -z "$USEMSVC" ]; then if [ -z "`which ${CROSS_COMPILE}gcc 2>/dev/null`" -o -n "$APPVEYOR" ]; then - f=$ARCH-4.9.2-release-win32-$exc-rt_v4-rev3.7z + f=$ARCH-5.3.0-opensuse-win32-$exc.7z checksum_download \ "$f" "https://bintray.com/artifact/download/tkelman/generic/$f" echo "Extracting $f" $SEVENZIP x -y $f >> get-deps.log - export PATH=$PWD/mingw$bits/bin:$PATH - # If there is a version of make.exe here, it is mingw32-make which won't work - rm -f mingw$bits/bin/make.exe + export PATH=$PWD/usr/$ARCH-w64-mingw32/sys-root/mingw/bin:$PATH fi export AR=${CROSS_COMPILE}ar - f=llvm-3.7.1-$ARCH-w64-mingw32-juliadeps-r04.7z + f=llvm-3.7.1-$ARCH-w64-mingw32-juliadeps-r06.7z else echo "override USEMSVC = 1" >> Make.user echo "override ARCH = $ARCH" >> Make.user @@ -140,8 +138,8 @@ checksum_download \ "$f" "https://bintray.com/artifact/download/tkelman/generic/$f" echo "Extracting $f" $SEVENZIP x -y $f >> get-deps.log -echo 'override LLVM_CONFIG := $(JULIAHOME)/usr/tools/llvm-config.exe' >> Make.user -echo 'override LLVM_SIZE := $(JULIAHOME)/usr/tools/llvm-size.exe' >> Make.user +echo 'override LLVM_CONFIG := $(JULIAHOME)/usr/bin/llvm-config.exe' >> Make.user +echo 'override LLVM_SIZE := $(JULIAHOME)/usr/bin/llvm-size.exe' >> Make.user if [ -z "`which make 2>/dev/null`" ]; then if [ -n "`uname | grep CYGWIN`" ]; then diff --git a/deps/checksums/i686-4.9.2-release-win32-sjlj-rt_v4-rev3.7z/md5 b/deps/checksums/i686-4.9.2-release-win32-sjlj-rt_v4-rev3.7z/md5 deleted file mode 100644 index e297faa029d09..0000000000000 --- a/deps/checksums/i686-4.9.2-release-win32-sjlj-rt_v4-rev3.7z/md5 +++ /dev/null @@ -1 +0,0 @@ -6217dae4a1016b37b12aeed1cc950187 diff --git a/deps/checksums/i686-4.9.2-release-win32-sjlj-rt_v4-rev3.7z/sha512 b/deps/checksums/i686-4.9.2-release-win32-sjlj-rt_v4-rev3.7z/sha512 deleted file mode 100644 index 2cc5d1523bc61..0000000000000 --- a/deps/checksums/i686-4.9.2-release-win32-sjlj-rt_v4-rev3.7z/sha512 +++ /dev/null @@ -1 +0,0 @@ -1f38cc758725f124552285940cde6d9e072a594298a09f7a542a6cc28cb25d119d80d73918e4e9207694819825787abb6eba4a83cee5892e5acaf6350221b97f diff --git a/deps/checksums/i686-5.3.0-opensuse-win32-sjlj.7z/md5 b/deps/checksums/i686-5.3.0-opensuse-win32-sjlj.7z/md5 new file mode 100644 index 0000000000000..bc04b445fc3b7 --- /dev/null +++ b/deps/checksums/i686-5.3.0-opensuse-win32-sjlj.7z/md5 @@ -0,0 +1 @@ +d1910b6cfd1872de99b88759ddc72e2e diff --git a/deps/checksums/i686-5.3.0-opensuse-win32-sjlj.7z/sha512 b/deps/checksums/i686-5.3.0-opensuse-win32-sjlj.7z/sha512 new file mode 100644 index 0000000000000..4d215bcb1a2a8 --- /dev/null +++ b/deps/checksums/i686-5.3.0-opensuse-win32-sjlj.7z/sha512 @@ -0,0 +1 @@ +04da25abd98437392354664e6228af37ee63deddcb71367526ca3df6356d801d3ab0e47aacacb3e5d22d696d5032fa8ce321b34cfa79908e191a6c4bf2150cae diff --git a/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r04.7z/md5 b/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r04.7z/md5 deleted file mode 100644 index 17b03f2082646..0000000000000 --- a/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r04.7z/md5 +++ /dev/null @@ -1 +0,0 @@ -d639c06cdad6b7c55c1dbdb82e3def15 diff --git a/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r04.7z/sha512 b/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r04.7z/sha512 deleted file mode 100644 index de93e76809c83..0000000000000 --- a/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r04.7z/sha512 +++ /dev/null @@ -1 +0,0 @@ -93785655d61d3eec63a1834669153148102171115982bfc01011a1f154192395ee7e787efc52047dc63a2887a11832ae3faccd7cf3fae4b168ffcd160786adee diff --git a/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r06.7z/md5 b/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r06.7z/md5 new file mode 100644 index 0000000000000..ed03262ef7cc4 --- /dev/null +++ b/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r06.7z/md5 @@ -0,0 +1 @@ +98324dd5062410e5418df8249776cf64 diff --git a/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r06.7z/sha512 b/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r06.7z/sha512 new file mode 100644 index 0000000000000..d90f621ef0a0f --- /dev/null +++ b/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r06.7z/sha512 @@ -0,0 +1 @@ +a3d1cd86f6e032d0a88c84058c6dafa0ed12286d9cc8edad084f670a3d5e299228214409fa716e53e58bc4d47742a37996652a1907d8e60cf0e9c22721a83574 diff --git a/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r04.7z/md5 b/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r04.7z/md5 deleted file mode 100644 index df47ab34abf50..0000000000000 --- a/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r04.7z/md5 +++ /dev/null @@ -1 +0,0 @@ -f27bdc73c67ce670b30a2494dcf82e58 diff --git a/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r04.7z/sha512 b/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r04.7z/sha512 deleted file mode 100644 index c6faf62f87059..0000000000000 --- a/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r04.7z/sha512 +++ /dev/null @@ -1 +0,0 @@ -a61e0564816427be4c8d5005077354f01b9c4cb1c0abb1c6ccedf90b44654be4350edabe9a0c5fcd52833f1c4caa6aa286713879bec2eae96cb848c5422113c1 diff --git a/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r06.7z/md5 b/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r06.7z/md5 new file mode 100644 index 0000000000000..c8667da723e95 --- /dev/null +++ b/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r06.7z/md5 @@ -0,0 +1 @@ +b9bebde989cc5b2ee0655d9be22975ae diff --git a/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r06.7z/sha512 b/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r06.7z/sha512 new file mode 100644 index 0000000000000..bceb1e3f79ac6 --- /dev/null +++ b/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r06.7z/sha512 @@ -0,0 +1 @@ +f985ab65d9c77dbe0ef31f7fa4961a9b0a8c64bc1c3dc033090be2be1d2e91e6f35dceb8abcd13369e9a4e2f243add8e1d4ebaa1ff8ea74db32824bbd8c8618a diff --git a/deps/checksums/x86_64-4.9.2-release-win32-seh-rt_v4-rev3.7z/md5 b/deps/checksums/x86_64-4.9.2-release-win32-seh-rt_v4-rev3.7z/md5 deleted file mode 100644 index c574a25b87112..0000000000000 --- a/deps/checksums/x86_64-4.9.2-release-win32-seh-rt_v4-rev3.7z/md5 +++ /dev/null @@ -1 +0,0 @@ -b138576c92c425e8fa171a9d98e13b86 diff --git a/deps/checksums/x86_64-4.9.2-release-win32-seh-rt_v4-rev3.7z/sha512 b/deps/checksums/x86_64-4.9.2-release-win32-seh-rt_v4-rev3.7z/sha512 deleted file mode 100644 index ed37b9bd96e51..0000000000000 --- a/deps/checksums/x86_64-4.9.2-release-win32-seh-rt_v4-rev3.7z/sha512 +++ /dev/null @@ -1 +0,0 @@ -50dcb3aaab3e53d5ff4561079272daf473bacc8d7a2a3720e7c594ae6e402123cb3cc6f3eabaf67df8d94fa5c01bb3e45b5bb1bc7cbb87cd2beb6b5664e02072 diff --git a/deps/checksums/x86_64-5.3.0-opensuse-win32-seh.7z/md5 b/deps/checksums/x86_64-5.3.0-opensuse-win32-seh.7z/md5 new file mode 100644 index 0000000000000..646f4b24f50bc --- /dev/null +++ b/deps/checksums/x86_64-5.3.0-opensuse-win32-seh.7z/md5 @@ -0,0 +1 @@ +1d895dab2e6afc6e0dfe14fbe4291de4 diff --git a/deps/checksums/x86_64-5.3.0-opensuse-win32-seh.7z/sha512 b/deps/checksums/x86_64-5.3.0-opensuse-win32-seh.7z/sha512 new file mode 100644 index 0000000000000..0585f2a43280b --- /dev/null +++ b/deps/checksums/x86_64-5.3.0-opensuse-win32-seh.7z/sha512 @@ -0,0 +1 @@ +cb06c7b217f71556d3ec459a0ae2529e18f33787b0d4392f87d5f33aae0a3e503af0b0e0180edcc34580436f12481e983b018341c83bff29aa4381724972ecc1