[libcxx] r302619 - Rename Appveyor install helper script.
Eric Fiselier via cfe-commits
cfe-commits at lists.llvm.org
Tue May 9 19:43:02 PDT 2017
Author: ericwf
Date: Tue May 9 21:43:02 2017
New Revision: 302619
URL: http://llvm.org/viewvc/llvm-project?rev=302619&view=rev
Log:
Rename Appveyor install helper script.
I'm really lazy and the old name for the helper script
killed 2 letter tab completion for the include directory.
This patch renames it to avoid that problem and enable
lazyness.
Added:
libcxx/trunk/appveyor-reqs-install.cmd
- copied, changed from r302617, libcxx/trunk/install-appveyor-reqs.cmd
Removed:
libcxx/trunk/install-appveyor-reqs.cmd
Modified:
libcxx/trunk/appveyor.yml
Copied: libcxx/trunk/appveyor-reqs-install.cmd (from r302617, libcxx/trunk/install-appveyor-reqs.cmd)
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/appveyor-reqs-install.cmd?p2=libcxx/trunk/appveyor-reqs-install.cmd&p1=libcxx/trunk/install-appveyor-reqs.cmd&r1=302617&r2=302619&rev=302619&view=diff
==============================================================================
(empty)
Modified: libcxx/trunk/appveyor.yml
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/appveyor.yml?rev=302619&r1=302618&r2=302619&view=diff
==============================================================================
--- libcxx/trunk/appveyor.yml (original)
+++ libcxx/trunk/appveyor.yml Tue May 9 21:43:02 2017
@@ -36,7 +36,7 @@ install:
############################################################################
# All external dependencies are installed in C:\projects\deps
############################################################################
- - call "%APPVEYOR_BUILD_FOLDER%\\install-appveyor-reqs.cmd"
+ - call "%APPVEYOR_BUILD_FOLDER%\\appveyor-reqs-install.cmd"
before_build:
- if DEFINED MSVC_SETUP_PATH call "%MSVC_SETUP_PATH%" %MSVC_SETUP_ARG%
Removed: libcxx/trunk/install-appveyor-reqs.cmd
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/install-appveyor-reqs.cmd?rev=302618&view=auto
==============================================================================
--- libcxx/trunk/install-appveyor-reqs.cmd (original)
+++ libcxx/trunk/install-appveyor-reqs.cmd (removed)
@@ -1,53 +0,0 @@
- at echo on
-
-if NOT EXIST C:\projects\deps (
- mkdir C:\projects\deps
-)
-cd C:\projects\deps
-
-::###########################################################################
-:: Setup Compiler
-::###########################################################################
-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" (
- START /WAIT llvm-installer.exe /S /D=C:\"Program Files\LLVM"
-)
-if DEFINED CLANG_VERSION @set PATH="C:\Program Files\LLVM\bin";%PATH%
-if DEFINED CLANG_VERSION clang-cl -v
-
-if DEFINED MINGW_PATH rename "C:\Program Files\Git\usr\bin\sh.exe" "sh-ignored.exe"
-if DEFINED MINGW_PATH @set "PATH=%PATH:C:\Program Files (x86)\Git\bin=%"
-if DEFINED MINGW_PATH @set "PATH=%PATH%;%MINGW_PATH%"
-if DEFINED MINGW_PATH g++ -v
-
-::###########################################################################
-:: Install a recent CMake
-::###########################################################################
-if NOT EXIST cmake (
- appveyor DownloadFile https://cmake.org/files/v3.7/cmake-3.7.2-win64-x64.zip -FileName cmake.zip
- 7z x cmake.zip -oC:\projects\deps > nul
- move C:\projects\deps\cmake-* C:\projects\deps\cmake
- rm cmake.zip
-)
- at set PATH=C:\projects\deps\cmake\bin;%PATH%
-cmake --version
-
-::###########################################################################
-:: Install Ninja
-::###########################################################################
-if NOT EXIST ninja (
- appveyor DownloadFile https://github.com/ninja-build/ninja/releases/download/v1.6.0/ninja-win.zip -FileName ninja.zip
- 7z x ninja.zip -oC:\projects\deps\ninja > nul
- rm ninja.zip
-)
- at set PATH=C:\projects\deps\ninja;%PATH%
-ninja --version
-
-::###########################################################################
-:: Setup the cached copy of LLVM
-::###########################################################################
-git clone --depth=1 http://llvm.org/git/llvm.git
-
- at echo off
More information about the cfe-commits
mailing list