Skip to content

Commit

Permalink
Use homebuilt Qt distribution for PropellerIDE because something is s…
Browse files Browse the repository at this point in the history
…eriously wrong with the Homebrew version on Mac
  • Loading branch information
bweir committed Sep 26, 2015
1 parent 421bb56 commit 3e595e4
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
9 changes: 3 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,19 @@ matrix:
compiler: clang
env:
PLATFORM=osx
PATH=/usr/local/opt/qt5/bin:$HOME/local/bin:$PATH
LD_LIBRARY_PATH=/usr/local/opt/qt5/lib:$LD_LIBRARY_PATH
PATH=/Users/travis/local/bin:$PATH
PYTHONPATH=$PYTHONPATH:$HOME/local/lib/python2.7/site-packages
- os: linux
compiler: g++
env:
PLATFORM=linux
PATH=/home/travis/local/bin:$HOME/local/bin:$PATH
LD_LIBRARY_PATH=/home/travis/local/lib:$LD_LIBRARY_PATH
PATH=/home/travis/local/bin:$PATH
PYTHONPATH=$PYTHONPATH:$HOME/local/lib/python2.7/site-packages
- os: linux
compiler: clang
env:
PLATFORM=linux
PATH=/home/travis/local/bin:$HOME/local/bin:$PATH
LD_LIBRARY_PATH=/home/travis/local/lib:$LD_LIBRARY_PATH
PATH=/home/travis/local/bin:$PATH
PYTHONPATH=$PYTHONPATH:$HOME/local/lib/python2.7/site-packages
QMAKESPEC=linux-clang
install: "./scripts/travis/install.sh"
Expand Down
2 changes: 1 addition & 1 deletion packthing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ target:
repo:
- path: "propelleride"
url: "https://github.com/parallaxinc/PropellerIDE.git"
tag: "0.31.15"
tag: "0.31.16"
type: "qmake"
master: true
icon: "icons/icon-new.png"
Expand Down
5 changes: 4 additions & 1 deletion scripts/travis/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ git submodule update --init --recursive

case "$PLATFORM" in
"osx")
brew install tree qt5
brew install tree
wget -4 http://lamestation.net/downloads/travis/qt5.5.0-mac-clang.tgz
tar xzf qt5.5.0-mac-clang.tgz
mv local/ /Users/travis/local/
;;
"linux")
# wget -4 http://lamestation.net/downloads/travis/qt5.5.0-linux-g++.tgz
Expand Down

0 comments on commit 3e595e4

Please sign in to comment.