Author: ericwf
Date: Thu May 4 14:04:50 2017
New Revision: 302181
URL: http://llvm.org/viewvc/llvm-project?rev=302181&view=rev
Log:
Change Appveyor to download Clang from llvm.org instead of my private server
Modified:
libcxx/trunk/appveyor.yml
libcxx/trunk/install-appveyor-reqs.cmd
Modified: libcxx/trunk/appveyor.yml
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/appveyor.yml?rev=302181&r1=302180&r2=302181&view=diff
==============================================================================
--- libcxx/trunk/appveyor.yml (original)
+++ libcxx/trunk/appveyor.yml Thu May 4 14:04:50 2017
@@ -65,4 +65,4 @@ artifacts:
cache:
- C:\projects\deps\ninja
- C:\projects\deps\cmake
- - C:\projects\deps\llvm
+ - C:\projects\deps\llvm-installer.exe
Modified: libcxx/trunk/install-appveyor-reqs.cmd
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/install-appveyor-reqs.cmd?rev=302181&r1=302180&r2=302181&view=diff
==============================================================================
--- libcxx/trunk/install-appveyor-reqs.cmd (original)
+++ libcxx/trunk/install-appveyor-reqs.cmd Thu May 4 14:04:50 2017
@@ -7,11 +7,11 @@ cd C:\projects\deps
::###########################################################################
:: Setup the path to Clang-cl
::###########################################################################
+if NOT EXIST llvm-installer.exe (
+ appveyor DownloadFile
http://llvm.org/pre-releases/win-snapshots/LLVM-5.0.0-r301646-win32.exe
-FileName llvm-installer.exe
+)
if "%CLANG_VERSION%"=="ToT" (
- appveyor DownloadFile http://efcs.ca/downloads/llvm-tot-win32.zip
-FileName llvm-package.zip
- move "C:\Program Files\LLVM" "C:\Program Files\LLVM_BAK"
- 7z x llvm-package.zip -o"C:\Program Files\LLVM" > nul
- rm llvm-package.zip
+ START /WAIT llvm-installer.exe /S /D=C:\"Program Files\LLVM"
)
@set PATH="C:\Program Files\LLVM\bin";%PATH%
clang-cl -v
@@ -42,10 +42,6 @@ ninja --version
::###########################################################################
:: Setup the cached copy of LLVM
::###########################################################################
-if NOT EXIST llvm (
- git clone --depth=1 http://llvm.org/git/llvm.git
-) ELSE (
- git -C llvm pull --rebase=true --ff-only
-)
+git clone --depth=1 http://llvm.org/git/llvm.git
@echo off
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
