From 70ee385c43bf5d5e5b2996a71af1785ea31e0147 Mon Sep 17 00:00:00 2001
From: Bastian Kleineidam <bastian.kleineidam@web.de>
Date: Thu, 5 Dec 2013 21:00:51 +0100
Subject: [PATCH] Back to unix ci

---
 .travis.yml            | 10 +++-------
 Makefile               | 10 ----------
 doc/dot-travis-osx.yml | 24 ++++++++++++++++++++++++
 doc/install.txt        | 28 +++++++++++++++++++++++-----
 4 files changed, 50 insertions(+), 22 deletions(-)
 create mode 100644 doc/dot-travis-osx.yml

diff --git a/.travis.yml b/.travis.yml
index 3e6226a0..e5e64070 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
 language:
-- objective-c
 - python
 python:
   - "2.7"
@@ -9,16 +8,13 @@ branches:
     - travis
 # install required programs
 before_install:
-  - brew update
-  - brew install python
-  - brew install pyqt
-  - brew install gettext
-  - brew link --force gettext
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq python-dev qt4-dev-tools
 # command to install dependencies
 install:
   - pip install -r requirements.txt --use-mirrors
 # command to run tests
-script: make appinstall
+script: make test PYTESTOPTS="--tb=short" TESTS="tests/test_network.py tests/test_strformat.py"
 # do not send emails of broken builds
 notifications:
   email: false
diff --git a/Makefile b/Makefile
index 9b140cc0..e506754f 100644
--- a/Makefile
+++ b/Makefile
@@ -162,16 +162,6 @@ dist: locale MANIFEST chmod
 app: distclean localbuild chmod
 	$(PYTHON) setup.py py2app $(PY2APPOPTS)
 
-appinstall:	app
-	mkdir -p dist/mnt
-	hdiutil attach -mountpoint dist/mnt dist/$(APPNAME)-$(VERSION).dmg
-#	cat /usr/local/lib/python2.7/site-packages/modulegraph/find_modules.py
-#	cat /usr/local/lib/python2.7/site-packages/py2app/recipes/sip.py
-	man -P cat open
-	open -n dist/mnt/$(APPNAME).app --args http://www.example.org
-	sleep 10
-	-hdiutil detach dist/mnt
-
 # Build RPM installer with cx_Freeze
 rpm:
 	$(MAKE) -C doc/html
diff --git a/doc/dot-travis-osx.yml b/doc/dot-travis-osx.yml
new file mode 100644
index 00000000..d323e72c
--- /dev/null
+++ b/doc/dot-travis-osx.yml
@@ -0,0 +1,24 @@
+language:
+- objective-c
+- python
+python:
+  - "2.7"
+# whitelist of git branches to build
+branches:
+  only:
+    - travis
+# install required programs
+before_install:
+  - brew update
+  - brew install python
+  - brew install pyqt
+  - brew install gettext
+  - brew link --force gettext
+# command to install dependencies
+install:
+  - pip install -r requirements.txt --use-mirrors
+# command to run tests
+script: make app
+# do not send emails of broken builds
+notifications:
+  email: false
diff --git a/doc/install.txt b/doc/install.txt
index 7e360c25..063628fa 100644
--- a/doc/install.txt
+++ b/doc/install.txt
@@ -116,15 +116,33 @@ Manual setup for OSX systems
 
 1. Install the XCode developer tools
 
-2. Install homebrew_ and then install pyqt.
+2. Install homebrew_
    
    .. _homebrew: http://mxcl.github.com/homebrew/
 
+3. Install dependencies
+
+   brew update
+   brew install python
+   brew install pyqt
+   brew install gettext
+   # link gettext or put the msgfmt binary in your PATH
+   brew link --force gettext
+   pip install -r requirements.txt --use-mirrors
+
 3. Run ``make app``.
-   
-   Note: this appears not to be working due to bugs
-   in third-party libraries (but it worked the last time I had
-   an OSX system available).
+
+4. Install the resulting .dmg
+
+   # mount DMG
+   mkdir -p dist/mnt
+   hdiutil attach -mountpoint dist/mnt dist/LinkChecker-x.y.z.dmg
+   # to run directly
+   open -n dist/mnt/LinkChecker.app --args http://www.example.org
+   # install the app
+   sudo cp -r dist/mnt/LinkChecker.app /Applications
+   # unmount DMG
+   hdiutil detach dist/mnt
 
 
 WSGI web interface