From 6485370876322023eee45bef67cd10e47ac7b092 Mon Sep 17 00:00:00 2001 From: Croydon Date: Sun, 16 Sep 2018 19:27:04 +0200 Subject: Make conanfile creation more readable --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1130bec..dd006d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,8 +45,8 @@ before_script: export PATH=/Users/travis/Library/TeX/texbin:/Library/TeX/texbin:$PATH; conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan; - printf "[requires]\n - libxml2/2.9.8@bincrafters/stable\n + printf "[requires] + libxml2/2.9.8@bincrafters/stable qt/5.11.3@bincrafters/stable" >> conanfile.txt; conan install . -g virtualrunenv; source activate_run.sh; -- cgit v0.12 From db333f1e406a76ddbdffd8e7ee7a28499d3a8516 Mon Sep 17 00:00:00 2001 From: Croydon Date: Tue, 9 Oct 2018 18:19:19 +0200 Subject: Travis: Install libiconv and libxml via Conan --- .travis.yml | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index dd006d4..d171652 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: cpp os: - - linux-ppc64le - linux + - linux-ppc64le dist: xenial compiler: - gcc @@ -18,7 +18,6 @@ addons: - texlive-latex-extra - texlive-font-utils - ghostscript - - libxml2-utils - cmake - cmake-data @@ -28,7 +27,19 @@ jobs: compiler: clang before_script: + - if [ "${TRAVIS_OS_NAME}" == "linux" ] || [ "${TRAVIS_OS_NAME}" == "linux-ppc64le" ]; then + conanQt=""; + conanQtOptions=""; + fi; + if [ "${TRAVIS_OS_NAME}" == "osx" ]; then + conanQt="qt/5.11.3@bincrafters/stable"; + conanQtOptions="qt:shared=False"; + fi; + - if [ "${TRAVIS_OS_NAME}" == "linux" ] || [ "${TRAVIS_OS_NAME}" == "linux-ppc64le" ]; then + pip install --quiet --user conan; + fi; - if [ "${TRAVIS_OS_NAME}" == "osx" ]; then + pip install --upgrade pip; sudo mkdir -p /usr/local/man; sudo chown -R "${USER}:admin" /usr/local/man; pip install --quiet conan; @@ -43,14 +54,17 @@ before_script: chmod a+x /Users/travis/Library/TeX/texbin/epstopdf; rm -rf epstopdf*; export PATH=/Users/travis/Library/TeX/texbin:/Library/TeX/texbin:$PATH; - + fi; + - | conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan; printf "[requires] libxml2/2.9.8@bincrafters/stable - qt/5.11.3@bincrafters/stable" >> conanfile.txt; - conan install . -g virtualrunenv; + libiconv/1.15@bincrafters/stable + $conanQt + [options] + $conanQtOptions" >> conanfile.txt; + conan install . -g virtualrunenv --build missing --update; source activate_run.sh; - fi; script: - mkdir build -- cgit v0.12 From 64d858294da917b5ec69cfb897cda808dc5983fd Mon Sep 17 00:00:00 2001 From: Croydon Date: Sun, 6 Jan 2019 06:42:01 +0100 Subject: Travis: Removing sudo keyword as this will be soon deprecated anyway --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d171652..9a24d23 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,6 @@ dist: xenial compiler: - gcc - clang -sudo: required addons: apt: -- cgit v0.12 From 7591f4ecb548b0e55f32934e74f757795f0125f8 Mon Sep 17 00:00:00 2001 From: Croydon Date: Sun, 6 Jan 2019 07:29:56 +0100 Subject: Travis: Output CMake version --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 9a24d23..b4d1000 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,6 +68,7 @@ before_script: script: - mkdir build - cd build + - cmake --version; - cmake -G "Unix Makefiles" -Dbuild_doc=ON -Dbuild_wizard=ON .. - make - make tests -- cgit v0.12 From 545645451c74c03aada68c34b1de0a3d9c04aad3 Mon Sep 17 00:00:00 2001 From: Croydon Date: Sun, 6 Jan 2019 08:04:07 +0100 Subject: Travis: Handle linux-ppc64le differently --- .travis.yml | 53 +++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index b4d1000..9e68135 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,5 @@ language: cpp -os: - - linux - - linux-ppc64le +os: linux dist: xenial compiler: - gcc @@ -17,22 +15,51 @@ addons: - texlive-latex-extra - texlive-font-utils - ghostscript - - cmake - - cmake-data + +linux-ppc64le: &linux-ppc64le + os: linux-ppc64le + addons: + apt: + update: true + packages: + - texlive + - texlive-generic-recommended + - texlive-extra-utils + - texlive-latex-extra + - texlive-font-utils + - ghostscript + - cmake + - cmake-data jobs: include: + - <<: *linux-ppc64le + compiler: gcc + - <<: *linux-ppc64le + compiler: clang - os: osx compiler: clang before_script: - - if [ "${TRAVIS_OS_NAME}" == "linux" ] || [ "${TRAVIS_OS_NAME}" == "linux-ppc64le" ]; then - conanQt=""; - conanQtOptions=""; + - | + if [ "${TRAVIS_OS_NAME}" == "linux" ]; then + printf "[requires] + libxml2/2.9.8@bincrafters/stable + libiconv/1.15@bincrafters/stable + [build_requires] + cmake_installer/3.10.0@conan/stable" >> conanfile.txt; + fi; + if [ "${TRAVIS_OS_NAME}" == "linux-ppc64le" ]; then + printf "[requires] + libxml2/2.9.8@bincrafters/stable" >> conanfile.txt; fi; if [ "${TRAVIS_OS_NAME}" == "osx" ]; then - conanQt="qt/5.11.3@bincrafters/stable"; - conanQtOptions="qt:shared=False"; + printf "[requires] + libxml2/2.9.8@bincrafters/stable + libiconv/1.15@bincrafters/stable + qt/5.11.3@bincrafters/stable + [options] + qt:shared=False" >> conanfile.txt; fi; - if [ "${TRAVIS_OS_NAME}" == "linux" ] || [ "${TRAVIS_OS_NAME}" == "linux-ppc64le" ]; then pip install --quiet --user conan; @@ -56,12 +83,6 @@ before_script: fi; - | conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan; - printf "[requires] - libxml2/2.9.8@bincrafters/stable - libiconv/1.15@bincrafters/stable - $conanQt - [options] - $conanQtOptions" >> conanfile.txt; conan install . -g virtualrunenv --build missing --update; source activate_run.sh; -- cgit v0.12 From fe3619d613efad9db7b11bb55121c90a064d98ee Mon Sep 17 00:00:00 2001 From: Croydon Date: Sun, 6 Jan 2019 08:53:29 +0100 Subject: Travis: Workaround to differ between x86 and ppc64le --- .travis.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9e68135..0474f6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,8 @@ addons: linux-ppc64le: &linux-ppc64le os: linux-ppc64le + env: + - OS_NAME="linux-ppc64le" addons: apt: update: true @@ -28,6 +30,7 @@ linux-ppc64le: &linux-ppc64le - texlive-latex-extra - texlive-font-utils - ghostscript + - libxml2-utils - cmake - cmake-data @@ -42,17 +45,13 @@ jobs: before_script: - | - if [ "${TRAVIS_OS_NAME}" == "linux" ]; then + if [ "${TRAVIS_OS_NAME}" == "linux" ] && [ ! "${OS_NAME}" == "linux-ppc64le" ]; then printf "[requires] libxml2/2.9.8@bincrafters/stable libiconv/1.15@bincrafters/stable [build_requires] cmake_installer/3.10.0@conan/stable" >> conanfile.txt; fi; - if [ "${TRAVIS_OS_NAME}" == "linux-ppc64le" ]; then - printf "[requires] - libxml2/2.9.8@bincrafters/stable" >> conanfile.txt; - fi; if [ "${TRAVIS_OS_NAME}" == "osx" ]; then printf "[requires] libxml2/2.9.8@bincrafters/stable @@ -61,7 +60,7 @@ before_script: [options] qt:shared=False" >> conanfile.txt; fi; - - if [ "${TRAVIS_OS_NAME}" == "linux" ] || [ "${TRAVIS_OS_NAME}" == "linux-ppc64le" ]; then + - if [ "${TRAVIS_OS_NAME}" == "linux" ]; then pip install --quiet --user conan; fi; - if [ "${TRAVIS_OS_NAME}" == "osx" ]; then @@ -81,10 +80,11 @@ before_script: rm -rf epstopdf*; export PATH=/Users/travis/Library/TeX/texbin:/Library/TeX/texbin:$PATH; fi; - - | + - if [ ! "${OS_NAME}" == "linux-ppc64le" ]; then conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan; conan install . -g virtualrunenv --build missing --update; source activate_run.sh; + fi; script: - mkdir build -- cgit v0.12 From 7e52a8fa6bc2c451961947faf3665a7240884894 Mon Sep 17 00:00:00 2001 From: Croydon Date: Sun, 6 Jan 2019 09:04:43 +0100 Subject: Travis: macOS Remove permission workaround This got added here https://github.com/doxygen/doxygen/commit/72f9ffcbda4da4930ceab28043278cff51778c68#diff-354f30a63fb0907d4ad57269548329e3 but is fixed upstream in the meantime --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0474f6a..4beadba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -65,8 +65,6 @@ before_script: fi; - if [ "${TRAVIS_OS_NAME}" == "osx" ]; then pip install --upgrade pip; - sudo mkdir -p /usr/local/man; - sudo chown -R "${USER}:admin" /usr/local/man; pip install --quiet conan; export HOMEBREW_NO_AUTO_UPDATE=1; brew install ghostscript; -- cgit v0.12 From 641f4f1008079a5dcb5b620a10fe29db919d8376 Mon Sep 17 00:00:00 2001 From: Croydon Date: Sun, 6 Jan 2019 09:06:58 +0100 Subject: Travis macOS: Update Qt to 5.12.0 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4beadba..1698e6c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,7 +56,7 @@ before_script: printf "[requires] libxml2/2.9.8@bincrafters/stable libiconv/1.15@bincrafters/stable - qt/5.11.3@bincrafters/stable + qt/5.12.0@bincrafters/stable [options] qt:shared=False" >> conanfile.txt; fi; -- cgit v0.12 From f881e424b960a4384f9c9e1ced10acfc52fafa3f Mon Sep 17 00:00:00 2001 From: Croydon Date: Sun, 6 Jan 2019 09:36:05 +0100 Subject: Travis macOS: Use shared Qt until upstream bugs are fixed --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1698e6c..6fc178a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,7 +58,7 @@ before_script: libiconv/1.15@bincrafters/stable qt/5.12.0@bincrafters/stable [options] - qt:shared=False" >> conanfile.txt; + qt:shared=True" >> conanfile.txt; fi; - if [ "${TRAVIS_OS_NAME}" == "linux" ]; then pip install --quiet --user conan; -- cgit v0.12 From 467176064fcf17788df760304dc73bd774eba452 Mon Sep 17 00:00:00 2001 From: Croydon Date: Sun, 6 Jan 2019 10:59:03 +0100 Subject: Travis macOS: Use Travis addons for homebrew --- .travis.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6fc178a..4d42ce2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,6 +42,12 @@ jobs: compiler: clang - os: osx compiler: clang + addons: + homebrew: + packages: + - ghostscript + casks: + - mactex-no-gui before_script: - | @@ -66,10 +72,7 @@ before_script: - if [ "${TRAVIS_OS_NAME}" == "osx" ]; then pip install --upgrade pip; pip install --quiet conan; - export HOMEBREW_NO_AUTO_UPDATE=1; - brew install ghostscript; - travis_wait brew cask install mactex-no-gui; curl -O -L http://mirrors.ctan.org/support/epstopdf.zip; unzip epstopdf.zip; mkdir -p /Users/travis/Library/TeX/texbin/; -- cgit v0.12 From a012da2ca206bd3937ef74a63f9fb2e85ec14b88 Mon Sep 17 00:00:00 2001 From: Croydon Date: Sun, 6 Jan 2019 11:28:50 +0100 Subject: AppVeyor: Remove needless CMake generation at the end --- appveyor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 61cb2e8..0cea036 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -55,5 +55,4 @@ test_script: - msbuild "testing\tests.vcxproj" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" # Disabled building document due to unreliable MikTeX installation # - cmake -G "%CMAKE_GENERATOR_NAME%" -D build_doc=ON .. - - cmake -G "%CMAKE_GENERATOR_NAME%" .. # - msbuild "doc\docs.vcxproj" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" -- cgit v0.12