From d7d18ad5a12f59fbe233921c0866718926d2b6f4 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Fri, 30 Jan 2015 10:33:25 +0100 Subject: [PATCH 01/55] scripting doc deploy --- .travis.yml | 18 ++++++++++++++++-- .travis/dgtal_rsa.enc | Bin 0 -> 1680 bytes 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 .travis/dgtal_rsa.enc diff --git a/.travis.yml b/.travis.yml index 6996fc481f..f1d00b9852 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,12 +10,21 @@ notifications: slack: dgtal:FObxCZFoeQkkaRuktJD5uhnN env: + global: + - + + matrix: - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_MAGICK=true -DWITH_GMP=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=ON -DWITH_COVERAGE=true" - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_QGLVIEWER=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=OFF" + +before_install: + - openssl aes-256-cbc -K $encrypted_73d1df012ee4_key -iv $encrypted_73d1df012ee4_iv -in .travis/dgtal_rsa.enc -out ~\/.ssh/dgtal_rsa -d + - chmod 600 .ssh/dgtal_rsa + before_script: - sudo apt-get -qq update - - sudo apt-get -qq install libboost-program-options-dev libcairo2-dev libgraphicsmagick++1-dev libboost-system-dev libgmp-dev libqglviewer-qt4-dev libinsighttoolkit3-dev libgdcm2-dev + - sudo apt-get -qq install libboost-program-options-dev libcairo2-dev libgraphicsmagick++1-dev libboost-system-dev libgmp-dev libqglviewer-qt4-dev libinsighttoolkit3-dev libgdcm2-dev graphviz doxygen - gem install coveralls-lcov - sudo apt-get install -y lcov @@ -24,8 +33,13 @@ script: - make DGtal && make DGtalIO - cd examples && make -j 3 - cd ../tests && make && cd ..&& make test - - tests/geometry/surfaces/testTensorVoting after_script: - make lcov - coveralls-lcov --source-encoding=ISO-8859-1 coverage/stap.info + + +after_success: + - make doc + - ssh-add .ssh/dgtal_rsa + - rsync -azv --delete --delete-after html/ dgtal@liris.cnrs.fr:/home/dgtal/public_html/doc/nightly/ diff --git a/.travis/dgtal_rsa.enc b/.travis/dgtal_rsa.enc new file mode 100644 index 0000000000000000000000000000000000000000..3afc3aa35b47868ed3824807d7f7f02dd89847ea GIT binary patch literal 1680 zcmV;B25`7HyHPg|Sa%ia%fZk`@hWc&!_z#pv-Unr83@s4338}88JipJ-X6|_z_FDD zYDIm@%^I3JL^S2|{4F&#-AEQM~XS)=ows<7ce#x%xw2B8Ov<=@l>=H#`a0pL2xWRxNC5TRW)3CI@gS8?3 z?Hm%Wg2V>%SdKixKN_zIo86n#7mKi6q&`Tkvp)0NLms;Y<_^>hW(gP83F+_K_?6I7 z6rH-4%7L3GN;!k!ot4IX=+k)AjPK#2?D+6cH0W(3iUh>jkPm0)$HepQ*Vbt*?ky=5 zZ~yp0!1laI&wqS$8ohAHmLgcxBL2pViI{x!(dZc%;DAzM6elViXjO4Oq7Y17U zInqcg*SgxVzx=c&~3R5Ts}U6EKmW|FtU)lZ0{(D5;B zWZ6X^hGJ3!x!7P&=@&~(4+z7d>S#@pllenAzo|Cy{ zE;_lq>(|8^HoO13lzs(RDUflTV#1)@Y~^YgGz)Xg!_} zCDqPJp}B}*uP1UCIn+4<>6P52H-hi*vP5^;F0B~Mw1Q-9cB`kG_$uD+W5EgB_s4$2OZduq+GgsVR?!-k*Gzqn`6uiz)%B1k!W_@A#8g z0c;sreSI&VIS#fXi00}4 zsy9J?Btq%YoK&{+@x6GmO`wnWEmGhY@@qFQkqrb+=!}M@*rOyZitK9QXo`-)3Q-LF z)B?I`Yw{X#l1aj_griePtG`t)b(4tU!X|?-divZ_#nz;HA>K`=&)!cm)Lzfw$UIFv z8R6C>#|zqw|Hy^g-1X&ssqo&;wu-t046`=O80IP<$r z5iwmy!gB6+MRp3dSoqotvM!n4w*2o8Z{%y;r<3_w2b5e<%r8FT?b@_hcQU`ohaTMS zd;dV)T5-s1SXve>d%>BWk0g6H0xsA2Dy7G7@Kb=HD5u5(z3r_RlXJm}a_4yVo|BsG z(en+RC7->#bo%CWY}s(^VFb$3X@RWO(9nNdlkgS+K{Hf;iS{$Lyj4jBop;U}ZYjxU zw;yX$`|C z>ZEbx6(H(Kw1O&~-~j}%c03O|eCvNd5zZO^j=SF>87K{;JC|~S?cTk{1tuwUV)!!C zu0yroMejVG$``wpXb2S@r1yM?I09V6Th*qTU`82+u2}?{LOw_O&i{6RS?kdZpOkC2 z-Q8%)WiYb}_(ZvOuFf>;tFf|#UI4Q&1F4u^9w@qP%O65(xS*>L$F_p#Y;;~py+X{I z84)kT!Kds4JWW9hoKDUtyBFNoHI+Ehx++)A{xc_Ju&FQb&AV=qkv#Twov8*-`3oMG aNtoA!ubx9UsEekiiG38Lw5vT=s;+dVu~=aM literal 0 HcmV?d00001 From ba890b7d6330b33f9369e785bfd71190a3f8ca80 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Fri, 30 Jan 2015 10:34:58 +0100 Subject: [PATCH 02/55] scripting doc deploy --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f1d00b9852..8e44e89fb1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,8 +19,8 @@ env: before_install: - - openssl aes-256-cbc -K $encrypted_73d1df012ee4_key -iv $encrypted_73d1df012ee4_iv -in .travis/dgtal_rsa.enc -out ~\/.ssh/dgtal_rsa -d - - chmod 600 .ssh/dgtal_rsa + - openssl aes-256-cbc -K $encrypted_73d1df012ee4_key -iv $encrypted_73d1df012ee4_iv -in .travis/dgtal_rsa.enc -out ~\/.travis/dgtal_rsa -d + - chmod 600 .travis/dgtal_rsa before_script: - sudo apt-get -qq update @@ -41,5 +41,5 @@ after_script: after_success: - make doc - - ssh-add .ssh/dgtal_rsa + - ssh-add .travis/dgtal_rsa - rsync -azv --delete --delete-after html/ dgtal@liris.cnrs.fr:/home/dgtal/public_html/doc/nightly/ From 0bff4a5738c4eff19899f10a70833dbf9b0e6db3 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Fri, 30 Jan 2015 10:36:24 +0100 Subject: [PATCH 03/55] scripting doc deploy --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8e44e89fb1..dc12854569 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ env: before_install: - - openssl aes-256-cbc -K $encrypted_73d1df012ee4_key -iv $encrypted_73d1df012ee4_iv -in .travis/dgtal_rsa.enc -out ~\/.travis/dgtal_rsa -d + - openssl aes-256-cbc -K $encrypted_73d1df012ee4_key -iv $encrypted_73d1df012ee4_iv -in .travis/dgtal_rsa.enc -out .travis/dgtal_rsa -d - chmod 600 .travis/dgtal_rsa before_script: From 69bb5682a19a31a30e1a7d2c621ebecc63e9b344 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Fri, 30 Jan 2015 13:08:59 +0100 Subject: [PATCH 04/55] doc --- .travis.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index dc12854569..50d38214bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,13 +14,13 @@ env: - matrix: - - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_MAGICK=true -DWITH_GMP=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=ON -DWITH_COVERAGE=true" - - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_QGLVIEWER=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=OFF" - + - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_MAGICK=true -DWITH_GMP=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=ON -DWITH_COVERAGE=true" DOC=false + - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_QGLVIEWER=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=OFF" DOC=false + - DOC="true" BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_QGLVIEWER=true" before_install: - - openssl aes-256-cbc -K $encrypted_73d1df012ee4_key -iv $encrypted_73d1df012ee4_iv -in .travis/dgtal_rsa.enc -out .travis/dgtal_rsa -d - - chmod 600 .travis/dgtal_rsa + - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && openssl aes-256-cbc -K $encrypted_73d1df012ee4_key -iv $encrypted_73d1df012ee4_iv -in .travis/dgtal_rsa.enc -out .travis/dgtal_rsa -d + - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && chmod 600 .travis/dgtal_rsa before_script: - sudo apt-get -qq update @@ -30,9 +30,9 @@ before_script: script: - cmake . $BTYPE - - make DGtal && make DGtalIO - - cd examples && make -j 3 - - cd ../tests && make && cd ..&& make test + - '[ "${DOC}" = "false" ] && make DGtal && make DGtalIO + - '[ "${DOC}" = "false" ] && cd examples && make -j 3 + - '[ "${DOC}" = "false" ] && cd ../tests && make && cd ..&& make test after_script: - make lcov @@ -40,6 +40,6 @@ after_script: after_success: - - make doc - - ssh-add .travis/dgtal_rsa - - rsync -azv --delete --delete-after html/ dgtal@liris.cnrs.fr:/home/dgtal/public_html/doc/nightly/ + - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && '[ "${DOC}" = "true" ] && make doc + - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && '[ "${DOC}" = "true" ] && ssh-add .travis/dgtal_rsa + - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && '[ "${DOC}" = "true" ] && rsync -azv --delete --delete-after html/ dgtal@liris.cnrs.fr:/home/dgtal/public_html/doc/nightly/ From e1f60ebd54782f4fb80a653b3ca03bf507661c76 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Fri, 30 Jan 2015 13:16:49 +0100 Subject: [PATCH 05/55] doc --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 50d38214bb..d2c81dd71b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,12 +10,10 @@ notifications: slack: dgtal:FObxCZFoeQkkaRuktJD5uhnN env: - global: - - matrix: - - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_MAGICK=true -DWITH_GMP=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=ON -DWITH_COVERAGE=true" DOC=false - - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_QGLVIEWER=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=OFF" DOC=false + - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_MAGICK=true -DWITH_GMP=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=ON -DWITH_COVERAGE=true" DOC="false" + - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_QGLVIEWER=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=OFF" DOC="false" - DOC="true" BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_QGLVIEWER=true" before_install: From 2ddfd3cf5a28d97a07f2af90a235861158dbc580 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Fri, 30 Jan 2015 13:56:20 +0100 Subject: [PATCH 06/55] doc --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d2c81dd71b..d1e31dbaeb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,6 @@ env: before_install: - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && openssl aes-256-cbc -K $encrypted_73d1df012ee4_key -iv $encrypted_73d1df012ee4_iv -in .travis/dgtal_rsa.enc -out .travis/dgtal_rsa -d - - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && chmod 600 .travis/dgtal_rsa before_script: - sudo apt-get -qq update From 101e966c4669cc223eec057dd0e1eaa71a3edb42 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Fri, 30 Jan 2015 15:20:10 +0100 Subject: [PATCH 07/55] debugging travis --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d1e31dbaeb..727896f511 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,13 +12,14 @@ notifications: env: matrix: - - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_MAGICK=true -DWITH_GMP=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=ON -DWITH_COVERAGE=true" DOC="false" - - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_QGLVIEWER=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=OFF" DOC="false" + - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_MAGICK=true -DWITH_GMP=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=ON -DWITH_COVERAGE=true" + - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_QGLVIEWER=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=OFF" - DOC="true" BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_QGLVIEWER=true" before_install: - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && openssl aes-256-cbc -K $encrypted_73d1df012ee4_key -iv $encrypted_73d1df012ee4_iv -in .travis/dgtal_rsa.enc -out .travis/dgtal_rsa -d - + + before_script: - sudo apt-get -qq update - sudo apt-get -qq install libboost-program-options-dev libcairo2-dev libgraphicsmagick++1-dev libboost-system-dev libgmp-dev libqglviewer-qt4-dev libinsighttoolkit3-dev libgdcm2-dev graphviz doxygen From a55fee6637a3ccf98a06029e852ebf4bd559814a Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Tue, 3 Feb 2015 14:17:19 +0100 Subject: [PATCH 08/55] editing travis --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 727896f511..c4ff9376b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,15 +10,13 @@ notifications: slack: dgtal:FObxCZFoeQkkaRuktJD5uhnN env: - matrix: - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_MAGICK=true -DWITH_GMP=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=ON -DWITH_COVERAGE=true" - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_QGLVIEWER=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=OFF" - - DOC="true" BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_QGLVIEWER=true" + - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_QGLVIEWER=true" DOC="true" before_install: - - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && openssl aes-256-cbc -K $encrypted_73d1df012ee4_key -iv $encrypted_73d1df012ee4_iv -in .travis/dgtal_rsa.enc -out .travis/dgtal_rsa -d - + - openssl aes-256-cbc -K $encrypted_73d1df012ee4_key -iv $encrypted_73d1df012ee4_iv -in .travis/dgtal_rsa.enc -out .travis/dgtal_rsa -d before_script: - sudo apt-get -qq update From 47ec414b877c8c2b532e574a09525a3cde294a45 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Tue, 3 Feb 2015 17:27:10 +0100 Subject: [PATCH 09/55] deployning --- .travis.yml | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index c4ff9376b9..3589723459 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,26 +9,30 @@ cache: apt notifications: slack: dgtal:FObxCZFoeQkkaRuktJD5uhnN +matrix: + fast_finish: true + + env: - matrix: - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_MAGICK=true -DWITH_GMP=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=ON -DWITH_COVERAGE=true" - - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_QGLVIEWER=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=OFF" - - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_QGLVIEWER=true" DOC="true" + - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_QGLVIEWER=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=OFF" + - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_GMP=true" DOC=true + before_install: - openssl aes-256-cbc -K $encrypted_73d1df012ee4_key -iv $encrypted_73d1df012ee4_iv -in .travis/dgtal_rsa.enc -out .travis/dgtal_rsa -d before_script: - sudo apt-get -qq update - - sudo apt-get -qq install libboost-program-options-dev libcairo2-dev libgraphicsmagick++1-dev libboost-system-dev libgmp-dev libqglviewer-qt4-dev libinsighttoolkit3-dev libgdcm2-dev graphviz doxygen + - sudo apt-get -qq install libboost-program-options-dev libcairo2-dev libgraphicsmagick++1-dev libboost-system-dev libgmp-dev libqglviewer-qt4-dev libinsighttoolkit3-dev libgdcm2-dev - gem install coveralls-lcov - sudo apt-get install -y lcov script: - cmake . $BTYPE - - '[ "${DOC}" = "false" ] && make DGtal && make DGtalIO - - '[ "${DOC}" = "false" ] && cd examples && make -j 3 - - '[ "${DOC}" = "false" ] && cd ../tests && make && cd ..&& make test + - make DGtal && make DGtalIO + - cd examples && make -j 3 + - cd ../tests && make && cd ..&& make test after_script: - make lcov @@ -36,6 +40,6 @@ after_script: after_success: - - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && '[ "${DOC}" = "true" ] && make doc - - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && '[ "${DOC}" = "true" ] && ssh-add .travis/dgtal_rsa - - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && '[ "${DOC}" = "true" ] && rsync -azv --delete --delete-after html/ dgtal@liris.cnrs.fr:/home/dgtal/public_html/doc/nightly/ + - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && make doc || false' + - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && ssh-add .travis/dgtal_rsa || false' + - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && rsync -azv --delete --delete-after html/ dgtal@liris.cnrs.fr:/home/dgtal/public_html/doc/nightly/ || false' From 55945200c4658045cd614bb009a3c08178ca3da4 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Tue, 3 Feb 2015 17:56:21 +0100 Subject: [PATCH 10/55] deply --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3589723459..aefabe16c4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ matrix: env: - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_MAGICK=true -DWITH_GMP=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=ON -DWITH_COVERAGE=true" - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_QGLVIEWER=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=OFF" - - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_GMP=true" DOC=true + - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_GMP=true" DOC="true" before_install: @@ -32,7 +32,8 @@ script: - cmake . $BTYPE - make DGtal && make DGtalIO - cd examples && make -j 3 - - cd ../tests && make && cd ..&& make test + - cd ../tests && make && cd .. + - '[ "${DOC}" = "true" ] && true || make test' after_script: - make lcov From bf658ab8b5c5a3bce974559a13823a11782c3f3a Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Tue, 3 Feb 2015 18:07:46 +0100 Subject: [PATCH 11/55] deploy doc --- .travis.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index aefabe16c4..8176800022 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,17 +30,20 @@ before_script: script: - cmake . $BTYPE - - make DGtal && make DGtalIO - - cd examples && make -j 3 - - cd ../tests && make && cd .. + - '[ "${DOC}" = "true" ] && true || make DGtal && make DGtalIO' + - '[ "${DOC}" = "true" ] && true || cd examples && make -j 3 ' + - '[ "${DOC}" = "true" ] && true || cd ../tests && make && cd ..' - '[ "${DOC}" = "true" ] && true || make test' after_script: - - make lcov - - coveralls-lcov --source-encoding=ISO-8859-1 coverage/stap.info + - '[ "${DOC}" = "true" ] && true || make lcov' + - '[ "${DOC}" = "true" ] && true || coveralls-lcov --source-encoding=ISO-8859-1 coverage/stap.info' +## +## Building the documentation +## after_success: - - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && make doc || false' - - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && ssh-add .travis/dgtal_rsa || false' - - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && rsync -azv --delete --delete-after html/ dgtal@liris.cnrs.fr:/home/dgtal/public_html/doc/nightly/ || false' + - '[ "${DOC}" = "true" ] && make doc || false' + - '[ "${DOC}" = "true" ] && ssh-add .travis/dgtal_rsa || false' + - '[ "${DOC}" = "true" ] && rsync -azv --delete --delete-after html/ dgtal@liris.cnrs.fr:/home/dgtal/public_html/doc/nightly/ || false' From 417006ff3881369f95b08652e2c6508c8b273092 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Tue, 3 Feb 2015 18:17:20 +0100 Subject: [PATCH 12/55] deploy doc ok --- .travis.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8176800022..b023a454d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,20 +30,19 @@ before_script: script: - cmake . $BTYPE - - '[ "${DOC}" = "true" ] && true || make DGtal && make DGtalIO' - - '[ "${DOC}" = "true" ] && true || cd examples && make -j 3 ' - - '[ "${DOC}" = "true" ] && true || cd ../tests && make && cd ..' - - '[ "${DOC}" = "true" ] && true || make test' + - if [ ! $DOC == "true" ] then make DGtal && make DGtalIO; fi + - if [ ! $DOC == "true" ] then cd examples && make -j 3 ; fi + - if [ ! $DOC == "true" ] then cd ../tests && make && cd .. ; fi + - if [ ! $DOC == "true" ] then make test; fi after_script: - - '[ "${DOC}" = "true" ] && true || make lcov' - - '[ "${DOC}" = "true" ] && true || coveralls-lcov --source-encoding=ISO-8859-1 coverage/stap.info' + - if [ ! $DOC == "true" ] then make lcov; fi + - if [ ! $DOC == "true" ] then coveralls-lcov --source-encoding=ISO-8859-1 coverage/stap.info; fi ## ## Building the documentation ## after_success: - - '[ "${DOC}" = "true" ] && make doc || false' - - '[ "${DOC}" = "true" ] && ssh-add .travis/dgtal_rsa || false' - - '[ "${DOC}" = "true" ] && rsync -azv --delete --delete-after html/ dgtal@liris.cnrs.fr:/home/dgtal/public_html/doc/nightly/ || false' + - if [ $DOC == "true" ] then make doc && ssh-add .travis/dgtal_rsa; fi + - if [ $DOC == "true" ] then rsync -azv --delete --delete-after html/ dgtal@liris.cnrs.fr:/home/dgtal/public_html/doc/nightly/; fi From f66aaacf8b941d218a529633e2ff0a7b0d3b7ba9 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Tue, 3 Feb 2015 18:21:15 +0100 Subject: [PATCH 13/55] deploy doc ok --- .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index b023a454d9..834fdadd97 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,19 +30,19 @@ before_script: script: - cmake . $BTYPE - - if [ ! $DOC == "true" ] then make DGtal && make DGtalIO; fi - - if [ ! $DOC == "true" ] then cd examples && make -j 3 ; fi - - if [ ! $DOC == "true" ] then cd ../tests && make && cd .. ; fi - - if [ ! $DOC == "true" ] then make test; fi + - if [ ! $DOC == "true" ]; then make DGtal && make DGtalIO; fi + - if [ ! $DOC == "true" ]; then cd examples && make -j 3 ; fi + - if [ ! $DOC == "true" ]; then cd ../tests && make && cd .. ; fi + - if [ ! $DOC == "true" ]; then make test; fi after_script: - - if [ ! $DOC == "true" ] then make lcov; fi - - if [ ! $DOC == "true" ] then coveralls-lcov --source-encoding=ISO-8859-1 coverage/stap.info; fi + - if [ ! $DOC == "true" ]; then make lcov; fi + - if [ ! $DOC == "true" ]; then coveralls-lcov --source-encoding=ISO-8859-1 coverage/stap.info; fi ## ## Building the documentation ## after_success: - - if [ $DOC == "true" ] then make doc && ssh-add .travis/dgtal_rsa; fi - - if [ $DOC == "true" ] then rsync -azv --delete --delete-after html/ dgtal@liris.cnrs.fr:/home/dgtal/public_html/doc/nightly/; fi + - if [ $DOC == "true" ]; then make doc && ssh-add .travis/dgtal_rsa; fi + - if [ $DOC == "true" ]; then rsync -azv --delete --delete-after html/ dgtal@liris.cnrs.fr:/home/dgtal/public_html/doc/nightly/; fi From 949c0e6731075983b32e9061d2b3f20dfef6e403 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Tue, 3 Feb 2015 18:24:46 +0100 Subject: [PATCH 14/55] deploy doc ok --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 834fdadd97..bfafc4adff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ before_install: before_script: - sudo apt-get -qq update - - sudo apt-get -qq install libboost-program-options-dev libcairo2-dev libgraphicsmagick++1-dev libboost-system-dev libgmp-dev libqglviewer-qt4-dev libinsighttoolkit3-dev libgdcm2-dev + - sudo apt-get -qq install libboost-program-options-dev libcairo2-dev doxygen graphviz libgraphicsmagick++1-dev libboost-system-dev libgmp-dev libqglviewer-qt4-dev libinsighttoolkit3-dev libgdcm2-dev - gem install coveralls-lcov - sudo apt-get install -y lcov @@ -44,5 +44,6 @@ after_script: ## Building the documentation ## after_success: - - if [ $DOC == "true" ]; then make doc && ssh-add .travis/dgtal_rsa; fi + - if [ $DOC == "true" ]; then make doc; fi + - if [ $DOC == "true" ]; ssh-add .travis/dgtal_rsa; fi - if [ $DOC == "true" ]; then rsync -azv --delete --delete-after html/ dgtal@liris.cnrs.fr:/home/dgtal/public_html/doc/nightly/; fi From 11124e3777e7f0bfe7f50c86879b1f2a8ef0b2c5 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Tue, 3 Feb 2015 18:25:22 +0100 Subject: [PATCH 15/55] deploy doc ok --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index bfafc4adff..c3de188541 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,6 +30,7 @@ before_script: script: - cmake . $BTYPE + - echo $DOC - if [ ! $DOC == "true" ]; then make DGtal && make DGtalIO; fi - if [ ! $DOC == "true" ]; then cd examples && make -j 3 ; fi - if [ ! $DOC == "true" ]; then cd ../tests && make && cd .. ; fi From d42147c00a90143170c00508ebf0af90238df7d0 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Tue, 3 Feb 2015 18:28:01 +0100 Subject: [PATCH 16/55] deploy doc ok --- .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index c3de188541..94f9d7f592 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,8 +14,8 @@ matrix: env: - - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_MAGICK=true -DWITH_GMP=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=ON -DWITH_COVERAGE=true" - - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_QGLVIEWER=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=OFF" + - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_MAGICK=true -DWITH_GMP=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=ON -DWITH_COVERAGE=true" DOC="false" + - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_QGLVIEWER=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=OFF" DOC="false" - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_GMP=true" DOC="true" @@ -31,14 +31,14 @@ before_script: script: - cmake . $BTYPE - echo $DOC - - if [ ! $DOC == "true" ]; then make DGtal && make DGtalIO; fi - - if [ ! $DOC == "true" ]; then cd examples && make -j 3 ; fi - - if [ ! $DOC == "true" ]; then cd ../tests && make && cd .. ; fi - - if [ ! $DOC == "true" ]; then make test; fi + - if [ $DOC == "false" ]; then make DGtal && make DGtalIO; fi + - if [ $DOC == "false" ]; then cd examples && make -j 3 ; fi + - if [ $DOC == "false" ]; then cd ../tests && make && cd .. ; fi + - if [ $DOC == "false" ]; then make test; fi after_script: - - if [ ! $DOC == "true" ]; then make lcov; fi - - if [ ! $DOC == "true" ]; then coveralls-lcov --source-encoding=ISO-8859-1 coverage/stap.info; fi + - if [ $DOC == "false" ]; then make lcov; fi + - if [ $DOC == "false" ]; then coveralls-lcov --source-encoding=ISO-8859-1 coverage/stap.info; fi ## From 7eb40534cd4c6f99fb61e6a98371ca2665b28fe9 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Tue, 3 Feb 2015 18:44:40 +0100 Subject: [PATCH 17/55] adding osx --- .travis.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 94f9d7f592..38df2f5879 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,9 @@ language: cpp +os: + - linux + - osx + compiler: - gcc - clang @@ -23,14 +27,12 @@ before_install: - openssl aes-256-cbc -K $encrypted_73d1df012ee4_key -iv $encrypted_73d1df012ee4_iv -in .travis/dgtal_rsa.enc -out .travis/dgtal_rsa -d before_script: - - sudo apt-get -qq update - - sudo apt-get -qq install libboost-program-options-dev libcairo2-dev doxygen graphviz libgraphicsmagick++1-dev libboost-system-dev libgmp-dev libqglviewer-qt4-dev libinsighttoolkit3-dev libgdcm2-dev - - gem install coveralls-lcov - - sudo apt-get install -y lcov + - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get -qq update && sudo apt-get -qq install libboost-program-options-dev libcairo2-dev doxygen graphviz libgraphicsmagick++1-dev li boost-system-dev libgmp-dev libqglviewer-qt4-dev libinsighttoolkit3-dev libgdcm2-dev lcov; fi + - if [ $TRAVIS_OS_NAME == linux ]; then gem install coveralls-lcov; fi + - if [ $TRAVIS_OS_NAME == osx ]; then brew install boost doxygen grahviz graphicsmagick insighttoolkit gmp qglviewer; fi script: - cmake . $BTYPE - - echo $DOC - if [ $DOC == "false" ]; then make DGtal && make DGtalIO; fi - if [ $DOC == "false" ]; then cd examples && make -j 3 ; fi - if [ $DOC == "false" ]; then cd ../tests && make && cd .. ; fi From d3b1ffe04c8bedcdd4bbc5bbd3ce328c7be6f48a Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Tue, 3 Feb 2015 18:45:22 +0100 Subject: [PATCH 18/55] adding osx --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 38df2f5879..cdccbcdd27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,5 +48,5 @@ after_script: ## after_success: - if [ $DOC == "true" ]; then make doc; fi - - if [ $DOC == "true" ]; ssh-add .travis/dgtal_rsa; fi + - if [ $DOC == "true" ]; then ssh-add .travis/dgtal_rsa; fi - if [ $DOC == "true" ]; then rsync -azv --delete --delete-after html/ dgtal@liris.cnrs.fr:/home/dgtal/public_html/doc/nightly/; fi From 0dbea0d48f0a4f3bc8cf3136853bde1b677b68d5 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Tue, 3 Feb 2015 18:53:15 +0100 Subject: [PATCH 19/55] adding osx --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cdccbcdd27..b962d38a61 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ before_install: - openssl aes-256-cbc -K $encrypted_73d1df012ee4_key -iv $encrypted_73d1df012ee4_iv -in .travis/dgtal_rsa.enc -out .travis/dgtal_rsa -d before_script: - - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get -qq update && sudo apt-get -qq install libboost-program-options-dev libcairo2-dev doxygen graphviz libgraphicsmagick++1-dev li boost-system-dev libgmp-dev libqglviewer-qt4-dev libinsighttoolkit3-dev libgdcm2-dev lcov; fi + - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get -qq update && sudo apt-get -qq install libboost-program-options-dev libcairo2-dev doxygen graphviz libgraphicsmagick++1-dev libboost-system-dev libgmp-dev libqglviewer-qt4-dev libinsighttoolkit3-dev libgdcm2-dev lcov; fi - if [ $TRAVIS_OS_NAME == linux ]; then gem install coveralls-lcov; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew install boost doxygen grahviz graphicsmagick insighttoolkit gmp qglviewer; fi From ea9a868c9490e4101a3abcb441014588caa2e864 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Tue, 3 Feb 2015 19:08:07 +0100 Subject: [PATCH 20/55] adding osx ssh --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index b962d38a61..d3a338ab0f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ before_install: - openssl aes-256-cbc -K $encrypted_73d1df012ee4_key -iv $encrypted_73d1df012ee4_iv -in .travis/dgtal_rsa.enc -out .travis/dgtal_rsa -d before_script: - - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get -qq update && sudo apt-get -qq install libboost-program-options-dev libcairo2-dev doxygen graphviz libgraphicsmagick++1-dev libboost-system-dev libgmp-dev libqglviewer-qt4-dev libinsighttoolkit3-dev libgdcm2-dev lcov; fi + - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get -qq update && sudo apt-get -qq install libboost-program-options-dev libcairo2-dev doxygen graphviz libgraphicsmagick++1-dev lib boost-system-dev libgmp-dev libqglviewer-qt4-dev libinsighttoolkit3-dev libgdcm2-dev lcov; fi - if [ $TRAVIS_OS_NAME == linux ]; then gem install coveralls-lcov; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew install boost doxygen grahviz graphicsmagick insighttoolkit gmp qglviewer; fi @@ -48,5 +48,4 @@ after_script: ## after_success: - if [ $DOC == "true" ]; then make doc; fi - - if [ $DOC == "true" ]; then ssh-add .travis/dgtal_rsa; fi - - if [ $DOC == "true" ]; then rsync -azv --delete --delete-after html/ dgtal@liris.cnrs.fr:/home/dgtal/public_html/doc/nightly/; fi + - if [ $DOC == "true" ]; then rsync -azv --delete --delete-after -e 'ssh -oStrictHostKeyChecking=no -i .travis/dgtal_rsa' html/ dgtal@liris.cnrs.fr:/home/dgtal/public_html/doc/nightly/; fi From ca6b2f55cdeadff9c0db265535978c0bcde09dc7 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Tue, 3 Feb 2015 19:12:24 +0100 Subject: [PATCH 21/55] adding osx ssh --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d3a338ab0f..f76f36aa5f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ before_install: - openssl aes-256-cbc -K $encrypted_73d1df012ee4_key -iv $encrypted_73d1df012ee4_iv -in .travis/dgtal_rsa.enc -out .travis/dgtal_rsa -d before_script: - - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get -qq update && sudo apt-get -qq install libboost-program-options-dev libcairo2-dev doxygen graphviz libgraphicsmagick++1-dev lib boost-system-dev libgmp-dev libqglviewer-qt4-dev libinsighttoolkit3-dev libgdcm2-dev lcov; fi + - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get -qq update && sudo apt-get -qq install libboost-program-options-dev libcairo2-dev doxygen graphviz libgraphicsmagick++1-dev libboost-system-dev libgmp-dev libqglviewer-qt4-dev libinsighttoolkit3-dev libgdcm2-dev lcov; fi - if [ $TRAVIS_OS_NAME == linux ]; then gem install coveralls-lcov; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew install boost doxygen grahviz graphicsmagick insighttoolkit gmp qglviewer; fi From 987fd9ac74933e1d66ad0a34c600f3275810b352 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Tue, 3 Feb 2015 19:27:32 +0100 Subject: [PATCH 22/55] adding osx ssh key --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f76f36aa5f..a3226f32be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,11 +25,12 @@ env: before_install: - openssl aes-256-cbc -K $encrypted_73d1df012ee4_key -iv $encrypted_73d1df012ee4_iv -in .travis/dgtal_rsa.enc -out .travis/dgtal_rsa -d + - chmod 600 .travis/dgtal_rsa before_script: - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get -qq update && sudo apt-get -qq install libboost-program-options-dev libcairo2-dev doxygen graphviz libgraphicsmagick++1-dev libboost-system-dev libgmp-dev libqglviewer-qt4-dev libinsighttoolkit3-dev libgdcm2-dev lcov; fi - if [ $TRAVIS_OS_NAME == linux ]; then gem install coveralls-lcov; fi - - if [ $TRAVIS_OS_NAME == osx ]; then brew install boost doxygen grahviz graphicsmagick insighttoolkit gmp qglviewer; fi + - if [ $TRAVIS_OS_NAME == osx ]; then brew update; brew install boost doxygen grahviz graphicsmagick insighttoolkit gmp qglviewer; fi script: - cmake . $BTYPE From 000808a8832bb1fadba12a8fc72895758264a069 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Tue, 3 Feb 2015 20:21:05 +0100 Subject: [PATCH 23/55] osx --- .travis.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index a3226f32be..493dd5f20d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,5 @@ language: cpp -os: - - linux - - osx - compiler: - gcc - clang @@ -50,3 +46,9 @@ after_script: after_success: - if [ $DOC == "true" ]; then make doc; fi - if [ $DOC == "true" ]; then rsync -azv --delete --delete-after -e 'ssh -oStrictHostKeyChecking=no -i .travis/dgtal_rsa' html/ dgtal@liris.cnrs.fr:/home/dgtal/public_html/doc/nightly/; fi + +os: + - linux + - osx + +osx_image: xcode61 \ No newline at end of file From ca25cfddcf00a4a23763c00764a59fbbb4884488 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Tue, 3 Feb 2015 23:02:16 +0100 Subject: [PATCH 24/55] osx --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 493dd5f20d..35eab9f540 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,6 +46,7 @@ after_script: after_success: - if [ $DOC == "true" ]; then make doc; fi - if [ $DOC == "true" ]; then rsync -azv --delete --delete-after -e 'ssh -oStrictHostKeyChecking=no -i .travis/dgtal_rsa' html/ dgtal@liris.cnrs.fr:/home/dgtal/public_html/doc/nightly/; fi + - if [ $DOC == "true" ]; then if [ $TRAVIS_OS_NAME == "osx" ]; cd html; make ; fi fi os: - linux From 13c85c072cbbac2a65f1ccbc2ffa1f0ade910439 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Wed, 4 Feb 2015 09:03:44 +0100 Subject: [PATCH 25/55] osx build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 35eab9f540..c727cc2320 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ before_install: before_script: - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get -qq update && sudo apt-get -qq install libboost-program-options-dev libcairo2-dev doxygen graphviz libgraphicsmagick++1-dev libboost-system-dev libgmp-dev libqglviewer-qt4-dev libinsighttoolkit3-dev libgdcm2-dev lcov; fi - if [ $TRAVIS_OS_NAME == linux ]; then gem install coveralls-lcov; fi - - if [ $TRAVIS_OS_NAME == osx ]; then brew update; brew install boost doxygen grahviz graphicsmagick insighttoolkit gmp qglviewer; fi + - if [ $TRAVIS_OS_NAME == osx ]; then brew update; brew install boost doxygen graphviz graphicsmagick insighttoolkit gmp libqglviewer; fi script: - cmake . $BTYPE From 3608e7e4ad4ea6bc7cfc48f815a30c9c9931f84e Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Wed, 4 Feb 2015 09:04:11 +0100 Subject: [PATCH 26/55] osx build --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c727cc2320..f194c79179 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,9 +40,10 @@ after_script: - if [ $DOC == "false" ]; then coveralls-lcov --source-encoding=ISO-8859-1 coverage/stap.info; fi -## +### ## Building the documentation -## +### + after_success: - if [ $DOC == "true" ]; then make doc; fi - if [ $DOC == "true" ]; then rsync -azv --delete --delete-after -e 'ssh -oStrictHostKeyChecking=no -i .travis/dgtal_rsa' html/ dgtal@liris.cnrs.fr:/home/dgtal/public_html/doc/nightly/; fi From 08d61890e8e9c569fe48511afe22231400ab6db5 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Wed, 4 Feb 2015 10:13:58 +0100 Subject: [PATCH 27/55] fix travis for osx --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f194c79179..f5b56015d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,6 @@ notifications: matrix: fast_finish: true - env: - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_MAGICK=true -DWITH_GMP=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=ON -DWITH_COVERAGE=true" DOC="false" - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_QGLVIEWER=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=OFF" DOC="false" @@ -53,4 +52,4 @@ os: - linux - osx -osx_image: xcode61 \ No newline at end of file +osx_image: xcode61 From 8d5605040c2e20ad2d02cf081b1806553b168349 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Wed, 4 Feb 2015 10:16:38 +0100 Subject: [PATCH 28/55] homebrew --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f5b56015d1..2a5ee76c39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ before_install: before_script: - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get -qq update && sudo apt-get -qq install libboost-program-options-dev libcairo2-dev doxygen graphviz libgraphicsmagick++1-dev libboost-system-dev libgmp-dev libqglviewer-qt4-dev libinsighttoolkit3-dev libgdcm2-dev lcov; fi - if [ $TRAVIS_OS_NAME == linux ]; then gem install coveralls-lcov; fi - - if [ $TRAVIS_OS_NAME == osx ]; then brew update; brew install boost doxygen graphviz graphicsmagick insighttoolkit gmp libqglviewer; fi + - if [ $TRAVIS_OS_NAME == osx ]; then brew update; brew install boost doxygen graphviz graphicsmagick homebrew/science/insighttoolkit gmp libqglviewer; fi script: - cmake . $BTYPE From 6d0ab7cf1f980642f7a352b17e44d9e833babd51 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Wed, 4 Feb 2015 10:23:30 +0100 Subject: [PATCH 29/55] cleanup --- .travis.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2a5ee76c39..1997dd198e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,15 +13,20 @@ matrix: fast_finish: true env: - - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_MAGICK=true -DWITH_GMP=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=ON -DWITH_COVERAGE=true" DOC="false" - - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_QGLVIEWER=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=OFF" DOC="false" - - BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_GMP=true" DOC="true" - - + - CONFIG="Debug,Magick,GMP,Coverage" + - CONFIG="Debug,Cairo,QGLviewer" + - CONFIG="Documentation,Debug,Cairo,GMP" + before_install: - openssl aes-256-cbc -K $encrypted_73d1df012ee4_key -iv $encrypted_73d1df012ee4_iv -in .travis/dgtal_rsa.enc -out .travis/dgtal_rsa -d - chmod 600 .travis/dgtal_rsa + - if [ $CONFIG == "Debug,Magick,GMP,Coverage"]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_MAGICK=true -DWITH_GMP=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=ON -DWITH_COVERAGE=true" DOC="false"; fi + - if [ $CONFIG == "Debug,Cairo,QGLviewer"]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_QGLVIEWER=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=OFF" DOC="false"; fi + - if [ $CONFIG == "Documentation,Debug,Cairo,GMP"]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_GMP=true" DOC="true"; fi + - + + before_script: - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get -qq update && sudo apt-get -qq install libboost-program-options-dev libcairo2-dev doxygen graphviz libgraphicsmagick++1-dev libboost-system-dev libgmp-dev libqglviewer-qt4-dev libinsighttoolkit3-dev libgdcm2-dev lcov; fi - if [ $TRAVIS_OS_NAME == linux ]; then gem install coveralls-lcov; fi From 5305e4e13b2d69cf2c1e6e77ca5bbd3f445a8f3d Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Wed, 4 Feb 2015 10:27:47 +0100 Subject: [PATCH 30/55] cleanup (matrix) --- .travis.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1997dd198e..4b27a28e3e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,17 @@ env: - CONFIG="Debug,Magick,GMP,Coverage" - CONFIG="Debug,Cairo,QGLviewer" - CONFIG="Documentation,Debug,Cairo,GMP" - + +matrix: + exclude: + - os: osx + env: CONFIG="Documentation,Debug,Cairo,GMP" + - compiler: clang + os: gcc + env: CONFIG="Documentation,Debug,Cairo,GMP" + + + before_install: - openssl aes-256-cbc -K $encrypted_73d1df012ee4_key -iv $encrypted_73d1df012ee4_iv -in .travis/dgtal_rsa.enc -out .travis/dgtal_rsa -d - chmod 600 .travis/dgtal_rsa From 1a785c4212e40f24fc1cae16d67d876faca02774 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Wed, 4 Feb 2015 10:28:40 +0100 Subject: [PATCH 31/55] cleanup (matrix) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4b27a28e3e..23eabb44c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ matrix: - os: osx env: CONFIG="Documentation,Debug,Cairo,GMP" - compiler: clang - os: gcc + os: linux env: CONFIG="Documentation,Debug,Cairo,GMP" From e4f47096571306bed2b91657e542b8c68a30c724 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Wed, 4 Feb 2015 10:38:02 +0100 Subject: [PATCH 32/55] cleanup (matrix - fix) --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 23eabb44c7..aa10027ecc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,9 +31,9 @@ before_install: - openssl aes-256-cbc -K $encrypted_73d1df012ee4_key -iv $encrypted_73d1df012ee4_iv -in .travis/dgtal_rsa.enc -out .travis/dgtal_rsa -d - chmod 600 .travis/dgtal_rsa - - if [ $CONFIG == "Debug,Magick,GMP,Coverage"]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_MAGICK=true -DWITH_GMP=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=ON -DWITH_COVERAGE=true" DOC="false"; fi - - if [ $CONFIG == "Debug,Cairo,QGLviewer"]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_QGLVIEWER=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=OFF" DOC="false"; fi - - if [ $CONFIG == "Documentation,Debug,Cairo,GMP"]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_GMP=true" DOC="true"; fi + - if [ $CONFIG == "Debug,Magick,GMP,Coverage"]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_MAGICK=true -DWITH_GMP=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=ON -DWITH_COVERAGE=true"; DOC="false"; fi + - if [ $CONFIG == "Debug,Cairo,QGLviewer"]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_QGLVIEWER=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=OFF"; DOC="false"; fi + - if [ $CONFIG == "Documentation,Debug,Cairo,GMP"]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_GMP=true"; DOC="true"; fi - From f2da05bd757f1af171ff81361768319f076902cf Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Wed, 4 Feb 2015 10:39:24 +0100 Subject: [PATCH 33/55] cleanup (matrix - fix) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index aa10027ecc..90f0889fe4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ before_install: before_script: - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get -qq update && sudo apt-get -qq install libboost-program-options-dev libcairo2-dev doxygen graphviz libgraphicsmagick++1-dev libboost-system-dev libgmp-dev libqglviewer-qt4-dev libinsighttoolkit3-dev libgdcm2-dev lcov; fi - if [ $TRAVIS_OS_NAME == linux ]; then gem install coveralls-lcov; fi - - if [ $TRAVIS_OS_NAME == osx ]; then brew update; brew install boost doxygen graphviz graphicsmagick homebrew/science/insighttoolkit gmp libqglviewer; fi + - if [ $TRAVIS_OS_NAME == osx ]; then brew update; brew install boost doxygen graphviz graphicsmagick homebrew/science/insighttoolkit gmp libqglviewer; echo "done";fi script: - cmake . $BTYPE From 6cb24057d14d1bbdea98ba88d225de6d84597012 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Wed, 4 Feb 2015 10:44:51 +0100 Subject: [PATCH 34/55] cleanup (matrix - fix) --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 90f0889fe4..b919364759 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,6 +44,8 @@ before_script: script: - cmake . $BTYPE + - echo $DOC + - echo $BTYPE - if [ $DOC == "false" ]; then make DGtal && make DGtalIO; fi - if [ $DOC == "false" ]; then cd examples && make -j 3 ; fi - if [ $DOC == "false" ]; then cd ../tests && make && cd .. ; fi From e429c1da27825d0477e9e59781ea2005ab0d6710 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Wed, 4 Feb 2015 10:58:10 +0100 Subject: [PATCH 35/55] cleanup (matrix - fix) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b919364759..adcfd50540 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ before_install: - openssl aes-256-cbc -K $encrypted_73d1df012ee4_key -iv $encrypted_73d1df012ee4_iv -in .travis/dgtal_rsa.enc -out .travis/dgtal_rsa -d - chmod 600 .travis/dgtal_rsa - - if [ $CONFIG == "Debug,Magick,GMP,Coverage"]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_MAGICK=true -DWITH_GMP=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=ON -DWITH_COVERAGE=true"; DOC="false"; fi + - if [ $CONFIG == "Debug,Magick,GMP,Coverage"]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_MAGICK=true -DWITH_GMP=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=ON -DWITH_COVERAGE=true"; DOC="false"; echo BIIIIMMM ; echo $DOC; fi - if [ $CONFIG == "Debug,Cairo,QGLviewer"]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_QGLVIEWER=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=OFF"; DOC="false"; fi - if [ $CONFIG == "Documentation,Debug,Cairo,GMP"]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_GMP=true"; DOC="true"; fi - From 56d4ab3c26725dc57aded0cdc3e37df15adcbee5 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Wed, 4 Feb 2015 11:02:52 +0100 Subject: [PATCH 36/55] cleanup (matrix - fix) --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index adcfd50540..ba02001994 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,9 +31,9 @@ before_install: - openssl aes-256-cbc -K $encrypted_73d1df012ee4_key -iv $encrypted_73d1df012ee4_iv -in .travis/dgtal_rsa.enc -out .travis/dgtal_rsa -d - chmod 600 .travis/dgtal_rsa - - if [ $CONFIG == "Debug,Magick,GMP,Coverage"]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_MAGICK=true -DWITH_GMP=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=ON -DWITH_COVERAGE=true"; DOC="false"; echo BIIIIMMM ; echo $DOC; fi - - if [ $CONFIG == "Debug,Cairo,QGLviewer"]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_QGLVIEWER=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=OFF"; DOC="false"; fi - - if [ $CONFIG == "Documentation,Debug,Cairo,GMP"]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_GMP=true"; DOC="true"; fi + - if [ $CONFIG == "Debug,Magick,GMP,Coverage" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_MAGICK=true -DWITH_GMP=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=ON -DWITH_COVERAGE=true"; DOC="false"; echo BIIIIMMM ; echo $DOC; fi + - if [ $CONFIG == "Debug,Cairo,QGLviewer" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_QGLVIEWER=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=OFF"; DOC="false"; fi + - if [ $CONFIG == "Documentation,Debug,Cairo,GMP" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_GMP=true"; DOC="true"; fi - From 8690ae3595bfc67df094e2692b1b670b8dd6cc10 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Wed, 4 Feb 2015 11:09:55 +0100 Subject: [PATCH 37/55] cleanup (matrix again) --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ba02001994..587feb8f7b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,17 +21,19 @@ matrix: exclude: - os: osx env: CONFIG="Documentation,Debug,Cairo,GMP" + - os: osx + compiler: gcc - compiler: clang os: linux env: CONFIG="Documentation,Debug,Cairo,GMP" - + before_install: - openssl aes-256-cbc -K $encrypted_73d1df012ee4_key -iv $encrypted_73d1df012ee4_iv -in .travis/dgtal_rsa.enc -out .travis/dgtal_rsa -d - chmod 600 .travis/dgtal_rsa - - if [ $CONFIG == "Debug,Magick,GMP,Coverage" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_MAGICK=true -DWITH_GMP=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=ON -DWITH_COVERAGE=true"; DOC="false"; echo BIIIIMMM ; echo $DOC; fi + - if [ $CONFIG == "Debug,Magick,GMP,Coverage" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_MAGICK=true -DWITH_GMP=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=ON -DWITH_COVERAGE=true"; DOC="false"; fi - if [ $CONFIG == "Debug,Cairo,QGLviewer" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_QGLVIEWER=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=OFF"; DOC="false"; fi - if [ $CONFIG == "Documentation,Debug,Cairo,GMP" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_GMP=true"; DOC="true"; fi - From 5be5938cc6ddc60238afd2fe73d98c32cb021c9c Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Wed, 4 Feb 2015 11:20:34 +0100 Subject: [PATCH 38/55] HDF5 --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 587feb8f7b..9cabc37b73 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ matrix: env: - CONFIG="Debug,Magick,GMP,Coverage" - - CONFIG="Debug,Cairo,QGLviewer" + - CONFIG="Debug,Cairo,QGLviewer,HDF5" - CONFIG="Documentation,Debug,Cairo,GMP" matrix: @@ -33,16 +33,16 @@ before_install: - openssl aes-256-cbc -K $encrypted_73d1df012ee4_key -iv $encrypted_73d1df012ee4_iv -in .travis/dgtal_rsa.enc -out .travis/dgtal_rsa -d - chmod 600 .travis/dgtal_rsa - - if [ $CONFIG == "Debug,Magick,GMP,Coverage" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_MAGICK=true -DWITH_GMP=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=ON -DWITH_COVERAGE=true"; DOC="false"; fi - - if [ $CONFIG == "Debug,Cairo,QGLviewer" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_QGLVIEWER=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=OFF"; DOC="false"; fi + - if [ $CONFIG == "Debug,Magick,GMP,Coverage" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_MAGICK=true -DWITH_GMP=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=ON -DWITH_COVERAGE=true"; DOC="false"; fi + - if [ $CONFIG == "Debug,Cairo,QGLviewer,HDF5" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWTH_HDF5=true -DWITH_CAIRO=true -DWITH_QGLVIEWER=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=OFF"; DOC="false"; fi - if [ $CONFIG == "Documentation,Debug,Cairo,GMP" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_GMP=true"; DOC="true"; fi - before_script: - - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get -qq update && sudo apt-get -qq install libboost-program-options-dev libcairo2-dev doxygen graphviz libgraphicsmagick++1-dev libboost-system-dev libgmp-dev libqglviewer-qt4-dev libinsighttoolkit3-dev libgdcm2-dev lcov; fi + - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get -qq update && sudo apt-get -qq install hdf5 libboost-program-options-dev libcairo2-dev doxygen graphviz libgraphicsmagick++1-dev libboost-system-dev libgmp-dev libqglviewer-qt4-dev libinsighttoolkit3-dev libgdcm2-dev lcov; fi - if [ $TRAVIS_OS_NAME == linux ]; then gem install coveralls-lcov; fi - - if [ $TRAVIS_OS_NAME == osx ]; then brew update; brew install boost doxygen graphviz graphicsmagick homebrew/science/insighttoolkit gmp libqglviewer; echo "done";fi + - if [ $TRAVIS_OS_NAME == osx ]; then brew update; brew install boost doxygen hdf5 graphviz graphicsmagick homebrew/science/insighttoolkit gmp libqglviewer; echo "done";fi script: - cmake . $BTYPE From eebf1d045404d40104fa8c6326bec62668a17ff7 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Wed, 4 Feb 2015 11:38:09 +0100 Subject: [PATCH 39/55] HDF5 (fix) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9cabc37b73..02946cdf4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ before_install: before_script: - - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get -qq update && sudo apt-get -qq install hdf5 libboost-program-options-dev libcairo2-dev doxygen graphviz libgraphicsmagick++1-dev libboost-system-dev libgmp-dev libqglviewer-qt4-dev libinsighttoolkit3-dev libgdcm2-dev lcov; fi + - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get -qq update && sudo apt-get -qq install libhdf5-dev libboost-program-options-dev libcairo2-dev doxygen graphviz libgraphicsmagick++1-dev libboost-system-dev libgmp-dev libqglviewer-qt4-dev libinsighttoolkit3-dev libgdcm2-dev lcov; fi - if [ $TRAVIS_OS_NAME == linux ]; then gem install coveralls-lcov; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew update; brew install boost doxygen hdf5 graphviz graphicsmagick homebrew/science/insighttoolkit gmp libqglviewer; echo "done";fi From 43da79cebee1985d5f8a6a865ae3dba6332f15d9 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Wed, 4 Feb 2015 11:44:30 +0100 Subject: [PATCH 40/55] HDF5 (fixbis) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 02946cdf4d..6c1bf8106e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ before_install: before_script: - - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get -qq update && sudo apt-get -qq install libhdf5-dev libboost-program-options-dev libcairo2-dev doxygen graphviz libgraphicsmagick++1-dev libboost-system-dev libgmp-dev libqglviewer-qt4-dev libinsighttoolkit3-dev libgdcm2-dev lcov; fi + - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get -qq update && sudo apt-get -qq install hdf5-tools libboost-program-options-dev libcairo2-dev doxygen graphviz libgraphicsmagick++1-dev libboost-system-dev libgmp-dev libqglviewer-qt4-dev libinsighttoolkit3-dev libgdcm2-dev lcov; fi - if [ $TRAVIS_OS_NAME == linux ]; then gem install coveralls-lcov; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew update; brew install boost doxygen hdf5 graphviz graphicsmagick homebrew/science/insighttoolkit gmp libqglviewer; echo "done";fi From 9857f4df493e3dcb895dfc234bcbe12296f997f5 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Wed, 4 Feb 2015 12:18:09 +0100 Subject: [PATCH 41/55] docset on mac --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6c1bf8106e..92cf31bf38 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,13 +19,13 @@ env: matrix: exclude: - - os: osx + - os: linux + env: CONFIG="Documentation,Debug,Cairo,GMP" + - compiler: gcc + os: osx env: CONFIG="Documentation,Debug,Cairo,GMP" - os: osx compiler: gcc - - compiler: clang - os: linux - env: CONFIG="Documentation,Debug,Cairo,GMP" From a7ee005d0320bc13ea354a54642686f0ade5365e Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Wed, 4 Feb 2015 12:53:58 +0100 Subject: [PATCH 42/55] docset on mac --- .travis.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 92cf31bf38..3d72dae0e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,15 +9,13 @@ cache: apt notifications: slack: dgtal:FObxCZFoeQkkaRuktJD5uhnN -matrix: - fast_finish: true - env: - CONFIG="Debug,Magick,GMP,Coverage" - CONFIG="Debug,Cairo,QGLviewer,HDF5" - CONFIG="Documentation,Debug,Cairo,GMP" matrix: + fast_finish: true exclude: - os: linux env: CONFIG="Documentation,Debug,Cairo,GMP" @@ -34,7 +32,7 @@ before_install: - chmod 600 .travis/dgtal_rsa - if [ $CONFIG == "Debug,Magick,GMP,Coverage" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_MAGICK=true -DWITH_GMP=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=ON -DWITH_COVERAGE=true"; DOC="false"; fi - - if [ $CONFIG == "Debug,Cairo,QGLviewer,HDF5" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWTH_HDF5=true -DWITH_CAIRO=true -DWITH_QGLVIEWER=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=OFF"; DOC="false"; fi + - if [ $CONFIG == "Debug,Cairo,QGLviewer,HDF5" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_HDF5=true -DWITH_CAIRO=true -DWITH_QGLVIEWER=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=OFF"; DOC="false"; fi - if [ $CONFIG == "Documentation,Debug,Cairo,GMP" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_GMP=true"; DOC="true"; fi - @@ -65,7 +63,7 @@ after_script: after_success: - if [ $DOC == "true" ]; then make doc; fi - if [ $DOC == "true" ]; then rsync -azv --delete --delete-after -e 'ssh -oStrictHostKeyChecking=no -i .travis/dgtal_rsa' html/ dgtal@liris.cnrs.fr:/home/dgtal/public_html/doc/nightly/; fi - - if [ $DOC == "true" ]; then if [ $TRAVIS_OS_NAME == "osx" ]; cd html; make ; fi fi + - if [ $DOC == "true" ]; then if [ $TRAVIS_OS_NAME == "osx" ]; cd html; make ; fi; fi os: - linux From 465cd1192da09364e3bd31b76211fdd1878be98c Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Wed, 4 Feb 2015 14:02:53 +0100 Subject: [PATCH 43/55] linux hdf5 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3d72dae0e1..47350f3b0c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,7 @@ before_install: before_script: - - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get -qq update && sudo apt-get -qq install hdf5-tools libboost-program-options-dev libcairo2-dev doxygen graphviz libgraphicsmagick++1-dev libboost-system-dev libgmp-dev libqglviewer-qt4-dev libinsighttoolkit3-dev libgdcm2-dev lcov; fi + - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get -qq update && sudo apt-get -qq install libhdf5-serial-dev libboost-program-options-dev libcairo2-dev doxygen graphviz libgraphicsmagick++1-dev libboost-system-dev libgmp-dev libqglviewer-qt4-dev libinsighttoolkit3-dev libgdcm2-dev lcov; fi - if [ $TRAVIS_OS_NAME == linux ]; then gem install coveralls-lcov; fi - if [ $TRAVIS_OS_NAME == osx ]; then brew update; brew install boost doxygen hdf5 graphviz graphicsmagick homebrew/science/insighttoolkit gmp libqglviewer; echo "done";fi From 6c96782a59f4605078da5c1b05f255f38430b0bd Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Wed, 4 Feb 2015 15:22:20 +0100 Subject: [PATCH 44/55] linux hdf5 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 47350f3b0c..371f8f5c87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,7 +63,7 @@ after_script: after_success: - if [ $DOC == "true" ]; then make doc; fi - if [ $DOC == "true" ]; then rsync -azv --delete --delete-after -e 'ssh -oStrictHostKeyChecking=no -i .travis/dgtal_rsa' html/ dgtal@liris.cnrs.fr:/home/dgtal/public_html/doc/nightly/; fi - - if [ $DOC == "true" ]; then if [ $TRAVIS_OS_NAME == "osx" ]; cd html; make ; fi; fi + - if [ $DOC == "true" ]; then if [ $TRAVIS_OS_NAME == "osx" ]; then cd html; make ; fi; fi os: - linux From 8867f9c17f9667413ae9e5dd98815b57ece911af Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Wed, 4 Feb 2015 15:43:28 +0100 Subject: [PATCH 45/55] linux hdf5 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 371f8f5c87..985c03d316 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ before_install: before_script: - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get -qq update && sudo apt-get -qq install libhdf5-serial-dev libboost-program-options-dev libcairo2-dev doxygen graphviz libgraphicsmagick++1-dev libboost-system-dev libgmp-dev libqglviewer-qt4-dev libinsighttoolkit3-dev libgdcm2-dev lcov; fi - if [ $TRAVIS_OS_NAME == linux ]; then gem install coveralls-lcov; fi - - if [ $TRAVIS_OS_NAME == osx ]; then brew update; brew install boost doxygen hdf5 graphviz graphicsmagick homebrew/science/insighttoolkit gmp libqglviewer; echo "done";fi + - if [ $TRAVIS_OS_NAME == osx ]; then brew update; brew install boost doxygen hdf5 graphviz graphicsmagick homebrew/science/insighttoolkit gmp libqglviewer; sudo ln -s /usr/local/Cellar/libqglviewer/2.5.1/QGLViewer.framework /Library/Frameworks/ ; echo "done";fi script: - cmake . $BTYPE From 8b4793ee1963764012ed341e3e992379119292f2 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Fri, 6 Feb 2015 13:26:59 +0100 Subject: [PATCH 46/55] docset publish --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 985c03d316..f491f6d3dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,7 +63,7 @@ after_script: after_success: - if [ $DOC == "true" ]; then make doc; fi - if [ $DOC == "true" ]; then rsync -azv --delete --delete-after -e 'ssh -oStrictHostKeyChecking=no -i .travis/dgtal_rsa' html/ dgtal@liris.cnrs.fr:/home/dgtal/public_html/doc/nightly/; fi - - if [ $DOC == "true" ]; then if [ $TRAVIS_OS_NAME == "osx" ]; then cd html; make ; fi; fi + - if [ $DOC == "true" ]; then if [ $TRAVIS_OS_NAME == "osx" ]; then cd html; make ; wget http://dgtal.org/doc/docset/template.tgz ; tar zxvf template.tgz ; mv template/* org.dgtal.docset ; tar zcvf DGtal-devel.tgz org.dgtal.docset ; rsync -azv --delete --delete-after -e 'ssh -oStrictHostKeyChecking=no -i .travis/dgtal_rsa' DGtal-devel.tgz dgtal@liris.cnrs.fr:/home/dgtal/public_html/doc/docset ; fi; fi os: - linux From e0c5954164a7af82f6c7814dac8849c50b28d149 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Fri, 6 Feb 2015 17:29:41 +0100 Subject: [PATCH 47/55] linux hdf5 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f491f6d3dd..6396d52c30 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,7 +63,7 @@ after_script: after_success: - if [ $DOC == "true" ]; then make doc; fi - if [ $DOC == "true" ]; then rsync -azv --delete --delete-after -e 'ssh -oStrictHostKeyChecking=no -i .travis/dgtal_rsa' html/ dgtal@liris.cnrs.fr:/home/dgtal/public_html/doc/nightly/; fi - - if [ $DOC == "true" ]; then if [ $TRAVIS_OS_NAME == "osx" ]; then cd html; make ; wget http://dgtal.org/doc/docset/template.tgz ; tar zxvf template.tgz ; mv template/* org.dgtal.docset ; tar zcvf DGtal-devel.tgz org.dgtal.docset ; rsync -azv --delete --delete-after -e 'ssh -oStrictHostKeyChecking=no -i .travis/dgtal_rsa' DGtal-devel.tgz dgtal@liris.cnrs.fr:/home/dgtal/public_html/doc/docset ; fi; fi + - if [ $DOC == "true" ]; then if [ $TRAVIS_OS_NAME == "osx" ]; then cd html; make ; wget http://dgtal.org/doc/docset/template.tgz ; tar zxvf template.tgz ; mv template/* org.dgtal.docset ; tar zcvf DGtal-devel.tgz org.dgtal.docset ; rsync -azv --delete --delete-after -e 'ssh -oStrictHostKeyChecking=no -i ~/.travis/dgtal_rsa' DGtal-devel.tgz dgtal@liris.cnrs.fr:/home/dgtal/public_html/doc/docset ; fi; fi os: - linux From a224ab4ceb7e403aaf76f2d1ed3c26de058f5d9d Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Fri, 6 Feb 2015 20:52:45 +0100 Subject: [PATCH 48/55] deploy --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6396d52c30..bd10fcfa1d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,7 +63,7 @@ after_script: after_success: - if [ $DOC == "true" ]; then make doc; fi - if [ $DOC == "true" ]; then rsync -azv --delete --delete-after -e 'ssh -oStrictHostKeyChecking=no -i .travis/dgtal_rsa' html/ dgtal@liris.cnrs.fr:/home/dgtal/public_html/doc/nightly/; fi - - if [ $DOC == "true" ]; then if [ $TRAVIS_OS_NAME == "osx" ]; then cd html; make ; wget http://dgtal.org/doc/docset/template.tgz ; tar zxvf template.tgz ; mv template/* org.dgtal.docset ; tar zcvf DGtal-devel.tgz org.dgtal.docset ; rsync -azv --delete --delete-after -e 'ssh -oStrictHostKeyChecking=no -i ~/.travis/dgtal_rsa' DGtal-devel.tgz dgtal@liris.cnrs.fr:/home/dgtal/public_html/doc/docset ; fi; fi + - if [ $DOC == "true" ]; then if [ $TRAVIS_OS_NAME == "osx" ]; then cd html; make ; wget http://dgtal.org/doc/docset/template.tgz ; tar zxvf template.tgz ; mv template/* org.dgtal.docset ; tar zcvf DGtal-devel.tgz org.dgtal.docset ; cd .. ;rsync -azv --delete --delete-after -e 'ssh -oStrictHostKeyChecking=no -i .travis/dgtal_rsa' html/DGtal-devel.tgz dgtal@liris.cnrs.fr:/home/dgtal/public_html/doc/docset ; fi; fi os: - linux From 7ea0373b2a63a0ec8dd81dee10ca2e529a04c361 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Sat, 7 Feb 2015 11:10:45 +0100 Subject: [PATCH 49/55] changelog --- ChangeLog.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index 02d5bb276d..a89d561577 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -2,6 +2,13 @@ ## New Features / Critical Changes +- *Configuration* + - Continuous integration enabled on both linux and macosx + systems. Furthermore, the nightly build documentation is + automatically deployed. (David Coeurjolly, + [#955](https://github.com/DGtal-team/DGtal/pull/955)) + + ## Changes - *Geometry Package* @@ -12,7 +19,7 @@ fitting. It requires to have the Patate library installed (and WITH_PATATE=true): http://patate.gforge.inria.fr/html/. See SphereFittingEstimator (David Coeurjolly, - [929](https://github.com/DGtal-team/DGtal/pull/929)) + [#929](https://github.com/DGtal-team/DGtal/pull/929)) - *Math Package* - Utilities added (OrderedLinearRegression) to perform sequential From 082294c96fc98665bc61611ae7a6fb9daf80bdf8 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Sat, 7 Feb 2015 11:21:38 +0100 Subject: [PATCH 50/55] doc deply only for merged PR --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index bd10fcfa1d..f47b1b33eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,9 +61,9 @@ after_script: ### after_success: - - if [ $DOC == "true" ]; then make doc; fi - - if [ $DOC == "true" ]; then rsync -azv --delete --delete-after -e 'ssh -oStrictHostKeyChecking=no -i .travis/dgtal_rsa' html/ dgtal@liris.cnrs.fr:/home/dgtal/public_html/doc/nightly/; fi - - if [ $DOC == "true" ]; then if [ $TRAVIS_OS_NAME == "osx" ]; then cd html; make ; wget http://dgtal.org/doc/docset/template.tgz ; tar zxvf template.tgz ; mv template/* org.dgtal.docset ; tar zcvf DGtal-devel.tgz org.dgtal.docset ; cd .. ;rsync -azv --delete --delete-after -e 'ssh -oStrictHostKeyChecking=no -i .travis/dgtal_rsa' html/DGtal-devel.tgz dgtal@liris.cnrs.fr:/home/dgtal/public_html/doc/docset ; fi; fi + - if [ $DOC == "true" ]; then if [ $TRAVIS_PULL_REQUEST == "false" ]; then make doc; fi; fi + - if [ $DOC == "true" ]; then if [ $TRAVIS_PULL_REQUEST == "false" ]; then rsync -azv --delete --delete-after -e 'ssh -oStrictHostKeyChecking=no -i .travis/dgtal_rsa' html/ dgtal@liris.cnrs.fr:/home/dgtal/public_html/doc/nightly/; fi; f + - if [ $DOC == "true" ]; then if [ $TRAVIS_PULL_REQUEST == "false" ]; then if [ $TRAVIS_OS_NAME == "osx" ]; then cd html; make ; wget http://dgtal.org/doc/docset/template.tgz ; tar zxvf template.tgz ; mv template/* org.dgtal.docset ; tar zcvf DGtal-devel.tgz org.dgtal.docset ; cd .. ;rsync -azv --delete --delete-after -e 'ssh -oStrictHostKeyChecking=no -i .travis/dgtal_rsa' html/DGtal-devel.tgz dgtal@liris.cnrs.fr:/home/dgtal/public_html/doc/docset ; fi; fi; fi os: - linux From 3558bfdca9831fd0b86b5351fd087814c3279018 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Sun, 15 Feb 2015 13:52:43 +0100 Subject: [PATCH 51/55] Setting proper encrypted variable --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f47b1b33eb..d45211dce9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,8 +28,10 @@ matrix: before_install: - - openssl aes-256-cbc -K $encrypted_73d1df012ee4_key -iv $encrypted_73d1df012ee4_iv -in .travis/dgtal_rsa.enc -out .travis/dgtal_rsa -d - - chmod 600 .travis/dgtal_rsa + +before_install: + - openssl aes-256-cbc -K $encrypted_47769ec71275_key -iv $encrypted_47769ec71275_iv -in .travis/dgtal_rsa.enc -out .travis/dgtal_rsa -d + - chmod 600 .travis/dgtal_rsa - if [ $CONFIG == "Debug,Magick,GMP,Coverage" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_MAGICK=true -DWITH_GMP=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=ON -DWITH_COVERAGE=true"; DOC="false"; fi - if [ $CONFIG == "Debug,Cairo,QGLviewer,HDF5" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_HDF5=true -DWITH_CAIRO=true -DWITH_QGLVIEWER=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=OFF"; DOC="false"; fi From 0077a2286c224101636fa562e7835445f825fb87 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Sun, 15 Feb 2015 13:59:54 +0100 Subject: [PATCH 52/55] merge again --- .travis.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9c9e7a1b0a..263c197f2b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,17 +23,12 @@ matrix: -before_install: - before_install: - openssl aes-256-cbc -K $encrypted_47769ec71275_key -iv $encrypted_47769ec71275_iv -in .travis/dgtal_rsa.enc -out .travis/dgtal_rsa -d - chmod 600 .travis/dgtal_rsa - - - if [ $CONFIG == "Debug,Magick,GMP,Coverage" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_MAGICK=true -DWITH_GMP=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=ON -DWITH_COVERAGE=true"; DOC="false"; fi - - if [ $CONFIG == "Debug,Cairo,QGLviewer,HDF5" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_HDF5=true -DWITH_CAIRO=true -DWITH_QGLVIEWER=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=OFF"; DOC="false"; fi - - if [ $CONFIG == "Documentation,Debug,Cairo,GMP" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_GMP=true"; DOC="true"; fi - - - + - if [ $CONFIG == "Debug,Magick,GMP,Coverage" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_MAGICK=true -DWITH_GMP=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=ON -DWITH_COVERAGE=true"; DOC="false"; fi + - if [ $CONFIG == "Debug,Cairo,QGLviewer,HDF5" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_HDF5=true -DWITH_CAIRO=true -DWITH_QGLVIEWER=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=OFF"; DOC="false"; fi - if [ $CONFIG == "Documentation,Debug,Cairo,GMP" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_GMP=true"; DOC="true"; fi + before_script: - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get -qq update && sudo apt-get -qq install libhdf5-serial-dev libboost-program-options-dev libcairo2-dev doxygen graphviz libgraphicsmagick++1-dev libboost-system-dev libgmp-dev libqglviewer-qt4-dev libinsighttoolkit3-dev libgdcm2-dev lcov; fi From 81d2aaf38aeacb8459058fee45b61657398b8026 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Sun, 15 Feb 2015 14:03:02 +0100 Subject: [PATCH 53/55] merge again --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 263c197f2b..9cffb8d020 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,10 +21,8 @@ matrix: - os: osx compiler: gcc - - before_install: - - openssl aes-256-cbc -K $encrypted_47769ec71275_key -iv $encrypted_47769ec71275_iv -in .travis/dgtal_rsa.enc -out .travis/dgtal_rsa -d + - openssl aes-256-cbc -K $encrypted_47769ec71275_key -iv $encrypted_47769ec71275_key -in .travis/dgtal_rsa.enc -out .travis/dgtal_rsa -d - chmod 600 .travis/dgtal_rsa - if [ $CONFIG == "Debug,Magick,GMP,Coverage" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_MAGICK=true -DWITH_GMP=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=ON -DWITH_COVERAGE=true"; DOC="false"; fi - if [ $CONFIG == "Debug,Cairo,QGLviewer,HDF5" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_HDF5=true -DWITH_CAIRO=true -DWITH_QGLVIEWER=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=OFF"; DOC="false"; fi - if [ $CONFIG == "Documentation,Debug,Cairo,GMP" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_GMP=true"; DOC="true"; fi From a4e723fcda62aad9724051607ae7af36d2b8cddf Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Sun, 15 Feb 2015 14:05:41 +0100 Subject: [PATCH 54/55] merge again - --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9cffb8d020..57712f9108 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ matrix: compiler: gcc before_install: - - openssl aes-256-cbc -K $encrypted_47769ec71275_key -iv $encrypted_47769ec71275_key -in .travis/dgtal_rsa.enc -out .travis/dgtal_rsa -d + - openssl aes-256-cbc -K $encrypted_47769ec71275_key -iv $encrypted_47769ec71275_iv -in .travis/dgtal_rsa.enc -out .travis/dgtal_rsa -d - chmod 600 .travis/dgtal_rsa - if [ $CONFIG == "Debug,Magick,GMP,Coverage" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_MAGICK=true -DWITH_GMP=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=ON -DWITH_COVERAGE=true"; DOC="false"; fi - if [ $CONFIG == "Debug,Cairo,QGLviewer,HDF5" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_HDF5=true -DWITH_CAIRO=true -DWITH_QGLVIEWER=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=OFF"; DOC="false"; fi - if [ $CONFIG == "Documentation,Debug,Cairo,GMP" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_GMP=true"; DOC="true"; fi From b23a18f6fd57e07a38dc0d0ed7ede55df81a4a13 Mon Sep 17 00:00:00 2001 From: David Coeurjolly Date: Sun, 15 Feb 2015 14:11:13 +0100 Subject: [PATCH 55/55] merge --- .travis.yml | 2 +- .travis/dgtal_rsa.enc | Bin 1680 -> 1680 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 57712f9108..26f3ca91fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ matrix: compiler: gcc before_install: - - openssl aes-256-cbc -K $encrypted_47769ec71275_key -iv $encrypted_47769ec71275_iv -in .travis/dgtal_rsa.enc -out .travis/dgtal_rsa -d + - openssl aes-256-cbc -K $encrypted_47769ec71275_key -iv $encrypted_47769ec71275_iv -in .travis/dgtal_rsa.enc -out .travis/dgtal_rsa -d - chmod 600 .travis/dgtal_rsa - if [ $CONFIG == "Debug,Magick,GMP,Coverage" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_MAGICK=true -DWITH_GMP=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=ON -DWITH_COVERAGE=true"; DOC="false"; fi - if [ $CONFIG == "Debug,Cairo,QGLviewer,HDF5" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_HDF5=true -DWITH_CAIRO=true -DWITH_QGLVIEWER=true -DBUILD_TESTING=ON -DWARNING_AS_ERROR=OFF"; DOC="false"; fi - if [ $CONFIG == "Documentation,Debug,Cairo,GMP" ]; then BTYPE="-DCMAKE_BUILD_TYPE=Debug -DWITH_CAIRO=true -DWITH_GMP=true"; DOC="true"; fi diff --git a/.travis/dgtal_rsa.enc b/.travis/dgtal_rsa.enc index 3afc3aa35b47868ed3824807d7f7f02dd89847ea..3073af841aca3660dfc6553a9b1c7ef09ec85659 100644 GIT binary patch literal 1680 zcmV;B25JZ&@NxZ0<1n$m` zD^hFF|4@*^ZYiWx7GDU>G5m>u6fIh9x5;%9DJ_Vx2<7V7i)v%uhdBLp!WZ7|v8ObC zejMmI$@S>c!zuZZcU4AXz3091Z8mp3xRS9!cbb$&Oq#m?9=JT}s87Prf0fNs&Dxo2 zPhtNWuLH zaCqa@CFYHzYZ-J_GS(GC{@HivTsUo6yLT^t ztNsFDiaYl2P-~^-uj-x!q-CMQPsv&vv)9G)MtXo#+k)y~on%$kD||`%Z19%(s^m`= z|KLB^3aeM^p)>YEv0Lbs zD4kW&c%w5vQxz9=9HkF_bG;NyJ@dnPZ<#I5(>+#!M=< z){YDY3hEU8uF``>2?-rFkr?Dz^5;40kvx!?=Db#5?qA2E%*z@MD^~mPc{dg2{r30g zbI@}|2h$_t10g9OFYSFV_*JMDKs~Hmz&k9@>yn;>V>NRBMnCK&dlyv8&^~24cG-Gjne$ zMv+3u`LGM=v17I7hWpQVdqk&)`4NI?CK&%LmrOpSc~GJ*{GDq(KHrH9Qq{3$1`p>& zrRCecZi)YbaBH4e`_LIikHRgXY{(*Vo(hD^VQ9@4xQCM|IGVTyV-&qkT>v4m&!IfC{VI%2 zo&%nZZ~-~omuFWg99=O2O!f9J!A`ien7Xvi;sIz>h;2OJ%DnU~*F8s{r}-1C=~Zf& zO=z+pRM)W^{o7Gr6fEB%f_Ha2Mmn2p-Z&mFnhL6veZgWCYG11HL7RQDFT<8`OdUxi z2L$xKyT1WAiF0p2bN>Oi1+){KNOQG6i&ZJ4IK;|sb@+O)5P6hz-)yPT)9*e8an_L@ zt<3zfv~J(Hv&qXQM{gC3tuvsXc(LwuZLwdGVaAX23jDir9x0!g|+2DBi-Eg%X?eZb>Q;#ivS~e z#|p-Nn%c4ou)f-FD>D+hLK-KG5}p+2s$5IV=Pj#()cB@T3B1{%auSemn=+|Qk_)bd zhB=VKBJC^0{(NTe;i}I|!0v2tHFvO;h&P-u0!97S$Y}cAyHS)wrozHAQ6x%o`xM4; zi|T8h9Ju-P62q!Km}i=d-sEG!9m!32rZzwk|edj^|D+T(x a2?PnuIv8=n;-P>P^+;)sDqPn|)%nXa2v95l literal 1680 zcmV;B25`7HyHPg|Sa%ia%fZk`@hWc&!_z#pv-Unr83@s4338}88JipJ-X6|_z_FDD zYDIm@%^I3JL^S2|{4F&#-AEQM~XS)=ows<7ce#x%xw2B8Ov<=@l>=H#`a0pL2xWRxNC5TRW)3CI@gS8?3 z?Hm%Wg2V>%SdKixKN_zIo86n#7mKi6q&`Tkvp)0NLms;Y<_^>hW(gP83F+_K_?6I7 z6rH-4%7L3GN;!k!ot4IX=+k)AjPK#2?D+6cH0W(3iUh>jkPm0)$HepQ*Vbt*?ky=5 zZ~yp0!1laI&wqS$8ohAHmLgcxBL2pViI{x!(dZc%;DAzM6elViXjO4Oq7Y17U zInqcg*SgxVzx=c&~3R5Ts}U6EKmW|FtU)lZ0{(D5;B zWZ6X^hGJ3!x!7P&=@&~(4+z7d>S#@pllenAzo|Cy{ zE;_lq>(|8^HoO13lzs(RDUflTV#1)@Y~^YgGz)Xg!_} zCDqPJp}B}*uP1UCIn+4<>6P52H-hi*vP5^;F0B~Mw1Q-9cB`kG_$uD+W5EgB_s4$2OZduq+GgsVR?!-k*Gzqn`6uiz)%B1k!W_@A#8g z0c;sreSI&VIS#fXi00}4 zsy9J?Btq%YoK&{+@x6GmO`wnWEmGhY@@qFQkqrb+=!}M@*rOyZitK9QXo`-)3Q-LF z)B?I`Yw{X#l1aj_griePtG`t)b(4tU!X|?-divZ_#nz;HA>K`=&)!cm)Lzfw$UIFv z8R6C>#|zqw|Hy^g-1X&ssqo&;wu-t046`=O80IP<$r z5iwmy!gB6+MRp3dSoqotvM!n4w*2o8Z{%y;r<3_w2b5e<%r8FT?b@_hcQU`ohaTMS zd;dV)T5-s1SXve>d%>BWk0g6H0xsA2Dy7G7@Kb=HD5u5(z3r_RlXJm}a_4yVo|BsG z(en+RC7->#bo%CWY}s(^VFb$3X@RWO(9nNdlkgS+K{Hf;iS{$Lyj4jBop;U}ZYjxU zw;yX$`|C z>ZEbx6(H(Kw1O&~-~j}%c03O|eCvNd5zZO^j=SF>87K{;JC|~S?cTk{1tuwUV)!!C zu0yroMejVG$``wpXb2S@r1yM?I09V6Th*qTU`82+u2}?{LOw_O&i{6RS?kdZpOkC2 z-Q8%)WiYb}_(ZvOuFf>;tFf|#UI4Q&1F4u^9w@qP%O65(xS*>L$F_p#Y;;~py+X{I z84)kT!Kds4JWW9hoKDUtyBFNoHI+Ehx++)A{xc_Ju&FQb&AV=qkv#Twov8*-`3oMG aNtoA!ubx9UsEekiiG38Lw5vT=s;+dVu~=aM