From a830fa8b10c0de544e99f0a7aadd12c39943a7cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Bj=C3=A4reholt?= <erik.bjareholt@gmail.com>
Date: Thu, 28 Jul 2016 11:32:53 +0200
Subject: [PATCH] Now builds all pyinstaller specs, nightly added as allowed
 failure, and submodule updates!

---
 .travis.yml      | 16 +++++++++++-----
 aw-client        |  2 +-
 aw-watcher-afk   |  2 +-
 aw-watcher-macos |  2 +-
 aw-watcher-x11   |  2 +-
 aw-webui         |  2 +-
 build.sh         | 20 +++++++++++++++++++-
 7 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0c00c6f..05ecfe0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,19 @@
 
 language: python
-python:
-# - "3.3"
-# - "3.4"
- - "3.5"
- - "nightly" # currently points to 3.6-dev
+matrix:
+  include:
+   - python: "3.5"
+   - python: "nightly"
+  allow_failures:
+    # Doesn't currently work with pyinstaller
+   - python: "nightly"
+
+before_install:
+ - "pip install pyinstaller"
 
 install:
  - "./install.sh --noroot"
 
 script:
  - "./integration_tests.sh"
+ - "./build.sh"
diff --git a/aw-client b/aw-client
index 59133be..f7d6f4c 160000
--- a/aw-client
+++ b/aw-client
@@ -1 +1 @@
-Subproject commit 59133befee673385add57522574a96057ed55d45
+Subproject commit f7d6f4c1dbf75259cd8fb9f7748d94ae768085c5
diff --git a/aw-watcher-afk b/aw-watcher-afk
index 39d653d..6af565e 160000
--- a/aw-watcher-afk
+++ b/aw-watcher-afk
@@ -1 +1 @@
-Subproject commit 39d653db113fd415d40355390855aaf1b1859c0a
+Subproject commit 6af565eef72e731e944210a1b6a72b5a2ad0942a
diff --git a/aw-watcher-macos b/aw-watcher-macos
index c79f3b2..106213c 160000
--- a/aw-watcher-macos
+++ b/aw-watcher-macos
@@ -1 +1 @@
-Subproject commit c79f3b2e36c11c2145ba11bb1ba8afee73f5e975
+Subproject commit 106213c8336341e6e2ba04ea1b46d04d732a785e
diff --git a/aw-watcher-x11 b/aw-watcher-x11
index 51e3fcc..5ca96de 160000
--- a/aw-watcher-x11
+++ b/aw-watcher-x11
@@ -1 +1 @@
-Subproject commit 51e3fcc26557a728fda270df56e9258930a78505
+Subproject commit 5ca96deaf662c19ac27a64fdf7142f4c1d8c347f
diff --git a/aw-webui b/aw-webui
index aed5199..d7d1baf 160000
--- a/aw-webui
+++ b/aw-webui
@@ -1 +1 @@
-Subproject commit aed51993ceb045b8a7de11d1d69583ea819906a8
+Subproject commit d7d1baf4036fad64dea349e96c2c0e827ded9058
diff --git a/build.sh b/build.sh
index 894c78a..f50584e 100755
--- a/build.sh
+++ b/build.sh
@@ -6,6 +6,24 @@
 
 PYINSTALL_TARGETS=$(find -maxdepth 2 | egrep 'aw-.*/.*\.spec')
 
+echo "PyInstaller .spec files found"
 for target in $PYINSTALL_TARGETS; do
-    pyinstaller $target
+    echo " - $target";
 done
+rm -rf dist build
+
+for target in $PYINSTALL_TARGETS; do
+    target_dir=$(dirname $target)
+
+    echo
+    echo "-------------------------------------"
+    echo "Building $target_dir"
+    pyinstaller $target --onefile --clean
+done
+
+echo
+echo "-------------------------------------"
+echo "Contents of ./dist"
+ls -l dist
+echo "-------------------------------------"
+