Merge pull request ActivityWatch#18 from ActivityWatch/build-osx

Successful OS X builds
dholendar-27 · Jul 28, 2016 · 030ed65 · 030ed65
2 parents 0805a9d + 3da100a
commit 030ed65
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,13 +2,18 @@
 language: python
 matrix:
   include:
-   - python: "3.5"
-   - python: "nightly"
+   - os: linux
+     python: 3.5
+   - os: osx
+     language: generic
+   - os: linux
+     python: nightly
   allow_failures:
     # Doesn't currently work with pyinstaller
    - python: "nightly"
 
 before_install:
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./setup_venv_osx.sh; source venv/bin/activate; fi
  - "pip install pyinstaller"
 
 install:

diff --git a/aw-server b/aw-server
diff --git a/aw-watcher-afk b/aw-watcher-afk
diff --git a/aw-watcher-x11 b/aw-watcher-x11
diff --git a/build.sh b/build.sh
@@ -4,7 +4,7 @@
 # NOTE: Highly WIP!
 #
 
-PYINSTALL_TARGETS=$(find -maxdepth 2 | egrep 'aw-.*/.*\.spec')
+PYINSTALL_TARGETS=$(find . -maxdepth 2 | egrep 'aw-.*/.*\.spec')
 
 function build_fail {
     echo "Failed to build $1"

diff --git a/setup_venv_osx.sh b/setup_venv_osx.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+brew update;
+brew install python3;
+virtualenv venv -p python3;
+
+# Now run `source venv/bin/activate` in the shell where the virtualenv should be used