From f6d43a599058bb6ce840b409ea507b5767ad7f69 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Sun, 4 Oct 2015 11:12:39 -0500 Subject: [PATCH 01/73] testing travis-ci on osx --- .travis.yml | 83 ++++++++++++++++++++++++++++++++++------------------- 1 file changed, 54 insertions(+), 29 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0445bc1a66..2a4c8ea0a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,36 +1,61 @@ -language: cpp +matrix: + include: + - os: linux + dist: trusty + sudo: required + - os: osx -compiler: - - gcc - - clang - -dist: trusty +language: c++ +compiler: clang 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 +#- if [ $TRAVIS_OS_NAME == linux ]; then 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; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew tap luzpaz/scribustravis && brew install --HEAD scribustravis --verbose; fi +# - brew update +# - brew outdated xz || brew upgrade xz +# - brew outdated cmake || brew upgrade cmake +# - brew outdated little-cms2 || brew upgrade little-cms2 +# - brew outdated xz || brew upgrade xz +# - brew outdated qt5 || brew upgrade qt5 +# - brew outdated cairo || brew upgrade cairo +# - brew outdated jpeg || brew upgrade jpeg +# - brew outdated libtiff || brew upgrade libtiff +# - brew outdated fontconfig || brew upgrade fontconfig +# - brew outdated openssl || brew upgrade openssl +# - brew outdated pkg-config || brew upgrade pkg-config +# - brew outdated python || brew upgrade python +# - brew outdated hunspell || brew upgrade hunspell +# - brew outdated homebrew/dupes/zlib || brew upgrade homebrew/dupes/zlib +# - brew outdated ghostscript || brew upgrade ghostscript +# - brew outdated graphicsmagick || brew upgrade graphicsmagick +# - brew outdated boost || brew upgrade boost +# - brew outdated poppler || brew upgrade poppler +# - brew outdated podofo || brew upgrade podofo +# - brew outdated poppler || brew upgrade poppler +# - brew outdated freetype || brew upgrade freetype -script: - - if [[ $CC == gcc ]]; then - export NPROC=8; - else - export NPROC=1; - fi - - cmake . - - make -j$NPROC +install: + args = %W[ + -DBUILD_OSX_BUNDLE=1 + -DCMAKE_INSTALL_PREFIX:PATH=#{prefix}/Scribus.app/Contents/ + -DQT_PREFIX=#{Formula["qt5"].opt_prefix} + -DWANT_HUNSPELL=1 + -DWITH_PODOFO=1 + -DWANT_GRAPHICSMAGICK=1 + -DWANT_SVNVERSION=1 + -DWANT_DEBUG=1 + ] + system "cmake", ".", *args + system "make" + system "make install" 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: + - kunda@scribus.net From e6a993542705572f168205a515f762da98d7ec71 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Sun, 4 Oct 2015 22:26:53 -0500 Subject: [PATCH 02/73] Update .travis.yml --- .travis.yml | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2a4c8ea0a3..a998aca76c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,29 +16,27 @@ before_install: # qttools5-dev qttools5-dev-tools libgraphicsmagick++1-dev # libopenscenegraph-dev libpoppler-dev libcairo2-dev libwpg-dev libmspub-dev # libcdr-dev libvisio-dev; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew tap luzpaz/scribustravis && brew install --HEAD scribustravis --verbose; fi -# - brew update -# - brew outdated xz || brew upgrade xz -# - brew outdated cmake || brew upgrade cmake -# - brew outdated little-cms2 || brew upgrade little-cms2 -# - brew outdated xz || brew upgrade xz -# - brew outdated qt5 || brew upgrade qt5 -# - brew outdated cairo || brew upgrade cairo -# - brew outdated jpeg || brew upgrade jpeg -# - brew outdated libtiff || brew upgrade libtiff -# - brew outdated fontconfig || brew upgrade fontconfig -# - brew outdated openssl || brew upgrade openssl -# - brew outdated pkg-config || brew upgrade pkg-config -# - brew outdated python || brew upgrade python -# - brew outdated hunspell || brew upgrade hunspell -# - brew outdated homebrew/dupes/zlib || brew upgrade homebrew/dupes/zlib -# - brew outdated ghostscript || brew upgrade ghostscript -# - brew outdated graphicsmagick || brew upgrade graphicsmagick -# - brew outdated boost || brew upgrade boost -# - brew outdated poppler || brew upgrade poppler -# - brew outdated podofo || brew upgrade podofo -# - brew outdated poppler || brew upgrade poppler -# - brew outdated freetype || brew upgrade freetype +# - if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew tap luzpaz/scribustravis && brew install --HEAD scribustravis --verbose; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew --env && brew config; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated xz || brew upgrade xz; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated cmake || brew upgrade cmake; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated little-cms2 || brew upgrade little-cms2; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated qt5 || brew upgrade qt5; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated cairo || brew upgrade cairo; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated jpeg || brew upgrade jpeg; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated libtiff || brew upgrade libtiff; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated fontconfig || brew upgrade fontconfig; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated openssl || brew upgrade openssl; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated pkg-config || brew upgrade pkg-config; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated python || brew upgrade python; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated hunspell || brew upgrade hunspell; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated homebrew/dupes/zlib || brew upgrade homebrew/dupes/zlib; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated ghostscript || brew upgrade ghostscript; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated graphicsmagick || brew upgrade graphicsmagick; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated boost || brew upgrade boost; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated poppler || brew upgrade poppler; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated podofo || brew upgrade podofo; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated freetype || brew upgrade freetype; fi install: From 2e138c018f455a08cf89045920f9cb2344940ec3 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Sun, 4 Oct 2015 22:45:53 -0500 Subject: [PATCH 03/73] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a998aca76c..2ced4ea992 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ before_install: # libcdr-dev libvisio-dev; fi # - if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew tap luzpaz/scribustravis && brew install --HEAD scribustravis --verbose; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew --env && brew config; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated xz || brew upgrade xz; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew install xz; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated cmake || brew upgrade cmake; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated little-cms2 || brew upgrade little-cms2; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated qt5 || brew upgrade qt5; fi From a495bd713d6a8f1e1c6f172adac71df226bd0920 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Sun, 4 Oct 2015 23:05:41 -0500 Subject: [PATCH 04/73] Update .travis.yml --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2ced4ea992..be10ddd823 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,9 +18,10 @@ before_install: # libcdr-dev libvisio-dev; fi # - if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew tap luzpaz/scribustravis && brew install --HEAD scribustravis --verbose; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew --env && brew config; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew install xz; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated cmake || brew upgrade cmake; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated little-cms2 || brew upgrade little-cms2; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew list --verbose; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew install xz --verbose ; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew install cmake || brew upgrade cmake; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew install little-cms2; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated qt5 || brew upgrade qt5; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated cairo || brew upgrade cairo; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated jpeg || brew upgrade jpeg; fi From a1a21c4fd398ee4b3e7836f9f73755b53d7401c2 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Sun, 4 Oct 2015 23:09:31 -0500 Subject: [PATCH 05/73] Update .travis.yml --- .travis.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index be10ddd823..37b7ae8a28 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,12 +18,10 @@ before_install: # libcdr-dev libvisio-dev; fi # - if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew tap luzpaz/scribustravis && brew install --HEAD scribustravis --verbose; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew --env && brew config; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew list --verbose; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew install xz --verbose ; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew install cmake || brew upgrade cmake; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew install little-cms2; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew list; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew install xz little-cms2 cairo --verbose ; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew install cmake; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated qt5 || brew upgrade qt5; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated cairo || brew upgrade cairo; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated jpeg || brew upgrade jpeg; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated libtiff || brew upgrade libtiff; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated fontconfig || brew upgrade fontconfig; fi From 691ffb3721a96bc1db5c8c897beabe20245ac8af Mon Sep 17 00:00:00 2001 From: luzpaz Date: Sun, 4 Oct 2015 23:18:58 -0500 Subject: [PATCH 06/73] Update .travis.yml --- .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 37b7ae8a28..8b1947bbc8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,14 +20,14 @@ before_install: - if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew --env && brew config; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew list; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew install xz little-cms2 cairo --verbose ; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew install cmake; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated qt5 || brew upgrade qt5; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated jpeg || brew upgrade jpeg; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated libtiff || brew upgrade libtiff; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated fontconfig || brew upgrade fontconfig; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated openssl || brew upgrade openssl; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated pkg-config || brew upgrade pkg-config; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated python || brew upgrade python; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated cmake --verbose || brew upgrade cmake; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated qt5 --verbose || brew upgrade qt5; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated jpeg --verbose || brew upgrade jpeg; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated libtiff --verbose || brew upgrade libtiff; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated fontconfig --verbose || brew upgrade fontconfig; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated openssl --verbose || brew upgrade openssl; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated pkg-config --verbose || brew upgrade pkg-config; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated python --verbose || brew upgrade python; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated hunspell || brew upgrade hunspell; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated homebrew/dupes/zlib || brew upgrade homebrew/dupes/zlib; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated ghostscript || brew upgrade ghostscript; fi From 7008d7ed8c21c4e7e174023ff6972c94902da265 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Sun, 4 Oct 2015 23:27:37 -0500 Subject: [PATCH 07/73] Update .travis.yml --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8b1947bbc8..627cce0f20 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,11 +17,11 @@ before_install: # libopenscenegraph-dev libpoppler-dev libcairo2-dev libwpg-dev libmspub-dev # libcdr-dev libvisio-dev; fi # - if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew tap luzpaz/scribustravis && brew install --HEAD scribustravis --verbose; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew --env && brew config; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew update; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew --env && brew config; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew list; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew install xz little-cms2 cairo --verbose ; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated cmake --verbose || brew upgrade cmake; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated qt5 --verbose || brew upgrade qt5; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew install xz little-cms2 cairo qt5 --verbose ; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated jpeg --verbose || brew upgrade jpeg; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated libtiff --verbose || brew upgrade libtiff; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated fontconfig --verbose || brew upgrade fontconfig; fi From bcbd904248ba0b00ad5f412ebf1f031276f65b61 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Sun, 4 Oct 2015 23:40:17 -0500 Subject: [PATCH 08/73] Update .travis.yml --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 627cce0f20..485c73c72c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,13 +21,12 @@ before_install: - if [ $TRAVIS_OS_NAME == osx ]; then brew --env && brew config; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew list; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated cmake --verbose || brew upgrade cmake; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew install xz little-cms2 cairo qt5 --verbose ; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew install xz little-cms2 cairo qt5 python --verbose ; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated jpeg --verbose || brew upgrade jpeg; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated libtiff --verbose || brew upgrade libtiff; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated fontconfig --verbose || brew upgrade fontconfig; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated openssl --verbose || brew upgrade openssl; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated pkg-config --verbose || brew upgrade pkg-config; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated python --verbose || brew upgrade python; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated hunspell || brew upgrade hunspell; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated homebrew/dupes/zlib || brew upgrade homebrew/dupes/zlib; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated ghostscript || brew upgrade ghostscript; fi From a27778d167d1411499f2ddef01560a179f1aff87 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Sun, 4 Oct 2015 23:49:11 -0500 Subject: [PATCH 09/73] Update .travis.yml --- .travis.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 485c73c72c..6e1b59e919 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ matrix: include: - - os: linux - dist: trusty - sudo: required +# - os: linux +# dist: trusty +# sudo: required - os: osx language: c++ @@ -21,16 +21,12 @@ before_install: - if [ $TRAVIS_OS_NAME == osx ]; then brew --env && brew config; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew list; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated cmake --verbose || brew upgrade cmake; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew install xz little-cms2 cairo qt5 python --verbose ; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew install xz little-cms2 cairo qt5 python hunspell homebrew/dupes/zlib ghostscript graphicsmagick --verbose ; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated jpeg --verbose || brew upgrade jpeg; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated libtiff --verbose || brew upgrade libtiff; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated fontconfig --verbose || brew upgrade fontconfig; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated openssl --verbose || brew upgrade openssl; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated pkg-config --verbose || brew upgrade pkg-config; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated hunspell || brew upgrade hunspell; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated homebrew/dupes/zlib || brew upgrade homebrew/dupes/zlib; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated ghostscript || brew upgrade ghostscript; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated graphicsmagick || brew upgrade graphicsmagick; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated boost || brew upgrade boost; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated poppler || brew upgrade poppler; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated podofo || brew upgrade podofo; fi From 37f0e43b61b6ed2e557bfe86f6ad8c70f47302a2 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Mon, 5 Oct 2015 00:00:04 -0500 Subject: [PATCH 10/73] Update .travis.yml --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6e1b59e919..03e07ed375 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,15 +21,13 @@ before_install: - if [ $TRAVIS_OS_NAME == osx ]; then brew --env && brew config; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew list; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated cmake --verbose || brew upgrade cmake; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew install xz little-cms2 cairo qt5 python hunspell homebrew/dupes/zlib ghostscript graphicsmagick --verbose ; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew install xz little-cms2 cairo qt5 python hunspell homebrew/dupes/zlib ghostscript graphicsmagick poppler podofo --verbose ; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated jpeg --verbose || brew upgrade jpeg; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated libtiff --verbose || brew upgrade libtiff; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated fontconfig --verbose || brew upgrade fontconfig; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated openssl --verbose || brew upgrade openssl; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated pkg-config --verbose || brew upgrade pkg-config; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated boost || brew upgrade boost; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated poppler || brew upgrade poppler; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated podofo || brew upgrade podofo; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated freetype || brew upgrade freetype; fi From ed132af999f2b3111b45c051615c85793c091abd Mon Sep 17 00:00:00 2001 From: luzpaz Date: Mon, 5 Oct 2015 00:47:41 -0500 Subject: [PATCH 11/73] Update .travis.yml --- .travis.yml | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 03e07ed375..c79dc82d41 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ language: c++ compiler: clang before_install: +# Linux #- if [ $TRAVIS_OS_NAME == linux ]; then 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 @@ -16,12 +17,15 @@ before_install: # 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 update && brew tap luzpaz/scribustravis && brew install --HEAD scribustravis --verbose; fi +- echo $TRAVIS_OS_NAME - if [ $TRAVIS_OS_NAME == osx ]; then brew update; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew --env && brew config; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew list; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated cmake --verbose || brew upgrade cmake; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew install xz little-cms2 cairo qt5 python hunspell homebrew/dupes/zlib ghostscript graphicsmagick poppler podofo --verbose ; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew install xz little-cms2 cairo qt5 python hunspell homebrew/dupes/zlib ghostscript graphicsmagick poppler podofo; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated jpeg --verbose || brew upgrade jpeg; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated libtiff --verbose || brew upgrade libtiff; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated fontconfig --verbose || brew upgrade fontconfig; fi @@ -29,23 +33,27 @@ before_install: - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated pkg-config --verbose || brew upgrade pkg-config; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated boost || brew upgrade boost; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated freetype || brew upgrade freetype; fi +# Install Librevenge suite + OSG +- if [ $TRAVIS_OS_NAME == osx ]; then brew install librevenge libwpg libvisio libmspub libcdr libpagemaker libfreehand open-scene-graph --verbose; fi +before_script: + args =[ DBUILD_OSX_BUNDLE=1 + DCMAKE_INSTALL_PREFIX:PATH=#{prefix}/Scribus.app/Contents/ + DQT_PREFIX=#{Formula["qt5"].opt_prefix} + DWANT_HUNSPELL=1 + DWITH_PODOFO=1 + DWANT_GRAPHICSMAGICK=1 + DWANT_SVNVERSION=1 + DWANT_DEBUG=1 + ]; -install: - args = %W[ - -DBUILD_OSX_BUNDLE=1 - -DCMAKE_INSTALL_PREFIX:PATH=#{prefix}/Scribus.app/Contents/ - -DQT_PREFIX=#{Formula["qt5"].opt_prefix} - -DWANT_HUNSPELL=1 - -DWITH_PODOFO=1 - -DWANT_GRAPHICSMAGICK=1 - -DWANT_SVNVERSION=1 - -DWANT_DEBUG=1 - ] - system "cmake", ".", *args - system "make" - system "make install" - +script: +#OSX + - if [[ $TRAVIS_OS_NAME == "osx" ]] ; then + cmake . $args + make + make install; + fi notifications: email: - kunda@scribus.net From 2570d34e0e23aec2eefb92cb979ff679300bc491 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Mon, 5 Oct 2015 01:23:35 -0500 Subject: [PATCH 12/73] Update .travis.yml --- .travis.yml | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index c79dc82d41..96aebfa307 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,10 @@ matrix: language: c++ compiler: clang +branches: + only: + - master + before_install: # Linux #- if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get update -qq && @@ -37,20 +41,21 @@ before_install: - if [ $TRAVIS_OS_NAME == osx ]; then brew install librevenge libwpg libvisio libmspub libcdr libpagemaker libfreehand open-scene-graph --verbose; fi before_script: - args =[ DBUILD_OSX_BUNDLE=1 - DCMAKE_INSTALL_PREFIX:PATH=#{prefix}/Scribus.app/Contents/ - DQT_PREFIX=#{Formula["qt5"].opt_prefix} - DWANT_HUNSPELL=1 - DWITH_PODOFO=1 - DWANT_GRAPHICSMAGICK=1 - DWANT_SVNVERSION=1 - DWANT_DEBUG=1 - ]; +# args =[ -DBUILD_OSX_BUNDLE=1 +# -DCMAKE_INSTALL_PREFIX:PATH=/usr/local/Scribus.app/Contents/ +# -DQT_PREFIX=/usr/local/opt/qt5 +# -DWANT_HUNSPELL=1 +# -DWITH_PODOFO=1 +# -DWANT_GRAPHICSMAGICK=1 +# -DWANT_SVNVERSION=1 +# -DWANT_DEBUG=1 +# ]; script: #OSX - if [[ $TRAVIS_OS_NAME == "osx" ]] ; then - cmake . $args +# cmake . $args + cmake . -DBUILD_OSX_BUNDLE=1 -DCMAKE_INSTALL_PREFIX:PATH=/usr/local/Scribus.app/Contents/ -DQT_PREFIX=/usr/local/opt/qt5 -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_SVNVERSION=1 -DWANT_DEBUG=1 make make install; fi From 873b3f3c90247c234fe677a6b21f6a41c3ccc91c Mon Sep 17 00:00:00 2001 From: luzpaz Date: Mon, 5 Oct 2015 01:26:03 -0500 Subject: [PATCH 13/73] Update .travis.yml --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 96aebfa307..0ba1c4cd20 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,9 +8,10 @@ matrix: language: c++ compiler: clang -branches: - only: - - master + +# branches: +# only: +# - master # This won't work with PR requests in github before_install: # Linux From 751edd8ef815e848d33f7d78373f498d43398d19 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Mon, 5 Oct 2015 01:29:23 -0500 Subject: [PATCH 14/73] Update .travis.yml --- .travis.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0ba1c4cd20..33eac69c06 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,10 +9,6 @@ language: c++ compiler: clang -# branches: -# only: -# - master # This won't work with PR requests in github - before_install: # Linux #- if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get update -qq && @@ -41,7 +37,7 @@ before_install: # Install Librevenge suite + OSG - if [ $TRAVIS_OS_NAME == osx ]; then brew install librevenge libwpg libvisio libmspub libcdr libpagemaker libfreehand open-scene-graph --verbose; fi -before_script: +# before_script: # args =[ -DBUILD_OSX_BUNDLE=1 # -DCMAKE_INSTALL_PREFIX:PATH=/usr/local/Scribus.app/Contents/ # -DQT_PREFIX=/usr/local/opt/qt5 From 1ee0811124cde7e1092da08648bf0e6a7211606e Mon Sep 17 00:00:00 2001 From: luzpaz Date: Mon, 5 Oct 2015 01:48:36 -0500 Subject: [PATCH 15/73] Update .travis.yml --- .travis.yml | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 33eac69c06..c79dc82d41 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,6 @@ matrix: language: c++ compiler: clang - before_install: # Linux #- if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get update -qq && @@ -37,22 +36,21 @@ before_install: # Install Librevenge suite + OSG - if [ $TRAVIS_OS_NAME == osx ]; then brew install librevenge libwpg libvisio libmspub libcdr libpagemaker libfreehand open-scene-graph --verbose; fi -# before_script: -# args =[ -DBUILD_OSX_BUNDLE=1 -# -DCMAKE_INSTALL_PREFIX:PATH=/usr/local/Scribus.app/Contents/ -# -DQT_PREFIX=/usr/local/opt/qt5 -# -DWANT_HUNSPELL=1 -# -DWITH_PODOFO=1 -# -DWANT_GRAPHICSMAGICK=1 -# -DWANT_SVNVERSION=1 -# -DWANT_DEBUG=1 -# ]; +before_script: + args =[ DBUILD_OSX_BUNDLE=1 + DCMAKE_INSTALL_PREFIX:PATH=#{prefix}/Scribus.app/Contents/ + DQT_PREFIX=#{Formula["qt5"].opt_prefix} + DWANT_HUNSPELL=1 + DWITH_PODOFO=1 + DWANT_GRAPHICSMAGICK=1 + DWANT_SVNVERSION=1 + DWANT_DEBUG=1 + ]; script: #OSX - if [[ $TRAVIS_OS_NAME == "osx" ]] ; then -# cmake . $args - cmake . -DBUILD_OSX_BUNDLE=1 -DCMAKE_INSTALL_PREFIX:PATH=/usr/local/Scribus.app/Contents/ -DQT_PREFIX=/usr/local/opt/qt5 -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_SVNVERSION=1 -DWANT_DEBUG=1 + cmake . $args make make install; fi From 320a53a3ffffea50365d35c54103e334706f9ecb Mon Sep 17 00:00:00 2001 From: luzpaz Date: Mon, 5 Oct 2015 01:51:06 -0500 Subject: [PATCH 16/73] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c79dc82d41..bc6b67acbf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,7 +50,7 @@ before_script: script: #OSX - if [[ $TRAVIS_OS_NAME == "osx" ]] ; then - cmake . $args + cmake . -DBUILD_OSX_BUNDLE=1 -DCMAKE_INSTALL_PREFIX:PATH=/usr/local/Scribus.app/Contents/ -DQT_PREFIX=/usr/local/opt/qt5 -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_SVNVERSION=1 -DWANT_DEBUG=1 make make install; fi From c16fac78298f295bc9e99fe1f181fff8dc279c0d Mon Sep 17 00:00:00 2001 From: luzpaz Date: Mon, 5 Oct 2015 02:04:49 -0500 Subject: [PATCH 17/73] removed broken args block --- .travis.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index bc6b67acbf..3aeb195e1d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,17 +36,6 @@ before_install: # Install Librevenge suite + OSG - if [ $TRAVIS_OS_NAME == osx ]; then brew install librevenge libwpg libvisio libmspub libcdr libpagemaker libfreehand open-scene-graph --verbose; fi -before_script: - args =[ DBUILD_OSX_BUNDLE=1 - DCMAKE_INSTALL_PREFIX:PATH=#{prefix}/Scribus.app/Contents/ - DQT_PREFIX=#{Formula["qt5"].opt_prefix} - DWANT_HUNSPELL=1 - DWITH_PODOFO=1 - DWANT_GRAPHICSMAGICK=1 - DWANT_SVNVERSION=1 - DWANT_DEBUG=1 - ]; - script: #OSX - if [[ $TRAVIS_OS_NAME == "osx" ]] ; then From 6c17220b977f5cfe013ba4f95b93cd11d5564e97 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Mon, 5 Oct 2015 02:19:57 -0500 Subject: [PATCH 18/73] fixed script block --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3aeb195e1d..5c9b126f5b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,15 +34,15 @@ before_install: - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated boost || brew upgrade boost; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated freetype || brew upgrade freetype; fi # Install Librevenge suite + OSG -- if [ $TRAVIS_OS_NAME == osx ]; then brew install librevenge libwpg libvisio libmspub libcdr libpagemaker libfreehand open-scene-graph --verbose; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew install librevenge libwpg libvisio libmspub libcdr libpagemaker libfreehand open-scene-graph; fi script: #OSX - - if [[ $TRAVIS_OS_NAME == "osx" ]] ; then - cmake . -DBUILD_OSX_BUNDLE=1 -DCMAKE_INSTALL_PREFIX:PATH=/usr/local/Scribus.app/Contents/ -DQT_PREFIX=/usr/local/opt/qt5 -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_SVNVERSION=1 -DWANT_DEBUG=1 - make - make install; - fi +# - if [[ $TRAVIS_OS_NAME == "osx" ]] ; then + cmake . -DBUILD_OSX_BUNDLE=1 -DCMAKE_INSTALL_PREFIX:PATH=/usr/local/Scribus.app/Contents/ -DQT_PREFIX=/usr/local/opt/qt5 -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_SVNVERSION=1 -DWANT_DEBUG=1 + make + make install + notifications: email: - kunda@scribus.net From 91303f977ca319799dd00154cefd180c8f7ea2a7 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Mon, 5 Oct 2015 02:32:47 -0500 Subject: [PATCH 19/73] Update .travis.yml --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5c9b126f5b..0e969f64e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,9 +39,9 @@ before_install: script: #OSX # - if [[ $TRAVIS_OS_NAME == "osx" ]] ; then - cmake . -DBUILD_OSX_BUNDLE=1 -DCMAKE_INSTALL_PREFIX:PATH=/usr/local/Scribus.app/Contents/ -DQT_PREFIX=/usr/local/opt/qt5 -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_SVNVERSION=1 -DWANT_DEBUG=1 - make - make install + - cmake . -DBUILD_OSX_BUNDLE=1 -DCMAKE_INSTALL_PREFIX=/usr/local/Scribus.app/Contents/ -DQT_PREFIX=/usr/local/opt/qt5 -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_SVNVERSION=1 -DWANT_DEBUG=1 + - make + - make install notifications: email: From 16fce6d7bb4f54f7999c36788e59a32a19e4d7d3 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Mon, 5 Oct 2015 07:29:07 -0500 Subject: [PATCH 20/73] fixing zlib issue --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0e969f64e4..580338dbf6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,8 @@ before_install: - if [ $TRAVIS_OS_NAME == osx ]; then brew --env && brew config; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew list; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated cmake --verbose || brew upgrade cmake; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew install xz little-cms2 cairo qt5 python hunspell homebrew/dupes/zlib ghostscript graphicsmagick poppler podofo; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew tap homebrew/dupes && brew install homebrew/dupes/zlib; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew install xz little-cms2 cairo qt5 python hunspell ghostscript graphicsmagick poppler podofo; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated jpeg --verbose || brew upgrade jpeg; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated libtiff --verbose || brew upgrade libtiff; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated fontconfig --verbose || brew upgrade fontconfig; fi From 056e94961ab4f62ca99aba399a0dbfdb40329c80 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Mon, 5 Oct 2015 11:29:19 -0500 Subject: [PATCH 21/73] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 580338dbf6..a6ae7dea11 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ before_install: - if [ $TRAVIS_OS_NAME == osx ]; then brew --env && brew config; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew list; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated cmake --verbose || brew upgrade cmake; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew tap homebrew/dupes && brew install homebrew/dupes/zlib; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew tap homebrew/dupes && brew install homebrew/dupes/zlib && CPPFLAGS += -I/usr/include/ncursesw; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew install xz little-cms2 cairo qt5 python hunspell ghostscript graphicsmagick poppler podofo; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated jpeg --verbose || brew upgrade jpeg; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated libtiff --verbose || brew upgrade libtiff; fi @@ -40,7 +40,7 @@ before_install: script: #OSX # - if [[ $TRAVIS_OS_NAME == "osx" ]] ; then - - cmake . -DBUILD_OSX_BUNDLE=1 -DCMAKE_INSTALL_PREFIX=/usr/local/Scribus.app/Contents/ -DQT_PREFIX=/usr/local/opt/qt5 -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_SVNVERSION=1 -DWANT_DEBUG=1 + - cmake . -DCMAKE_LIBRARY_PATH=/usr/local -DBUILD_OSX_BUNDLE=1 -DCMAKE_INSTALL_PREFIX=/usr/local/Scribus.app/Contents/ -DQT_PREFIX=/usr/local/opt/qt5 -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_SVNVERSION=1 -DWANT_DEBUG=1 - make - make install From a667ce87d839d5f1c98e912579efddb727caa002 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Mon, 5 Oct 2015 11:38:38 -0500 Subject: [PATCH 22/73] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a6ae7dea11..4034da2265 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ before_install: - if [ $TRAVIS_OS_NAME == osx ]; then brew --env && brew config; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew list; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated cmake --verbose || brew upgrade cmake; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew tap homebrew/dupes && brew install homebrew/dupes/zlib && CPPFLAGS += -I/usr/include/ncursesw; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew tap homebrew/dupes && brew install homebrew/dupes/zlib; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew install xz little-cms2 cairo qt5 python hunspell ghostscript graphicsmagick poppler podofo; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated jpeg --verbose || brew upgrade jpeg; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated libtiff --verbose || brew upgrade libtiff; fi From 569e950ddbd65e2e64f4c09961ad7b09474080e4 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Mon, 5 Oct 2015 12:09:02 -0500 Subject: [PATCH 23/73] Update .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 4034da2265..aa969f7e4b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,6 +40,8 @@ before_install: script: #OSX # - if [[ $TRAVIS_OS_NAME == "osx" ]] ; then + - export LDFLAGS+=-L/usr/local/opt/zlib/lib + - export CPPFLAGS+=-I/usr/local/opt/zlib/include - cmake . -DCMAKE_LIBRARY_PATH=/usr/local -DBUILD_OSX_BUNDLE=1 -DCMAKE_INSTALL_PREFIX=/usr/local/Scribus.app/Contents/ -DQT_PREFIX=/usr/local/opt/qt5 -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_SVNVERSION=1 -DWANT_DEBUG=1 - make - make install From 7b4c32860c42682955b2cd2e7e9aed80da20ecfa Mon Sep 17 00:00:00 2001 From: luzpaz Date: Mon, 5 Oct 2015 12:29:16 -0500 Subject: [PATCH 24/73] added all (CPP|LD)FLAGS --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index aa969f7e4b..dbd178a83a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,13 +36,14 @@ before_install: - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated freetype || brew upgrade freetype; fi # Install Librevenge suite + OSG - if [ $TRAVIS_OS_NAME == osx ]; then 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 CPPFLAGS+=-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: +install: #OSX # - if [[ $TRAVIS_OS_NAME == "osx" ]] ; then - - export LDFLAGS+=-L/usr/local/opt/zlib/lib - - export CPPFLAGS+=-I/usr/local/opt/zlib/include - - cmake . -DCMAKE_LIBRARY_PATH=/usr/local -DBUILD_OSX_BUNDLE=1 -DCMAKE_INSTALL_PREFIX=/usr/local/Scribus.app/Contents/ -DQT_PREFIX=/usr/local/opt/qt5 -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_SVNVERSION=1 -DWANT_DEBUG=1 +# is this relevant? -DCMAKE_LIBRARY_PATH=/usr/local + - cmake . -DBUILD_OSX_BUNDLE=1 -DCMAKE_INSTALL_PREFIX=/usr/local/Scribus.app/Contents/ -DQT_PREFIX=/usr/local/opt/qt5 -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_SVNVERSION=1 -DWANT_DEBUG=1 - make - make install From 975afbb9c2c34b237dd96d3906f35ee5b1ca14db Mon Sep 17 00:00:00 2001 From: luzpaz Date: Mon, 5 Oct 2015 13:49:16 -0500 Subject: [PATCH 25/73] fixed formatting of exported env vars --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index dbd178a83a..1d5acde92e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,8 +36,8 @@ before_install: - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated freetype || brew upgrade freetype; fi # Install Librevenge suite + OSG - if [ $TRAVIS_OS_NAME == osx ]; then 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 CPPFLAGS+=-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 +- 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 CPPFLAGS+=-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 install: #OSX From 507672a5c894d6d6fd399a7f95813506047b7fee Mon Sep 17 00:00:00 2001 From: luzpaz Date: Mon, 5 Oct 2015 14:37:37 -0500 Subject: [PATCH 26/73] changed CPP to CXX --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1d5acde92e..42717def82 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ before_install: # Install Librevenge suite + OSG - if [ $TRAVIS_OS_NAME == osx ]; then 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 CPPFLAGS+=-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 +- 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 install: #OSX From 32b18fcf59fb8ddd2c4cae69f651d52db7d12669 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Mon, 5 Oct 2015 14:49:50 -0500 Subject: [PATCH 27/73] removed svnheader flag --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 42717def82..9feba54469 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,11 +39,12 @@ before_install: - 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 + install: #OSX # - if [[ $TRAVIS_OS_NAME == "osx" ]] ; then # is this relevant? -DCMAKE_LIBRARY_PATH=/usr/local - - cmake . -DBUILD_OSX_BUNDLE=1 -DCMAKE_INSTALL_PREFIX=/usr/local/Scribus.app/Contents/ -DQT_PREFIX=/usr/local/opt/qt5 -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_SVNVERSION=1 -DWANT_DEBUG=1 + - cmake . -DBUILD_OSX_BUNDLE=1 -DCMAKE_INSTALL_PREFIX=/usr/local/Scribus.app/Contents/ -DQT_PREFIX=/usr/local/opt/qt5 -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=1 - make - make install From 4ddb17567c9b99b1f1bed953ed1e9df20c5524de Mon Sep 17 00:00:00 2001 From: luzpaz Date: Mon, 5 Oct 2015 14:57:28 -0500 Subject: [PATCH 28/73] testing CMAKE_PREFIX_PATH --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9feba54469..330302f3f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,7 +44,7 @@ install: #OSX # - if [[ $TRAVIS_OS_NAME == "osx" ]] ; then # is this relevant? -DCMAKE_LIBRARY_PATH=/usr/local - - cmake . -DBUILD_OSX_BUNDLE=1 -DCMAKE_INSTALL_PREFIX=/usr/local/Scribus.app/Contents/ -DQT_PREFIX=/usr/local/opt/qt5 -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=1 + - cmake . -DCMAKE_PREFIX_PATH=/usr/local/opt/zlib:/usr/local/opt/gettext:/usr/local/opt/libffi:/usr/local/opt/qt5:/usr/local/opt/sqlite:/usr/local/opt/openssl:/usr/local/opt/icu4c -DBUILD_OSX_BUNDLE=1 -DCMAKE_INSTALL_PREFIX=/usr/local/Scribus.app/Contents/ -DQT_PREFIX=/usr/local/opt/qt5 -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=1 - make - make install From f83bcbad9d351962d9163c859c24e3bd86bd4779 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Mon, 5 Oct 2015 14:57:43 -0500 Subject: [PATCH 29/73] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 330302f3f8..3e2c00a24c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,8 +36,8 @@ before_install: - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated freetype || brew upgrade freetype; fi # Install Librevenge suite + OSG - if [ $TRAVIS_OS_NAME == osx ]; then 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 +# - 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 install: From ffc6d5f5bd5e206d2f8b17d163287c720512da31 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Mon, 5 Oct 2015 15:30:30 -0500 Subject: [PATCH 30/73] CMAKE_PREFIX_PATH=/usr/local/opt/zlib --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3e2c00a24c..e51b43b989 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,7 +44,7 @@ install: #OSX # - if [[ $TRAVIS_OS_NAME == "osx" ]] ; then # is this relevant? -DCMAKE_LIBRARY_PATH=/usr/local - - cmake . -DCMAKE_PREFIX_PATH=/usr/local/opt/zlib:/usr/local/opt/gettext:/usr/local/opt/libffi:/usr/local/opt/qt5:/usr/local/opt/sqlite:/usr/local/opt/openssl:/usr/local/opt/icu4c -DBUILD_OSX_BUNDLE=1 -DCMAKE_INSTALL_PREFIX=/usr/local/Scribus.app/Contents/ -DQT_PREFIX=/usr/local/opt/qt5 -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=1 + - cmake . -DCMAKE_PREFIX_PATH=/usr/local/opt/zlib -DBUILD_OSX_BUNDLE=1 -DCMAKE_INSTALL_PREFIX=/usr/local/Scribus.app/Contents/ -DQT_PREFIX=/usr/local/opt/qt5 -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=1 -DWANT_SVNVERSION=0 - make - make install From 0b6f05ac5e4de51fe7b555005ed5b127ce4d9298 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Mon, 5 Oct 2015 17:21:30 -0500 Subject: [PATCH 31/73] debugging /usr/local/opt/zlib + commenting out librevenge --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e51b43b989..b8266d217e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ before_install: - if [ $TRAVIS_OS_NAME == osx ]; then brew --env && brew config; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew list; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated cmake --verbose || brew upgrade cmake; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew tap homebrew/dupes && brew install homebrew/dupes/zlib; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew tap homebrew/dupes && brew install homebrew/dupes/zlib && echo `ls -alR` /usr/local/opt/zlib; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew install xz little-cms2 cairo qt5 python hunspell ghostscript graphicsmagick poppler podofo; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated jpeg --verbose || brew upgrade jpeg; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated libtiff --verbose || brew upgrade libtiff; fi @@ -35,7 +35,7 @@ before_install: - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated boost || brew upgrade boost; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated freetype || brew upgrade freetype; fi # Install Librevenge suite + OSG -- if [ $TRAVIS_OS_NAME == osx ]; then brew install librevenge libwpg libvisio libmspub libcdr libpagemaker libfreehand open-scene-graph; fi +# - if [ $TRAVIS_OS_NAME == osx ]; then 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 From db71a5c0d73598da0dfa1c90591b493deffdc140 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Tue, 6 Oct 2015 01:36:09 -0500 Subject: [PATCH 32/73] added brew link --force zlib --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b8266d217e..e9e84dfbe5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ before_install: - if [ $TRAVIS_OS_NAME == osx ]; then brew --env && brew config; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew list; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated cmake --verbose || brew upgrade cmake; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew tap homebrew/dupes && brew install homebrew/dupes/zlib && echo `ls -alR` /usr/local/opt/zlib; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew tap homebrew/dupes && brew install homebrew/dupes/zlib && brew link --force zlib; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew install xz little-cms2 cairo qt5 python hunspell ghostscript graphicsmagick poppler podofo; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated jpeg --verbose || brew upgrade jpeg; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated libtiff --verbose || brew upgrade libtiff; fi From 841288d624fb17d664e5c26f73b2f8455bae64ea Mon Sep 17 00:00:00 2001 From: luzpaz Date: Tue, 6 Oct 2015 02:34:00 -0500 Subject: [PATCH 33/73] uncomment librevenge + OSG + minor refinements --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index e9e84dfbe5..6ebe31bd9f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,22 +20,22 @@ before_install: # OSX # - if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew tap luzpaz/scribustravis && brew install --HEAD scribustravis --verbose; fi -- echo $TRAVIS_OS_NAME +- echo "Building for $TRAVIS_OS_NAME" - if [ $TRAVIS_OS_NAME == osx ]; then brew update; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew --env && brew config; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew list; fi +# - if [ $TRAVIS_OS_NAME == osx ]; then brew --env && brew config; fi +# - if [ $TRAVIS_OS_NAME == osx ]; then brew list; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated cmake --verbose || brew upgrade cmake; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew tap homebrew/dupes && brew install homebrew/dupes/zlib && brew link --force zlib; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew install xz little-cms2 cairo qt5 python hunspell ghostscript graphicsmagick poppler podofo; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated jpeg --verbose || brew upgrade jpeg; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated libtiff --verbose || brew upgrade libtiff; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated fontconfig --verbose || brew upgrade fontconfig; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated openssl --verbose || brew upgrade openssl; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew install openssl && brew link --force openssl; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated pkg-config --verbose || brew upgrade pkg-config; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated boost || brew upgrade boost; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated freetype || brew upgrade freetype; fi # Install Librevenge suite + OSG -# - if [ $TRAVIS_OS_NAME == osx ]; then brew install librevenge libwpg libvisio libmspub libcdr libpagemaker libfreehand open-scene-graph; fi +- if [ $TRAVIS_OS_NAME == osx ]; then 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 From 86fdeedb1cbc9204b310f3a0b98758186d5b3d48 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Tue, 6 Oct 2015 07:51:20 -0500 Subject: [PATCH 34/73] changed install: block to script: per the docs --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6ebe31bd9f..ab357371f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ before_install: # - 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 -install: +script: #OSX # - if [[ $TRAVIS_OS_NAME == "osx" ]] ; then # is this relevant? -DCMAKE_LIBRARY_PATH=/usr/local From 121439e8b050827de556ba9d53758e19d639ebba Mon Sep 17 00:00:00 2001 From: luzpaz Date: Tue, 6 Oct 2015 08:59:06 -0500 Subject: [PATCH 35/73] removed python install since already exists in Travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ab357371f5..0b4d3d3215 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ before_install: # - if [ $TRAVIS_OS_NAME == osx ]; then brew list; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated cmake --verbose || brew upgrade cmake; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew tap homebrew/dupes && brew install homebrew/dupes/zlib && brew link --force zlib; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew install xz little-cms2 cairo qt5 python hunspell ghostscript graphicsmagick poppler podofo; fi +- if [ $TRAVIS_OS_NAME == osx ]; then brew install xz little-cms2 cairo qt5 hunspell ghostscript graphicsmagick poppler podofo; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated jpeg --verbose || brew upgrade jpeg; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated libtiff --verbose || brew upgrade libtiff; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew outdated fontconfig --verbose || brew upgrade fontconfig; fi From 55f2db27324c90e143c0ebfcb6ed11fa1d2f66c5 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Wed, 7 Oct 2015 16:52:01 -0500 Subject: [PATCH 36/73] Integrating OSX in to current yml --- .travis.yml | 106 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 64 insertions(+), 42 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0b4d3d3215..33d77c199a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,53 +1,75 @@ -matrix: - include: -# - os: linux -# dist: trusty -# sudo: required - - os: osx +language: cpp + +os: + - linux + dist: trusty + sudo: required + - osx + +compiler: + - gcc + - clang -language: c++ -compiler: clang before_install: -# Linux -#- if [ $TRAVIS_OS_NAME == linux ]; then 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; fi +- echo "Building for $TRAVIS_OS_NAME\n"; + +#Linux +if [ $TRAVIS_OS_NAME == linux ]; then 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; +fi -# OSX -# - if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew tap luzpaz/scribustravis && brew install --HEAD scribustravis --verbose; fi -- echo "Building for $TRAVIS_OS_NAME" -- if [ $TRAVIS_OS_NAME == osx ]; then brew update; fi +#OSX # - if [ $TRAVIS_OS_NAME == osx ]; then brew --env && brew config; fi # - if [ $TRAVIS_OS_NAME == osx ]; then brew list; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated cmake --verbose || brew upgrade cmake; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew tap homebrew/dupes && brew install homebrew/dupes/zlib && brew link --force zlib; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew install xz little-cms2 cairo qt5 hunspell ghostscript graphicsmagick poppler podofo; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated jpeg --verbose || brew upgrade jpeg; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated libtiff --verbose || brew upgrade libtiff; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated fontconfig --verbose || brew upgrade fontconfig; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew install openssl && brew link --force openssl; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated pkg-config --verbose || brew upgrade pkg-config; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated boost || brew upgrade boost; fi -- if [ $TRAVIS_OS_NAME == osx ]; then brew outdated freetype || brew upgrade freetype; 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; # Install Librevenge suite + OSG -- if [ $TRAVIS_OS_NAME == osx ]; then brew install librevenge libwpg libvisio libmspub libcdr libpagemaker libfreehand open-scene-graph; fi + 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: -#OSX -# - if [[ $TRAVIS_OS_NAME == "osx" ]] ; then -# is this relevant? -DCMAKE_LIBRARY_PATH=/usr/local - - cmake . -DCMAKE_PREFIX_PATH=/usr/local/opt/zlib -DBUILD_OSX_BUNDLE=1 -DCMAKE_INSTALL_PREFIX=/usr/local/Scribus.app/Contents/ -DQT_PREFIX=/usr/local/opt/qt5 -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=1 -DWANT_SVNVERSION=0 - - make - - make install - +script: + - if [ $TRAVIS_OS_NAME == linux ]; then + if [[ $CC == gcc ]]; then + export NPROC=8; + else + export NPROC=1; + fi + cmake . + make -j$NPROC; + make install; + fi + + #fix this +# - if [ $TRAVIS_OS_NAME = osx -a $CC = gcc ]; then DON'T BUILD ; fi + - if [ $TRAVIS_OS_NAME = osx -a $CC = clang ]; then + cmake . -DCMAKE_PREFIX_PATH=/usr/local/opt/zlib -DBUILD_OSX_BUNDLE=1 -DCMAKE_INSTALL_PREFIX=/usr/local/Scribus.app/Contents/ -DQT_PREFIX=/usr/local/opt/qt5 -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=1 -DWANT_SVNVERSION=0 + make; + make install; + fi + notifications: - email: - - kunda@scribus.net + email: false + irc: + channels: + - "chat.freenode.net#scribus-dev" + template: + - "%{repository}/%{branch} (%{commit} - %{author}): %{build_url}: %{message}" + on_success: always + on_failure: always From 221e1196eedfd88441e344d929407fbb3b402ddd Mon Sep 17 00:00:00 2001 From: luzpaz Date: Wed, 7 Oct 2015 17:00:28 -0500 Subject: [PATCH 37/73] formatting + hopefully trigger travis --- .travis.yml | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index 33d77c199a..60f46a11f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,4 @@ language: cpp - os: - linux dist: trusty @@ -13,17 +12,15 @@ compiler: before_install: - echo "Building for $TRAVIS_OS_NAME\n"; - #Linux -if [ $TRAVIS_OS_NAME == linux ]; then 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; -fi - +- if [ $TRAVIS_OS_NAME == linux ]; then 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; + fi #OSX # - if [ $TRAVIS_OS_NAME == osx ]; then brew --env && brew config; fi # - if [ $TRAVIS_OS_NAME == osx ]; then brew list; fi @@ -45,16 +42,16 @@ fi # - 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 [ $TRAVIS_OS_NAME == linux ]; then - if [[ $CC == gcc ]]; then - export NPROC=8; - else - export NPROC=1; - fi - cmake . - make -j$NPROC; - make install; +- if [ $TRAVIS_OS_NAME == linux ]; then + if [[ $CC == gcc ]]; then + export NPROC=8; + else + export NPROC=1; fi + cmake . + make -j$NPROC; + make install; + fi #fix this # - if [ $TRAVIS_OS_NAME = osx -a $CC = gcc ]; then DON'T BUILD ; fi From f4e19466a4858a8b8ee13250e7bcca8ecef7ddf3 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Wed, 7 Oct 2015 17:04:09 -0500 Subject: [PATCH 38/73] reverted some formatting --- .travis.yml | 84 ++++++++++++++++++++++++++--------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/.travis.yml b/.travis.yml index 60f46a11f7..1bd2038b90 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: cpp + os: - linux dist: trusty @@ -11,47 +12,46 @@ compiler: before_install: -- echo "Building for $TRAVIS_OS_NAME\n"; + - echo "Building for $TRAVIS_OS_NAME\n"; #Linux -- if [ $TRAVIS_OS_NAME == linux ]; then 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; - fi + - if [ $TRAVIS_OS_NAME == linux ]; then 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; + fi #OSX -# - if [ $TRAVIS_OS_NAME == osx ]; then brew --env && brew config; fi -# - if [ $TRAVIS_OS_NAME == osx ]; then 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; -# Install Librevenge suite + OSG - 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 +# - 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; + # Install Librevenge suite + OSG + 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 [ $TRAVIS_OS_NAME == linux ]; then - 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 . + make -j$NPROC; + make install; fi - cmake . - make -j$NPROC; - make install; - fi #fix this # - if [ $TRAVIS_OS_NAME = osx -a $CC = gcc ]; then DON'T BUILD ; fi @@ -62,11 +62,11 @@ script: fi notifications: - email: false - irc: - channels: + - email: false + - irc: + - channels: - "chat.freenode.net#scribus-dev" - template: + - template: - "%{repository}/%{branch} (%{commit} - %{author}): %{build_url}: %{message}" - on_success: always - on_failure: always + - on_success: always + - on_failure: always From a6832575afbf38d7a1420d237bbbe46962aa413c Mon Sep 17 00:00:00 2001 From: luzpaz Date: Wed, 7 Oct 2015 17:12:59 -0500 Subject: [PATCH 39/73] testing travis trigger (still won't build) --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1bd2038b90..96b2b47ac8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,8 @@ language: cpp os: - linux - dist: trusty - sudo: required + dist: trusty + sudo: required - osx compiler: From 8fa15a6c68d6e6c5d9f1b2d2f14fc03e25b2d4f7 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Thu, 8 Oct 2015 16:28:44 -0500 Subject: [PATCH 40/73] sudo:true instead of sudo:required ? --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 96b2b47ac8..e8e0be5033 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ language: cpp os: - linux dist: trusty - sudo: required + sudo: true - osx compiler: From ee2cbf40d6c0580733ed60de377e67ae67327bc9 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Thu, 8 Oct 2015 16:35:00 -0500 Subject: [PATCH 41/73] returned to matrix --- .travis.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index e8e0be5033..e54a304bd4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,12 @@ language: cpp -os: - - linux +matrix: + include: + - os: linux dist: trusty - sudo: true - - osx - + sudo: required + - os: osx + compiler: - gcc - clang From 5a449887d8d2ce030a07faa4676ea1430d535ef0 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Thu, 8 Oct 2015 16:36:55 -0500 Subject: [PATCH 42/73] changed cpp to c++ --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e54a304bd4..db03834b7b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -language: cpp +language: c++ matrix: include: From 31529086eee1e7d9746d99300e7c52e1b0d2aa87 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Thu, 8 Oct 2015 16:50:06 -0500 Subject: [PATCH 43/73] uncommn --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index db03834b7b..3f960ebaac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,11 +11,10 @@ compiler: - gcc - clang - before_install: - - echo "Building for $TRAVIS_OS_NAME\n"; +# - echo "Building for $TRAVIS_OS_NAME\n"; #Linux - - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get update -qq; +- if [ $TRAVIS_OS_NAME == linux ]; then 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 From c9901937c8f3d65e5f8462ed6d4803ffc95c629c Mon Sep 17 00:00:00 2001 From: luzpaz Date: Thu, 8 Oct 2015 16:59:31 -0500 Subject: [PATCH 44/73] Update .travis.yml --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3f960ebaac..c575aaefc6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,8 @@ compiler: - clang before_install: -# - echo "Building for $TRAVIS_OS_NAME\n"; +- echo "Building for $TRAVIS_OS_NAME\n"; + #Linux - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get update -qq; sudo apt-get install cmake libboost-python-dev libcups2-dev libhunspell-dev From dfcdb39b8b709e55635b1424afc9906953ec709b Mon Sep 17 00:00:00 2001 From: luzpaz Date: Thu, 8 Oct 2015 17:02:40 -0500 Subject: [PATCH 45/73] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c575aaefc6..fbc7e2d6d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ before_install: - echo "Building for $TRAVIS_OS_NAME\n"; #Linux -- if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get update -qq; + - if [ $TRAVIS_OS_NAME == linux ]; then 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 From 32b75e259df5a570a1bbae45b365016d0db37615 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Thu, 8 Oct 2015 17:20:47 -0500 Subject: [PATCH 46/73] Update .travis.yml --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index fbc7e2d6d1..aa08401298 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,9 +12,9 @@ compiler: - clang before_install: -- echo "Building for $TRAVIS_OS_NAME\n"; + - echo "Building for $TRAVIS_OS_NAME\n"; -#Linux +# Linux - if [ $TRAVIS_OS_NAME == linux ]; then 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 @@ -23,7 +23,7 @@ before_install: libopenscenegraph-dev libpoppler-dev libcairo2-dev libwpg-dev libmspub-dev libcdr-dev libvisio-dev; fi -#OSX +# 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; @@ -36,7 +36,7 @@ before_install: brew outdated pkg-config --verbose || brew upgrade pkg-config; brew outdated boost || brew upgrade boost; brew outdated freetype || brew upgrade freetype; - # Install Librevenge suite + OSG + # Install Librevenge suite + OSG 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 @@ -49,7 +49,7 @@ script: else export NPROC=1; fi - cmake . + cmake . ; make -j$NPROC; make install; fi @@ -57,7 +57,7 @@ script: #fix this # - if [ $TRAVIS_OS_NAME = osx -a $CC = gcc ]; then DON'T BUILD ; fi - if [ $TRAVIS_OS_NAME = osx -a $CC = clang ]; then - cmake . -DCMAKE_PREFIX_PATH=/usr/local/opt/zlib -DBUILD_OSX_BUNDLE=1 -DCMAKE_INSTALL_PREFIX=/usr/local/Scribus.app/Contents/ -DQT_PREFIX=/usr/local/opt/qt5 -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=1 -DWANT_SVNVERSION=0 + cmake . -DCMAKE_PREFIX_PATH=/usr/local/opt/zlib -DBUILD_OSX_BUNDLE=1 -DCMAKE_INSTALL_PREFIX=/usr/local/Scribus.app/Contents/ -DQT_PREFIX=/usr/local/opt/qt5 -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=1 -DWANT_SVNVERSION=0; make; make install; fi From a4461a037d9f11875c51266a4915a54221e8a295 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Thu, 8 Oct 2015 17:21:30 -0500 Subject: [PATCH 47/73] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index aa08401298..f5621470b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ compiler: - clang before_install: - - echo "Building for $TRAVIS_OS_NAME\n"; + - echo "Building for $TRAVIS_OS_NAME"; # Linux - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get update -qq; From 4d2fad288df8557f42bd4c199b7a85f8216ddbf1 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Thu, 8 Oct 2015 17:23:19 -0500 Subject: [PATCH 48/73] removed echo OS --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f5621470b4..b3f46be298 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,6 @@ compiler: - clang before_install: - - echo "Building for $TRAVIS_OS_NAME"; - # Linux - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get update -qq; sudo apt-get install cmake libboost-python-dev libcups2-dev libhunspell-dev @@ -25,7 +23,7 @@ before_install: fi # OSX # - if [ $TRAVIS_OS_NAME == osx ]; then brew --env && brew config && brew list; fi - - if [ $TRAVIS_OS_NAME == osx ]; then brew update; + - 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; From 865325921d53ca08531ee700bce288a7e1949a62 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Thu, 8 Oct 2015 17:24:48 -0500 Subject: [PATCH 49/73] Trying to fix linter errors --- .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index b3f46be298..ca7f645af6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,14 +13,14 @@ compiler: before_install: # Linux - - if [ $TRAVIS_OS_NAME == linux ]; then 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; - fi +- if [ $TRAVIS_OS_NAME == linux ]; then 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; + fi # OSX # - if [ $TRAVIS_OS_NAME == osx ]; then brew --env && brew config && brew list; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew update; From d7ec8ab1257d40524281174a63641bed0149e825 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Thu, 8 Oct 2015 17:27:10 -0500 Subject: [PATCH 50/73] added missing ; --- .travis.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index ca7f645af6..737b5a6146 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,19 +13,19 @@ compiler: before_install: # Linux -- if [ $TRAVIS_OS_NAME == linux ]; then 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; - fi + - if [ $TRAVIS_OS_NAME == linux ]; then 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; + 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 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; From 3e46168add686b88b1be16f617a322967adad70d Mon Sep 17 00:00:00 2001 From: luzpaz Date: Thu, 8 Oct 2015 19:30:26 -0500 Subject: [PATCH 51/73] trying suggestion from yaml-online-parser.appspot.com --- .travis.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 737b5a6146..914c3e6bf9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ compiler: before_install: # Linux - - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get update -qq; +- if [ $TRAVIS_OS_NAME == linux ]; then 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 @@ -23,7 +23,7 @@ before_install: fi # OSX # - if [ $TRAVIS_OS_NAME == osx ]; then brew --env && brew config && brew list; fi - - if [ $TRAVIS_OS_NAME == osx ]; then brew update; +- 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; @@ -34,7 +34,6 @@ before_install: brew outdated pkg-config --verbose || brew upgrade pkg-config; brew outdated boost || brew upgrade boost; brew outdated freetype || brew upgrade freetype; - # Install Librevenge suite + OSG 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 @@ -64,8 +63,8 @@ notifications: - email: false - irc: - channels: - - "chat.freenode.net#scribus-dev" + - "chat.freenode.net#scribus-dev" - template: - - "%{repository}/%{branch} (%{commit} - %{author}): %{build_url}: %{message}" + - "%{repository}/%{branch} (%{commit} - %{author}): %{build_url}: %{message}" - on_success: always - on_failure: always From 203567a61cbd5312bbceaa273fffccaf142eedda Mon Sep 17 00:00:00 2001 From: luzpaz Date: Thu, 8 Oct 2015 19:40:10 -0500 Subject: [PATCH 52/73] Ok builds! Now fix builds so they build --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 914c3e6bf9..f122728fd2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,17 +46,18 @@ script: else export NPROC=1; fi - cmake . ; + cmake . -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=0 -DWANT_SVNVERSION=0; make -j$NPROC; make install; fi - #fix this -# - if [ $TRAVIS_OS_NAME = osx -a $CC = gcc ]; then DON'T BUILD ; fi + - if [ $TRAVIS_OS_NAME = osx -a $CC = clang ]; then - cmake . -DCMAKE_PREFIX_PATH=/usr/local/opt/zlib -DBUILD_OSX_BUNDLE=1 -DCMAKE_INSTALL_PREFIX=/usr/local/Scribus.app/Contents/ -DQT_PREFIX=/usr/local/opt/qt5 -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=1 -DWANT_SVNVERSION=0; + cmake . -DCMAKE_PREFIX_PATH=/usr/local/opt/zlib -DBUILD_OSX_BUNDLE=1 -DCMAKE_INSTALL_PREFIX=/usr/local/Scribus.app/Contents/ -DQT_PREFIX=/usr/local/opt/qt5 -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=0 -DWANT_SVNVERSION=0; make; make install; + else [ $TRAVIS_OS_NAME = osx -a $CC = gcc ] then + exit; fi notifications: From f974e18d635f7f3b7aeecc831824099b0295f52a Mon Sep 17 00:00:00 2001 From: luzpaz Date: Thu, 8 Oct 2015 19:45:45 -0500 Subject: [PATCH 53/73] formatting of if statement --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f122728fd2..887a2dd515 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,7 +56,7 @@ script: cmake . -DCMAKE_PREFIX_PATH=/usr/local/opt/zlib -DBUILD_OSX_BUNDLE=1 -DCMAKE_INSTALL_PREFIX=/usr/local/Scribus.app/Contents/ -DQT_PREFIX=/usr/local/opt/qt5 -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=0 -DWANT_SVNVERSION=0; make; make install; - else [ $TRAVIS_OS_NAME = osx -a $CC = gcc ] then + else [ $TRAVIS_OS_NAME = osx -a $CC = gcc ]; then exit; fi From 026db6c8cafa1850893ec3b838eae7d86e76ca2a Mon Sep 17 00:00:00 2001 From: luzpaz Date: Thu, 8 Oct 2015 19:55:23 -0500 Subject: [PATCH 54/73] remove ; --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 887a2dd515..f122728fd2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,7 +56,7 @@ script: cmake . -DCMAKE_PREFIX_PATH=/usr/local/opt/zlib -DBUILD_OSX_BUNDLE=1 -DCMAKE_INSTALL_PREFIX=/usr/local/Scribus.app/Contents/ -DQT_PREFIX=/usr/local/opt/qt5 -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=0 -DWANT_SVNVERSION=0; make; make install; - else [ $TRAVIS_OS_NAME = osx -a $CC = gcc ]; then + else [ $TRAVIS_OS_NAME = osx -a $CC = gcc ] then exit; fi From 6ae8bcfda89ef2984013bf3439ac538d608f2365 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Thu, 8 Oct 2015 20:16:09 -0500 Subject: [PATCH 55/73] excluding osx gcc --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f122728fd2..a43a108f20 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,9 @@ matrix: dist: trusty sudo: required - os: osx + exclude: + - os: osx + compiler: gcc compiler: - gcc @@ -53,11 +56,9 @@ script: - if [ $TRAVIS_OS_NAME = osx -a $CC = clang ]; then - cmake . -DCMAKE_PREFIX_PATH=/usr/local/opt/zlib -DBUILD_OSX_BUNDLE=1 -DCMAKE_INSTALL_PREFIX=/usr/local/Scribus.app/Contents/ -DQT_PREFIX=/usr/local/opt/qt5 -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=0 -DWANT_SVNVERSION=0; + 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; make; make install; - else [ $TRAVIS_OS_NAME = osx -a $CC = gcc ] then - exit; fi notifications: From 95edc976d9eb4a6f6e6c692ca675a5fda73da6f9 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Thu, 8 Oct 2015 20:22:24 -0500 Subject: [PATCH 56/73] missing semicolon --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a43a108f20..4e36455a2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,7 +48,7 @@ script: export NPROC=8; else export NPROC=1; - fi + fi; cmake . -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=0 -DWANT_SVNVERSION=0; make -j$NPROC; make install; From 4770df74218f665a8a01455c4f4c38519d419baf Mon Sep 17 00:00:00 2001 From: luzpaz Date: Thu, 8 Oct 2015 20:32:13 -0500 Subject: [PATCH 57/73] merged compiler statement --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4e36455a2c..d1754e72d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,14 +5,14 @@ matrix: - os: linux dist: trusty sudo: required + compiler: gcc + compiler: clang - os: osx + compiler: clang exclude: - os: osx compiler: gcc -compiler: - - gcc - - clang before_install: # Linux From 13e024a6faae2a78cbb127cd2bb74a808a3bd1c6 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Thu, 8 Oct 2015 21:29:22 -0500 Subject: [PATCH 58/73] excluded dist: precise --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index d1754e72d1..50d5e7544c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,8 @@ matrix: exclude: - os: osx compiler: gcc + - os: linux + dist: precise before_install: From 1cfcdd02a78f3026040e584cd118ea45e91097cd Mon Sep 17 00:00:00 2001 From: luzpaz Date: Thu, 8 Oct 2015 21:30:31 -0500 Subject: [PATCH 59/73] Update .travis.yml --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 50d5e7544c..d1754e72d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,6 @@ matrix: exclude: - os: osx compiler: gcc - - os: linux - dist: precise before_install: From 48162fb45d6c35bbe0d311238b56d69c05d4ca39 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Thu, 8 Oct 2015 21:36:33 -0500 Subject: [PATCH 60/73] trying again to remove dist:precise --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d1754e72d1..aeca04d1f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,14 +5,14 @@ matrix: - os: linux dist: trusty sudo: required - compiler: gcc - compiler: clang + compiler: gcc, clang - os: osx compiler: clang exclude: - os: osx compiler: gcc - + - os: linux + dist:precise before_install: # Linux From a27485f25d8027ca45671c3bfcd5ee27668f1ff7 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Thu, 8 Oct 2015 21:37:08 -0500 Subject: [PATCH 61/73] try again --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index aeca04d1f2..3468ba2c04 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ matrix: - os: linux dist: trusty sudo: required - compiler: gcc, clang + compiler: gcc, clang - os: osx compiler: clang exclude: From 16a89861ed9db50c40f623ecdaf1b6fbe7656f41 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Thu, 8 Oct 2015 21:37:37 -0500 Subject: [PATCH 62/73] and again --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3468ba2c04..7b810ab08d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,8 @@ matrix: - os: linux dist: trusty sudo: required - compiler: gcc, clang + compiler: gcc + compiler: clang - os: osx compiler: clang exclude: From deaac8924a4d198e45ce96fcf80125549e3b78db Mon Sep 17 00:00:00 2001 From: luzpaz Date: Thu, 8 Oct 2015 21:39:10 -0500 Subject: [PATCH 63/73] fixing compiler line --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7b810ab08d..c6b9c48c1c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,9 @@ matrix: - os: linux dist: trusty sudo: required - compiler: gcc - compiler: clang + compiler + - gcc + - clang - os: osx compiler: clang exclude: From 379b33a420699f41cfef064bbb9e72c99b9cce4d Mon Sep 17 00:00:00 2001 From: luzpaz Date: Thu, 8 Oct 2015 21:39:37 -0500 Subject: [PATCH 64/73] forgot ':' --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c6b9c48c1c..bd255c1b24 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ matrix: - os: linux dist: trusty sudo: required - compiler + compiler: - gcc - clang - os: osx From 240b3b5da96740fb84ae18089669196caa67cc4f Mon Sep 17 00:00:00 2001 From: luzpaz Date: Thu, 8 Oct 2015 21:40:12 -0500 Subject: [PATCH 65/73] formatting typo in exclude line --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bd255c1b24..8489f98f8d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ matrix: - os: osx compiler: gcc - os: linux - dist:precise + dist: precise before_install: # Linux From c28414bdc16619595fd9c2cd4a0222862b40c454 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Thu, 8 Oct 2015 22:20:41 -0500 Subject: [PATCH 66/73] added another linux clause (kind of redundant) --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8489f98f8d..3b998f9dfb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,12 @@ matrix: dist: trusty sudo: required compiler: - - gcc - clang + - os: linux + dist: trusty + sudo: required + compiler: + - gcc - os: osx compiler: clang exclude: From d36ce87457409788fa6b85f57be4f543f633989c Mon Sep 17 00:00:00 2001 From: luzpaz Date: Thu, 8 Oct 2015 22:23:44 -0500 Subject: [PATCH 67/73] Success getting 3 builds (fixing their order) --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3b998f9dfb..fceec385bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,12 +6,12 @@ matrix: dist: trusty sudo: required compiler: - - clang + - gcc - os: linux dist: trusty sudo: required compiler: - - gcc + - clang - os: osx compiler: clang exclude: From 0214f8a16734dcc854b6d187d811a9f09e2e5ea7 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Fri, 9 Oct 2015 07:47:34 -0500 Subject: [PATCH 68/73] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fceec385bb..afa36554ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,7 +56,7 @@ script: export NPROC=1; fi; cmake . -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=0 -DWANT_SVNVERSION=0; - make -j$NPROC; + make -j"$NPROC"; make install; fi From 496bda0551adfae53520b5bb6f03691f99d01f3a Mon Sep 17 00:00:00 2001 From: luzpaz Date: Fri, 9 Oct 2015 14:08:25 -0500 Subject: [PATCH 69/73] removed 'make install' from linux builds (why did @QuLogic not 'make install'?) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index afa36554ce..7ffed8aae8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -64,7 +64,7 @@ script: - 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; make; - make install; + # make install; fi notifications: From e0964900c04ea937995d56bc3c0f301647e31bb3 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Fri, 9 Oct 2015 14:09:13 -0500 Subject: [PATCH 70/73] error.. fixed previous commit --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7ffed8aae8..bae1f75e4f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,14 +57,13 @@ script: fi; cmake . -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=0 -DWANT_SVNVERSION=0; make -j"$NPROC"; - make install; fi - 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; make; - # make install; + make install; fi notifications: From 4ca7d265f94a5b1164a4a3559332f264469ff29f Mon Sep 17 00:00:00 2001 From: luzpaz Date: Sat, 24 Oct 2015 18:46:45 -0500 Subject: [PATCH 71/73] added -y flag to apt-get install --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bae1f75e4f..c316e05ad5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ matrix: before_install: # Linux - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get update -qq; - sudo apt-get install cmake libboost-python-dev libcups2-dev libhunspell-dev + 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 From f52eaaf4329d69e07fabb9ea929ec25ab912c508 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Sun, 25 Oct 2015 22:43:29 -0500 Subject: [PATCH 72/73] added make -j8 to osx build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c316e05ad5..dae0d587d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,7 +62,7 @@ script: - 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; - make; + make -j8; make install; fi From 7af00e2eeec266bef67f8548f9ac25046913c88d Mon Sep 17 00:00:00 2001 From: luzpaz Date: Sun, 25 Oct 2015 23:58:48 -0500 Subject: [PATCH 73/73] adding -DWANT_GUI_LANG=en_US to shorten build time --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index dae0d587d6..8ec7cdfdc3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,13 +55,13 @@ script: else export NPROC=1; fi; - cmake . -DWANT_HUNSPELL=1 -DWITH_PODOFO=1 -DWANT_GRAPHICSMAGICK=1 -DWANT_DEBUG=0 -DWANT_SVNVERSION=0; + 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 - 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; + 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