From c24d4ea5f5c81c0ff80512cc827b9a274dc90518 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Fri, 27 May 2016 18:28:11 +0200 Subject: [PATCH 1/5] CMake: fixed configure of application if TUTTLE_PYTHON_VERSION is not set --- applications/CMakeLists.txt | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/applications/CMakeLists.txt b/applications/CMakeLists.txt index c79bdbdef..b26a186d3 100644 --- a/applications/CMakeLists.txt +++ b/applications/CMakeLists.txt @@ -5,14 +5,16 @@ add_subdirectory(sam) add_subdirectory(script) # Edit python scripts if the host is built with python3 -if(${TUTTLE_PYTHON_VERSION} VERSION_GREATER "3") - set(BASH_PYTHON2 "#!/usr/bin/env python") - set(BASH_PYTHON3 "#!/usr/bin/env python3") +if(DEFINED TUTTLE_PYTHON_VERSION) + if(${TUTTLE_PYTHON_VERSION} VERSION_GREATER "3") + set(BASH_PYTHON2 "#!/usr/bin/env python") + set(BASH_PYTHON3 "#!/usr/bin/env python3") - file(GLOB_RECURSE PYTHON_APPS sam/*.py script/*.py) - foreach(PYTHON_APP ${PYTHON_APPS}) - file(READ "${PYTHON_APP}" APP_CONTENT_PYTHON2) - string(REGEX REPLACE ${BASH_PYTHON2} ${BASH_PYTHON3} APP_CONTENT_PYTHON3 "${APP_CONTENT_PYTHON2}" ) - file(WRITE "${PYTHON_APP}" "${APP_CONTENT_PYTHON3}") - endforeach() + file(GLOB_RECURSE PYTHON_APPS sam/*.py script/*.py) + foreach(PYTHON_APP ${PYTHON_APPS}) + file(READ "${PYTHON_APP}" APP_CONTENT_PYTHON2) + string(REGEX REPLACE ${BASH_PYTHON2} ${BASH_PYTHON3} APP_CONTENT_PYTHON3 "${APP_CONTENT_PYTHON2}" ) + file(WRITE "${PYTHON_APP}" "${APP_CONTENT_PYTHON3}") + endforeach() + endif() endif() From f6d74c0e079ad8108ac3820e2a1df1dbae2b58f9 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Fri, 27 May 2016 18:28:55 +0200 Subject: [PATCH 2/5] Travis: updated matrix to build for python3.4 Up Travis VM to ubuntu trusty. --- .travis.yml | 10 ++++++---- tools/travis/launch_tests.sh | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 542c7fa5c..22cff3879 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,8 @@ language: cpp # Use container-based infrastructure -sudo: false +sudo: required +dist: trusty os: - linux @@ -25,7 +26,7 @@ env: - CI_NODE_TOTAL=2 matrix: - PYTHON_VERSION=2.7 - - PYTHON_VERSION=3.2 + - PYTHON_VERSION=3.4 matrix: allow_failures: @@ -84,19 +85,20 @@ addons: - python-numpy - python-nose - python3-dev + - python3-numpy - python3-setuptools - python3-nose - libfreetype6-dev - libbz2-dev - libltdl-dev - - libpng-dev + - libpng12-dev - libjpeg-dev - libraw-dev - libglew-dev - libtiff4-dev - libilmbase-dev - libopenexr-dev - # - libopenimageio-dev + - libopenimageio-dev - libglew-dev - libgraphviz-dev - graphviz-dev diff --git a/tools/travis/launch_tests.sh b/tools/travis/launch_tests.sh index a0e2ca0a0..a2e2fc598 100755 --- a/tools/travis/launch_tests.sh +++ b/tools/travis/launch_tests.sh @@ -18,7 +18,7 @@ git clone https://github.com/tuttleofx/TuttleOFX-data.git ln -s ${TRAVIS_BUILD_DIR}/TuttleOFX-data ${TRAVIS_BUILD_DIR}/libraries/tuttle/pyTest/TuttleOFX-data if [[ ${PYTHON_VERSION} == "2.7" ]]; then nosetests ${TRAVIS_BUILD_DIR}/libraries/tuttle/pyTest -v -elif [[ ${PYTHON_VERSION} == "3.2" ]]; then +elif [[ ${PYTHON_VERSION} == "3.4" ]]; then nosetests3 ${TRAVIS_BUILD_DIR}/libraries/tuttle/pyTest -v fi From 2594692a3e7447dce3ed2fb300193d885470c03c Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Mon, 30 May 2016 11:20:47 +0200 Subject: [PATCH 3/5] Travis: refactored how to launch tests --- tools/travis/launch_tests.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/travis/launch_tests.sh b/tools/travis/launch_tests.sh index a2e2fc598..81d63175c 100755 --- a/tools/travis/launch_tests.sh +++ b/tools/travis/launch_tests.sh @@ -16,12 +16,11 @@ git clone https://github.com/tuttleofx/TuttleOFX-data.git # nosetests ln -s ${TRAVIS_BUILD_DIR}/TuttleOFX-data ${TRAVIS_BUILD_DIR}/libraries/tuttle/pyTest/TuttleOFX-data -if [[ ${PYTHON_VERSION} == "2.7" ]]; then - nosetests ${TRAVIS_BUILD_DIR}/libraries/tuttle/pyTest -v -elif [[ ${PYTHON_VERSION} == "3.4" ]]; then - nosetests3 ${TRAVIS_BUILD_DIR}/libraries/tuttle/pyTest -v +export NOSETESTS_BIN=nosetests +if [[ ${PYTHON_VERSION} == 3.* ]]; then + export NOSETESTS_BIN=nosetests3 fi - +${NOSETESTS_BIN} ${TRAVIS_BUILD_DIR}/libraries/tuttle/pyTest -v # boost unit tests ln -s ${TRAVIS_BUILD_DIR}/TuttleOFX-data ${TRAVIS_BUILD_DIR}/testBin/TuttleOFX-data @@ -29,6 +28,6 @@ cd ${TUTTLEOFX_BUILD} make run_tests # sam tests -if [[ ${PYTHON_VERSION} == "2.7" ]]; then +if [[ ${PYTHON_VERSION} == 2.* ]]; then ${TRAVIS_BUILD_DIR}/applications/test/samCommands.sh fi From 931fb17ce99180d4a4b3b7645a6f823a44dc6104 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Mon, 30 May 2016 13:56:22 +0200 Subject: [PATCH 4/5] Travis: updated packages to build Viewer plugin Since ubuntu trusty, there is no default package libglui-dev. --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 22cff3879..5afbaf197 100644 --- a/.travis.yml +++ b/.travis.yml @@ -113,7 +113,9 @@ addons: - libyaml-dev - libopenctl0.8 - libcaca-dev - - libglui-dev + - freeglut3-dev + - libxi-dev + - libxmu-dev - libtinyxml-dev - yasm - libx264-dev From 11c8a35b33ead61a17d7b00666b52c34481022bc Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Mon, 30 May 2016 16:29:32 +0200 Subject: [PATCH 5/5] Travis: fixed build of ImageMagick plugin --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5afbaf197..07a2aa995 100644 --- a/.travis.yml +++ b/.travis.yml @@ -120,6 +120,7 @@ addons: - yasm - libx264-dev - libxvidcore-dev + - libmagick++-dev coverity_scan: project: name: "tuttleofx/TuttleOFX"