Skip to content

Commit

Permalink
Only build Qt5 version for macOS on travis
Browse files Browse the repository at this point in the history
There is no need to continue to build the Qt4 version for macOS
since it has usability issues that have been fixed with Qt5 and
the fewer macOS builds the better: https://blog.travis-ci.com/2017-09-22-macos-update
  • Loading branch information
peterlama authored and yorikvanhavre committed Oct 30, 2017
1 parent 795a57c commit 178e5dd
Showing 1 changed file with 5 additions and 30 deletions.
35 changes: 5 additions & 30 deletions .travis.yml
Expand Up @@ -64,13 +64,6 @@ matrix:
- CMAKE_OPTS="-DBUILD_FEM_NETGEN=ON" QT=Qt5
- PYTHON_MAJOR_VERSION=2

- os: osx
osx_image: xcode7.3
compiler: clang
env:
- CMAKE_OPTS="-DBUILD_FEM_NETGEN=ON" QT=Qt4
- PYTHON_MAJOR_VERSION=2

git:
depth: 5000

Expand Down Expand Up @@ -177,30 +170,12 @@ before_install:
brew tap FreeCAD/freecad
if [ "${QT}" == "Qt4" ]; then
# Qt4: Replace Qt5 from ports-cache with Qt4, if necessary
brew ls --versions qt@5.6 > /dev/null && \
brew uninstall --ignore-dependencies --force shiboken pyside pyside-tools qt@5.6
brew tap cartr/qt4
brew install --verbose --only-dependencies freecad --with-qt4 --with-packaging-utils
brew install --verbose --only-dependencies freecad --with-qt4 --with-packaging-utils #Ensure all dependencies are satisfied
# qt4 bottle contains postgresql plugin even when --with-postgresql option is not specified
# and so postgresql dep is not installed. Delete it because the plugin is not included with qt5 bottle.
sudo rm -f /usr/local/lib/qt4/plugins/sqldrivers/libqsqlpsql.dylib
elif [ "${QT}" == "Qt5" ]; then
# Qt5: Replace Qt4 in ports-cache with Qt5, if necessary
brew ls --versions cartr/qt4/qt > /dev/null && \
brew uninstall --ignore-dependencies --force cartr/qt4/shiboken@1.2 cartr/qt4/pyside@1.2 cartr/qt4/pyside-tools@1.2 cartr/qt4/qt
brew install --verbose --only-dependencies freecad --with-packaging-utils
brew install --verbose --only-dependencies freecad --with-packaging-utils #Ensure all dependencies are satisfied
brew install --verbose --only-dependencies freecad --with-packaging-utils
brew install --verbose --only-dependencies freecad --with-packaging-utils #Ensure all dependencies are satisfied
# Qt5: Set Qt5 build flag and CMAKE_PREFIX
QT5_CMAKE_PREFIX=$(ls -d $(brew list -1 | grep qt | tail -1 | xargs brew --cellar)/*/lib/cmake)
CMAKE_OPTS="${CMAKE_OPTS} -DBUILD_QT5=ON -DCMAKE_PREFIX_PATH=${QT5_CMAKE_PREFIX}"
fi
# Qt5: Set Qt5 build flag and CMAKE_PREFIX
QT5_CMAKE_PREFIX=$(ls -d $(brew list -1 | grep qt | tail -1 | xargs brew --cellar)/*/lib/cmake)
CMAKE_OPTS="${CMAKE_OPTS} -DBUILD_QT5=ON -DCMAKE_PREFIX_PATH=${QT5_CMAKE_PREFIX}"
#Install the 3DConnexion frameworks
if [ "${DEPLOY}" == "1" ]; then
Expand Down

2 comments on commit 178e5dd

@arvidtp
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MacOS Qt5 0.17 build seems particularly smaller after this commit and crashes immediately on launch. Might there be some problem with this changeset?

@peterlama
Copy link
Contributor Author

@peterlama peterlama commented on 178e5dd Oct 31, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, the problem is unrelated to this and has existed for quite awhile now. It happens when the dependency cache fails to download and the libraries are installed with homebrew. Usually you just have to wait for a build where the download worked. I don't think I can do anything about the download problem, but I might be able to fix the error that occurs when things are installed instead of using the cache.

Please sign in to comment.