From 4f6e6744994cda4caf06901efc1c5a7c782e6bf1 Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Thu, 12 Nov 2015 00:09:00 +0100
Subject: [PATCH] appveyor: use .msi instead of .tar.gz for installing rust so
 that we get rustc, std and cargo all in one package

---
 appveyor.yml | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 2139e38b..c1fe3696 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,6 +1,5 @@
 version: 0.0.{build}
 environment:
-  CARGO_TARGET: x86_64-pc-windows-gnu
   TARGET: x86_64-pc-windows-msvc
 #  matrix:
 #  - TARGET: x86_64-pc-windows-msvc
@@ -12,15 +11,10 @@ environment:
 #    PYTHONPATH: C:\Python34-x64
 #    FEATURES: python3-sys
 install:
-  - ps: Start-FileDownload "https://static.rust-lang.org/dist/rustc-nightly-${env:TARGET}.tar.gz"
-  - ps: Start-FileDownload "https://static.rust-lang.org/cargo-dist/cargo-nightly-${env:CARGO_TARGET}.tar.gz"
-  - 7z x rustc-nightly-%TARGET%.tar.gz > nul
-  - 7z x rustc-nightly-%TARGET%.tar > nul
-  - 7z x cargo-nightly-%CARGO_TARGET%.tar.gz > nul
-  - 7z x cargo-nightly-%CARGO_TARGET%.tar > nul
+  - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-nightly-%TARGET%.msi"
+  - start /wait msiexec /i rust-nightly-%TARGET%.msi INSTALLDIR="%CD%\rust-nightly-%TARGET%" /quiet /qn /norestart
   - call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64
-  - set PATH=%PATH%;%cd%/rustc-nightly-%TARGET%/rustc/bin
-  - set PATH=%PATH%;%cd%/cargo-nightly-%CARGO_TARGET%/cargo/bin
+  - set PATH=%PATH%;%CD%/rust-nightly-%TARGET%/bin
   - SET PATH=%PYTHONPATH%;%PATH%
   - rustc -V
   - cargo -V