From d5991761cd678dc48f2924947056fe40415592d2 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Tue, 22 Sep 2015 14:31:55 -0400
Subject: [PATCH] Fix building the binary on appveyor, and have it create an
 artifact.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 appveyor.yml             |  9 +++++++--
 script/build-osx         |  2 +-
 script/build-windows.ps1 | 15 ++++++++++++---
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 639591e9c..acf8bff34 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,9 +1,10 @@
 
+version: '{branch}-{build}'
+
 install:
   - "SET PATH=C:\\Python27-x64;C:\\Python27-x64\\Scripts;%PATH%"
   - "python --version"
-  - "pip install tox==2.1.1"
-
+  - "pip install tox==2.1.1 virtualenv==13.1.2"
 
 # Build the binary after tests
 build: false
@@ -13,3 +14,7 @@ test_script:
 
 after_test:
   - ps: ".\\script\\build-windows.ps1"
+
+artifacts:
+  - path: .\dist\docker-compose-Windows-x86_64.exe
+    name: "Compose Windows binary"
diff --git a/script/build-osx b/script/build-osx
index 11b6ecc69..15a7bbc54 100755
--- a/script/build-osx
+++ b/script/build-osx
@@ -9,7 +9,7 @@ rm -rf venv
 virtualenv -p /usr/local/bin/python venv
 venv/bin/pip install -r requirements.txt
 venv/bin/pip install -r requirements-build.txt
-venv/bin/pip install .
+venv/bin/pip install --no-deps .
 venv/bin/pyinstaller docker-compose.spec
 mv dist/docker-compose dist/docker-compose-Darwin-x86_64
 dist/docker-compose-Darwin-x86_64 version
diff --git a/script/build-windows.ps1 b/script/build-windows.ps1
index 284e44f35..63be08652 100644
--- a/script/build-windows.ps1
+++ b/script/build-windows.ps1
@@ -13,12 +13,21 @@ Get-ChildItem -Recurse -Include *.pyc | foreach ($_) { Remove-Item $_.FullName }
 virtualenv .\venv
 
 # Install dependencies
-.\venv\Scripts\easy_install "http://sourceforge.net/projects/pywin32/files/pywin32/Build%20219/pywin32-219.win32-py2.7.exe/download"
+.\venv\Scripts\pip install pypiwin32==219
 .\venv\Scripts\pip install -r requirements.txt
-.\venv\Scripts\pip install -r requirements-build.txt
-.\venv\Scripts\pip install .
+.\venv\Scripts\pip install --no-deps .
+
+# TODO: pip warns when installing from a git sha, so we need to set ErrorAction to
+# 'Continue'.  See
+# https://github.com/pypa/pip/blob/fbc4b7ae5fee00f95bce9ba4b887b22681327bb1/pip/vcs/git.py#L77
+# This can be removed once pyinstaller 3.x is released and we upgrade 
+$ErrorActionPreference = "Continue"
+.\venv\Scripts\pip install --allow-external pyinstaller -r requirements-build.txt
 
 # Build binary
+# pyinstaller has lots of warnings, so we need to run with ErrorAction = Continue
 .\venv\Scripts\pyinstaller .\docker-compose.spec
+$ErrorActionPreference = "Stop"
+
 Move-Item -Force .\dist\docker-compose .\dist\docker-compose-Windows-x86_64.exe
 .\dist\docker-compose-Windows-x86_64.exe --version