From 77783180a042a140ea659ece8f502cdfc388b5cf Mon Sep 17 00:00:00 2001
From: Joseph Crail <jbcrail@gmail.com>
Date: Fri, 20 May 2016 21:16:27 -0400
Subject: [PATCH 1/2] appveyor: simplify build without make

---
 appveyor.yml | 28 ++++------------------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index d3924d236..81098f95d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,38 +1,18 @@
-platform:
-  - x64
-
 environment:
-  global:
-    MSYS2_BASEVER: 20150512
-    MSYS2_ARCH: x86_64
-    MBASH: msys64\usr\bin\sh --login -c
-
   matrix:
+  - TARGET: x86_64-pc-windows-msvc
+  - TARGET: i686-pc-windows-msvc
   - TARGET: i686-pc-windows-gnu
-
 install:
-  - appveyor DownloadFile "http://kent.dl.sourceforge.net/project/msys2/Base/%MSYS2_ARCH%/msys2-base-%MSYS2_ARCH%-%MSYS2_BASEVER%.tar.xz" -FileName "msys2.tar.xz"
-  - 7z x msys2.tar.xz
-  - 7z x msys2.tar > NUL
-  - call %MBASH% ""
-  - call %MBASH% "for i in {1..3}; do pacman --noconfirm -Suy mingw-w64-%MSYS2_ARCH%-{ragel,freetype,icu,gettext} libtool pkg-config gcc make autoconf automake perl && break || sleep 15; done"
   - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-nightly-${env:TARGET}.exe"
   - rust-nightly-%TARGET%.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust"
-  - call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64
   - SET PATH=%PATH%;C:\Program Files (x86)\Rust\bin
   - SET PATH=%PATH%;C:\MinGW\bin
   - rustc -V
   - cargo -V
 
 build_script:
-  - call %MBASH% "cd $APPVEYOR_BUILD_FOLDER; PATH=$PATH:/mingw64/bin:/mingw32/bin; exec 0</dev/null; make PROFILE='release' build"
-  - 7z a -tzip uutils.zip .\target\release\deps\*.exe
- 
-artifacts:
-  - path: uutils.zip
-    name: zipfile
-  - path: target\release\uutils.exe
-    name: uutils.exe
+  - cargo build --features generic --no-default-features
 
 test_script:
-  - call %MBASH% "cd $APPVEYOR_BUILD_FOLDER; PATH=$PATH:/mingw64/bin:/mingw32/bin; exec 0</dev/null; make test"
+  - cargo test --no-fail-fast --features generic --no-default-features

From 61fd13078a1839698db6e031064d3e54faa8335d Mon Sep 17 00:00:00 2001
From: Joseph Crail <jbcrail@gmail.com>
Date: Fri, 20 May 2016 21:37:14 -0400
Subject: [PATCH 2/2] appveyor: re-add build artifacts

---
 appveyor.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/appveyor.yml b/appveyor.yml
index 81098f95d..725523500 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -13,6 +13,13 @@ install:
 
 build_script:
   - cargo build --features generic --no-default-features
+  - 7z a -tzip uutils.zip .\target\release\deps\*.exe
+
+artifacts:
+  - path: uutils.zip
+    name: zipfile
+  - path: target\release\uutils.exe
+    name: uutils.exe
 
 test_script:
   - cargo test --no-fail-fast --features generic --no-default-features