From 2bdef8b04dfd759d2ba7fd3a90d652c1591c31a1 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Tue, 8 Dec 2015 23:42:03 +0200
Subject: [PATCH] Test both the Setuptools and PyInstaller tx scripts on
 Windows

---
 appveyor.yml              | 5 ++---
 contrib/test_win_build.sh | 7 +++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index ce36fb6a..1854a817 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -42,12 +42,11 @@ install:
   - "pip install --disable-pip-version-check --user --upgrade pip"
   - "pip install pyinstaller"
 
-  # Install the build dependencies of the project. If some dependencies contain
+  # Set up the project in develop mode. If some dependencies contain
   # compiled extensions and are not provided as pre-built wheel packages,
   # pip will build them from source using the MSVC compiler matching the
   # target Python version and architecture
-  #- "%CMD_IN_ENV% pip install -r dev-requirements.txt"
-  - pip install -r requirements.txt
+  - pip install -e .
 
 build_script:
   # Build the compiled extension
diff --git a/contrib/test_win_build.sh b/contrib/test_win_build.sh
index 2464a0c7..7520cdc4 100644
--- a/contrib/test_win_build.sh
+++ b/contrib/test_win_build.sh
@@ -1,4 +1,11 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 BRANCH="win-${PYTHON//C:\\/}"
+
+# Test the PyInstaller executable:
 TX="$DIR/../dist/tx.exe"
 source "$DIR/tx_commands.sh"
+
+# Test the Setuptools script:
+TX="tx"
+source "$DIR/tx_commands.sh"
+