-
Notifications
You must be signed in to change notification settings - Fork 125
testing travis-ci on osx #29
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
73 commits
Select commit
Hold shift + click to select a range
f6d43a5
testing travis-ci on osx
luzpaz e6a9935
Update .travis.yml
luzpaz 2e138c0
Update .travis.yml
luzpaz a495bd7
Update .travis.yml
luzpaz a1a21c4
Update .travis.yml
luzpaz 691ffb3
Update .travis.yml
luzpaz 7008d7e
Update .travis.yml
luzpaz bcbd904
Update .travis.yml
luzpaz a27778d
Update .travis.yml
luzpaz 37f0e43
Update .travis.yml
luzpaz ed132af
Update .travis.yml
luzpaz 2570d34
Update .travis.yml
luzpaz 873b3f3
Update .travis.yml
luzpaz 751edd8
Update .travis.yml
luzpaz 1ee0811
Update .travis.yml
luzpaz 320a53a
Update .travis.yml
luzpaz c16fac7
removed broken args block
luzpaz 6c17220
fixed script block
luzpaz 91303f9
Update .travis.yml
luzpaz 16fce6d
fixing zlib issue
luzpaz 056e949
Update .travis.yml
luzpaz a667ce8
Update .travis.yml
luzpaz 569e950
Update .travis.yml
luzpaz 7b4c328
added all (CPP|LD)FLAGS
luzpaz 975afbb
fixed formatting of exported env vars
luzpaz 507672a
changed CPP to CXX
luzpaz 32b18fc
removed svnheader flag
luzpaz 4ddb175
testing CMAKE_PREFIX_PATH
luzpaz f83bcba
Update .travis.yml
luzpaz ffc6d5f
CMAKE_PREFIX_PATH=/usr/local/opt/zlib
luzpaz 0b6f05a
debugging /usr/local/opt/zlib + commenting out librevenge
luzpaz db71a5c
added brew link --force zlib
luzpaz 841288d
uncomment librevenge + OSG + minor refinements
luzpaz 86fdeed
changed install: block to script: per the docs
luzpaz 121439e
removed python install since already exists in Travis
luzpaz 55f2db2
Integrating OSX in to current yml
luzpaz 221e119
formatting + hopefully trigger travis
luzpaz f4e1946
reverted some formatting
luzpaz a683257
testing travis trigger (still won't build)
luzpaz 8fa15a6
sudo:true instead of sudo:required ?
luzpaz ee2cbf4
returned to matrix
luzpaz 5a44988
changed cpp to c++
luzpaz 3152908
uncommn
luzpaz c990193
Update .travis.yml
luzpaz dfcdb39
Update .travis.yml
luzpaz 32b75e2
Update .travis.yml
luzpaz a4461a0
Update .travis.yml
luzpaz 4d2fad2
removed echo OS
luzpaz 8653259
Trying to fix linter errors
luzpaz d7ec8ab
added missing ;
luzpaz 3e46168
trying suggestion from yaml-online-parser.appspot.com
luzpaz 203567a
Ok builds! Now fix builds so they build
luzpaz f974e18
formatting of if statement
luzpaz 026db6c
remove ;
luzpaz 6ae8bcf
excluding osx gcc
luzpaz 95edc97
missing semicolon
luzpaz 4770df7
merged compiler statement
luzpaz 13e024a
excluded dist: precise
luzpaz 1cfcdd0
Update .travis.yml
luzpaz 48162fb
trying again to remove dist:precise
luzpaz a27485f
try again
luzpaz 16a8986
and again
luzpaz deaac89
fixing compiler line
luzpaz 379b33a
forgot ':'
luzpaz 240b3b5
formatting typo in exclude line
luzpaz c28414b
added another linux clause (kind of redundant)
luzpaz d36ce87
Success getting 3 builds (fixing their order)
luzpaz 0214f8a
Update .travis.yml
luzpaz 496bda0
removed 'make install' from linux builds (why did @QuLogic not 'make …
luzpaz e096490
error.. fixed previous commit
luzpaz 4ca7d26
added -y flag to apt-get install
luzpaz f52eaaf
added make -j8 to osx build
luzpaz 7af00e2
adding -DWANT_GUI_LANG=en_US to shorten build time
luzpaz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,77 @@ | ||
| language: cpp | ||
| language: c++ | ||
|
|
||
| compiler: | ||
| - gcc | ||
| - clang | ||
|
|
||
| dist: trusty | ||
| matrix: | ||
| include: | ||
| - os: linux | ||
| dist: trusty | ||
| sudo: required | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. And this? |
||
| compiler: | ||
| - gcc | ||
| - os: linux | ||
| dist: trusty | ||
| sudo: required | ||
| compiler: | ||
| - clang | ||
| - os: osx | ||
| compiler: clang | ||
| exclude: | ||
| - os: osx | ||
| compiler: gcc | ||
| - os: linux | ||
| dist: precise | ||
|
|
||
| before_install: | ||
| - sudo apt-get update -qq | ||
| - sudo apt-get install cmake libboost-python-dev libcups2-dev libhunspell-dev | ||
| libhyphen-dev liblcms2-dev libpodofo-dev libtiff-dev libxml2-dev | ||
| python-all-dev zlib1g-dev qtbase5-dev qtdeclarative5-dev libqt5opengl5-dev | ||
| qttools5-dev qttools5-dev-tools libgraphicsmagick++1-dev | ||
| libopenscenegraph-dev libpoppler-dev libcairo2-dev libwpg-dev libmspub-dev | ||
| libcdr-dev libvisio-dev | ||
| # Linux | ||
| - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get update -qq; | ||
| sudo apt-get install -y cmake libboost-python-dev libcups2-dev libhunspell-dev | ||
| libhyphen-dev liblcms2-dev libpodofo-dev libtiff-dev libxml2-dev | ||
| python-all-dev zlib1g-dev qtbase5-dev qtdeclarative5-dev libqt5opengl5-dev | ||
| qttools5-dev qttools5-dev-tools libgraphicsmagick++1-dev | ||
| libopenscenegraph-dev libpoppler-dev libcairo2-dev libwpg-dev libmspub-dev | ||
| libcdr-dev libvisio-dev; | ||
| fi | ||
| # OSX | ||
| # - if [ $TRAVIS_OS_NAME == osx ]; then brew --env && brew config && brew list; fi | ||
| - if [ $TRAVIS_OS_NAME == osx ]; then brew update; | ||
| brew outdated cmake --verbose || brew upgrade cmake; | ||
| brew tap homebrew/dupes && brew install homebrew/dupes/zlib && brew link --force zlib; | ||
| brew install xz little-cms2 cairo qt5 hunspell ghostscript graphicsmagick poppler podofo; | ||
| brew outdated jpeg --verbose || brew upgrade jpeg; | ||
| brew outdated libtiff --verbose || brew upgrade libtiff; | ||
| brew outdated fontconfig --verbose || brew upgrade fontconfig; | ||
| brew install openssl && brew link --force openssl; | ||
| brew outdated pkg-config --verbose || brew upgrade pkg-config; | ||
| brew outdated boost || brew upgrade boost; | ||
| brew outdated freetype || brew upgrade freetype; | ||
| brew install librevenge libwpg libvisio libmspub libcdr libpagemaker libfreehand open-scene-graph; | ||
| fi | ||
| # - export LDFLAGS+=-L/usr/local/opt/zlib/lib:-L/usr/local/opt/gettext/lib:-L/usr/local/opt/libffi/lib:-L/usr/local/opt/qt5/lib:-L/usr/local/opt/sqlite/lib:-L/usr/local/opt/openssl/lib:-L/usr/local/opt/icu4c/lib | ||
| # - export CXXFLAGS+=-I/usr/local/opt/zlib/include:-I/usr/local/opt/gettext/include:-I/usr/local/opt/qt5/include:-I/usr/local/opt/sqlite/include:-I/usr/local/opt/openssl/include:-I/usr/local/opt/icu4c/include | ||
|
|
||
| script: | ||
| - if [[ $CC == gcc ]]; then | ||
| export NPROC=8; | ||
| else | ||
| export NPROC=1; | ||
| - if [ $TRAVIS_OS_NAME == linux ]; then | ||
| if [[ $CC == gcc ]]; then | ||
| export NPROC=8; | ||
| else | ||
| export NPROC=1; | ||
| fi; | ||
| cmake . -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=0 -DWANT_SVNVERSION=0 -DWANT_GUI_LANG=en_US; | ||
| make -j"$NPROC"; | ||
| fi | ||
|
|
||
|
|
||
| - cmake . | ||
| - make -j$NPROC | ||
|
|
||
| - if [ $TRAVIS_OS_NAME = osx -a $CC = clang ]; then | ||
| cmake . -DCMAKE_PREFIX_PATH=/usr/local/opt/zlib -DBUILD_OSX_BUNDLE=1 -DQT_PREFIX=/usr/local/opt/qt5 -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=0 -DWANT_SVNVERSION=0 -DWANT_GUI_LANG=en_US; | ||
| make -j8; | ||
| make install; | ||
| fi | ||
|
|
||
| notifications: | ||
| email: false | ||
| irc: | ||
| channels: | ||
| - "chat.freenode.net#scribus-dev" | ||
| template: | ||
| - "%{repository}/%{branch} (%{commit} - %{author}): %{build_url}: %{message}" | ||
| on_success: always | ||
| on_failure: always | ||
| - email: false | ||
| - irc: | ||
| - channels: | ||
| - "chat.freenode.net#scribus-dev" | ||
| - template: | ||
| - "%{repository}/%{branch} (%{commit} - %{author}): %{build_url}: %{message}" | ||
| - on_success: always | ||
| - on_failure: always | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why remove this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, you moved this down below, hmm...