From 6a8512f35310f162fc93344080dd8b271bca0252 Mon Sep 17 00:00:00 2001 From: cchampet Date: Thu, 10 Dec 2015 09:41:52 +0100 Subject: [PATCH 01/14] Travis: fix build on MacOS X Fix #190 --- tools/travis.build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/travis.build.sh b/tools/travis.build.sh index cde33c27..276eeb11 100755 --- a/tools/travis.build.sh +++ b/tools/travis.build.sh @@ -13,7 +13,7 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then export CMAKE_PREFIX_PATH=${DEPENDENCY_INSTALL_PATH} elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then # Ask cmake to search in all homebrew packages - export CMAKE_PREFIX_PATH=$(echo /usr/local/Cellar/*/* | sed 's/ /;/g') + export CMAKE_PREFIX_PATH=$(echo /usr/local/Cellar/${DEPENDENCY_MODE}/* | sed 's/ /;/g') fi # Build avTranscoder From 9b76aab620aa1216381fc533301ed2f5bf6a6759 Mon Sep 17 00:00:00 2001 From: cchampet Date: Thu, 10 Dec 2015 10:19:27 +0100 Subject: [PATCH 02/14] Travis: launch pyTest only on linux The problem with MacOS X: * The avtranscoder python binding depends on python on the system (compile time). * We use the python from homebrew at runtime. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 785251ff..d4c51b06 100644 --- a/.travis.yml +++ b/.travis.yml @@ -76,7 +76,7 @@ script: - ./tools/travis.build.sh # launch tests - - if [ ${DEPENDENCY_MODE} = "ffmpeg" ]; then ./tools/travis.python.nosetests.sh; fi + - if [ ${TRAVIS_OS_NAME} = "linux" && ${DEPENDENCY_MODE} = "ffmpeg" ]; then ./tools/travis.python.nosetests.sh; fi after_success: # generate coverage for coveralls From 21459688bd3b2bf7c1bca0ad3d40d31b82aabee6 Mon Sep 17 00:00:00 2001 From: cchampet Date: Thu, 10 Dec 2015 10:25:05 +0100 Subject: [PATCH 03/14] Travis: build libav on MacOSX since the brew formula does not install the libav libraries --- tools/travis.osx.install.deps.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/travis.osx.install.deps.sh b/tools/travis.osx.install.deps.sh index 18b2649f..06181670 100755 --- a/tools/travis.osx.install.deps.sh +++ b/tools/travis.osx.install.deps.sh @@ -19,5 +19,10 @@ brew install freeglut if [[ ${DEPENDENCY_MODE} == "ffmpeg" ]]; then brew install ffmpeg elif [[ ${DEPENDENCY_MODE} == "libav" ]]; then - brew install libav + export LIBAV_VERSION=11.3 + wget https://libav.org/releases/libav-${LIBAV_VERSION}.tar.gz + tar -xvf libav-${LIBAV_VERSION}.tar.gz + cd libav-${LIBAV_VERSION} + ./configure --disable-yasm --enable-shared --disable-static && make -k && make install + fi From 1d6c3720101b48a28d98b3e49e22bd8b9081e312 Mon Sep 17 00:00:00 2001 From: cchampet Date: Thu, 10 Dec 2015 10:30:42 +0100 Subject: [PATCH 04/14] Travis: removed statement that allows failures for MacOSX jobs --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d4c51b06..d3842692 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,8 +33,6 @@ matrix: env: DEPENDENCY_MODE=ffmpeg ENABLE_COVERAGE=true - compiler: clang env: DEPENDENCY_MODE=libav ENABLE_COVERAGE=true - allow_failures: - - os: osx fast_finish: true # This results in a 2×2×2x2 build matrix. From 1557d6a0d8b49a68b7963118358e0ee16fc75050 Mon Sep 17 00:00:00 2001 From: cchampet Date: Thu, 10 Dec 2015 10:31:19 +0100 Subject: [PATCH 05/14] Travis: renamed DEPENDENCY_MODE to DEPENDENCY_NAME --- .travis.yml | 22 +++++++++++----------- tools/travis.build.sh | 2 +- tools/travis.linux.install.deps.sh | 4 ++-- tools/travis.osx.install.deps.sh | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index d3842692..d5947b54 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,22 +21,22 @@ env: - DEPENDENCY_INSTALL=install-dependency - DEPENDENCY_INSTALL_PATH=${TRAVIS_BUILD_DIR}/${DEPENDENCY_INSTALL} matrix: - - DEPENDENCY_MODE=libav ENABLE_COVERAGE=true - - DEPENDENCY_MODE=libav ENABLE_COVERAGE=false - - DEPENDENCY_MODE=ffmpeg ENABLE_COVERAGE=true - - DEPENDENCY_MODE=ffmpeg ENABLE_COVERAGE=false + - DEPENDENCY_NAME=libav ENABLE_COVERAGE=true + - DEPENDENCY_NAME=libav ENABLE_COVERAGE=false + - DEPENDENCY_NAME=ffmpeg ENABLE_COVERAGE=true + - DEPENDENCY_NAME=ffmpeg ENABLE_COVERAGE=false matrix: # generate coverage only with gcc exclude: - compiler: clang - env: DEPENDENCY_MODE=ffmpeg ENABLE_COVERAGE=true + env: DEPENDENCY_NAME=ffmpeg ENABLE_COVERAGE=true - compiler: clang - env: DEPENDENCY_MODE=libav ENABLE_COVERAGE=true + env: DEPENDENCY_NAME=libav ENABLE_COVERAGE=true fast_finish: true # This results in a 2×2×2x2 build matrix. -# Where the variables are: os / compiler / DEPENDENCY_MODE / ENABLE_COVERAGE +# Where the variables are: os / compiler / DEPENDENCY_NAME / ENABLE_COVERAGE addons: apt: @@ -56,7 +56,7 @@ cache: - ${DEPENDENCY_INSTALL_PATH} before_script: - - env | sort + - env | sort - date -u - uname -a @@ -74,7 +74,7 @@ script: - ./tools/travis.build.sh # launch tests - - if [ ${TRAVIS_OS_NAME} = "linux" && ${DEPENDENCY_MODE} = "ffmpeg" ]; then ./tools/travis.python.nosetests.sh; fi + - if [ ${TRAVIS_OS_NAME} = "linux" && ${DEPENDENCY_NAME} = "ffmpeg" ]; then ./tools/travis.python.nosetests.sh; fi after_success: # generate coverage for coveralls @@ -85,13 +85,13 @@ before_deploy: - if [ ${TRAVIS_OS_NAME} = "linux" ]; then cp /lib/x86_64-linux-gnu/{libbz2.so.1,libbz2.so.1.0,libbz2.so.1.0.4} ${DEPENDENCY_INSTALL_PATH}/lib; fi # create archive - cd ${TRAVIS_BUILD_DIR} - - tar -cvzf avtranscoder-${TRAVIS_OS_NAME}-${CC}-${DEPENDENCY_MODE}.tgz ${DEPENDENCY_INSTALL} ${AVTRANSCODER_INSTALL} + - tar -cvzf avtranscoder-${TRAVIS_OS_NAME}-${CC}-${DEPENDENCY_NAME}.tgz ${DEPENDENCY_INSTALL} ${AVTRANSCODER_INSTALL} deploy: provider: releases api_key: secure: ${GITHUB_RELEASE_API_KEY} - file: avtranscoder-${TRAVIS_OS_NAME}-${CC}-${DEPENDENCY_MODE}.tgz + file: avtranscoder-${TRAVIS_OS_NAME}-${CC}-${DEPENDENCY_NAME}.tgz skip_cleanup: true on: branch: master diff --git a/tools/travis.build.sh b/tools/travis.build.sh index 276eeb11..f9270473 100755 --- a/tools/travis.build.sh +++ b/tools/travis.build.sh @@ -13,7 +13,7 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then export CMAKE_PREFIX_PATH=${DEPENDENCY_INSTALL_PATH} elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then # Ask cmake to search in all homebrew packages - export CMAKE_PREFIX_PATH=$(echo /usr/local/Cellar/${DEPENDENCY_MODE}/* | sed 's/ /;/g') + export CMAKE_PREFIX_PATH=$(echo /usr/local/Cellar/${DEPENDENCY_NAME}/* | sed 's/ /;/g') fi # Build avTranscoder diff --git a/tools/travis.linux.install.deps.sh b/tools/travis.linux.install.deps.sh index 46cc80fc..ced6431f 100755 --- a/tools/travis.linux.install.deps.sh +++ b/tools/travis.linux.install.deps.sh @@ -7,7 +7,7 @@ lsb_release -a if [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then - if [[ ${DEPENDENCY_MODE} == "ffmpeg" ]]; then + if [[ ${DEPENDENCY_NAME} == "ffmpeg" ]]; then export FFMPEG_VERSION=2.2.9 wget https://www.ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 @@ -16,7 +16,7 @@ if [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then cd ffmpeg-${FFMPEG_VERSION} ./configure --prefix=${DEPENDENCY_INSTALL_PATH} --disable-yasm --enable-shared --disable-static && make && make install - elif [[ ${DEPENDENCY_MODE} == "libav" ]]; then + elif [[ ${DEPENDENCY_NAME} == "libav" ]]; then export LIBAV_VERSION=11.3 wget https://libav.org/releases/libav-${LIBAV_VERSION}.tar.gz diff --git a/tools/travis.osx.install.deps.sh b/tools/travis.osx.install.deps.sh index 06181670..6f44e39d 100755 --- a/tools/travis.osx.install.deps.sh +++ b/tools/travis.osx.install.deps.sh @@ -16,9 +16,9 @@ pip install nose brew install freeglut # Main dependency -if [[ ${DEPENDENCY_MODE} == "ffmpeg" ]]; then +if [[ ${DEPENDENCY_NAME} == "ffmpeg" ]]; then brew install ffmpeg -elif [[ ${DEPENDENCY_MODE} == "libav" ]]; then +elif [[ ${DEPENDENCY_NAME} == "libav" ]]; then export LIBAV_VERSION=11.3 wget https://libav.org/releases/libav-${LIBAV_VERSION}.tar.gz tar -xvf libav-${LIBAV_VERSION}.tar.gz From 9ec023f2105e63ebc45424957e8aa3250b5d37dd Mon Sep 17 00:00:00 2001 From: cchampet Date: Thu, 10 Dec 2015 10:35:50 +0100 Subject: [PATCH 06/14] Travis: added DEPENDENCY_VERSION to the name of the releases Fix #188 --- .travis.yml | 12 ++++++------ tools/travis.linux.install.deps.sh | 16 +++++++--------- tools/travis.osx.install.deps.sh | 8 ++++---- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index d5947b54..c39732ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,10 +21,10 @@ env: - DEPENDENCY_INSTALL=install-dependency - DEPENDENCY_INSTALL_PATH=${TRAVIS_BUILD_DIR}/${DEPENDENCY_INSTALL} matrix: - - DEPENDENCY_NAME=libav ENABLE_COVERAGE=true - - DEPENDENCY_NAME=libav ENABLE_COVERAGE=false - - DEPENDENCY_NAME=ffmpeg ENABLE_COVERAGE=true - - DEPENDENCY_NAME=ffmpeg ENABLE_COVERAGE=false + - DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=true + - DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=false + - DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.2.9 ENABLE_COVERAGE=true + - DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.2.9 ENABLE_COVERAGE=false matrix: # generate coverage only with gcc @@ -85,13 +85,13 @@ before_deploy: - if [ ${TRAVIS_OS_NAME} = "linux" ]; then cp /lib/x86_64-linux-gnu/{libbz2.so.1,libbz2.so.1.0,libbz2.so.1.0.4} ${DEPENDENCY_INSTALL_PATH}/lib; fi # create archive - cd ${TRAVIS_BUILD_DIR} - - tar -cvzf avtranscoder-${TRAVIS_OS_NAME}-${CC}-${DEPENDENCY_NAME}.tgz ${DEPENDENCY_INSTALL} ${AVTRANSCODER_INSTALL} + - tar -cvzf avtranscoder-${TRAVIS_OS_NAME}-${CC}-${DEPENDENCY_NAME}-${DEPENDENCY_VERSION}.tgz ${DEPENDENCY_INSTALL} ${AVTRANSCODER_INSTALL} deploy: provider: releases api_key: secure: ${GITHUB_RELEASE_API_KEY} - file: avtranscoder-${TRAVIS_OS_NAME}-${CC}-${DEPENDENCY_NAME}.tgz + file: avtranscoder-${TRAVIS_OS_NAME}-${CC}-${DEPENDENCY_NAME}-${DEPENDENCY_VERSION}.tgz skip_cleanup: true on: branch: master diff --git a/tools/travis.linux.install.deps.sh b/tools/travis.linux.install.deps.sh index ced6431f..f135265d 100755 --- a/tools/travis.linux.install.deps.sh +++ b/tools/travis.linux.install.deps.sh @@ -9,19 +9,17 @@ if [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then if [[ ${DEPENDENCY_NAME} == "ffmpeg" ]]; then - export FFMPEG_VERSION=2.2.9 - wget https://www.ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 - bunzip2 ffmpeg-${FFMPEG_VERSION}.tar.bz2 - tar -xvf ffmpeg-${FFMPEG_VERSION}.tar - cd ffmpeg-${FFMPEG_VERSION} + wget https://www.ffmpeg.org/releases/ffmpeg-${DEPENDENCY_VERSION}.tar.bz2 + bunzip2 ffmpeg-${DEPENDENCY_VERSION}.tar.bz2 + tar -xvf ffmpeg-${DEPENDENCY_VERSION}.tar + cd ffmpeg-${DEPENDENCY_VERSION} ./configure --prefix=${DEPENDENCY_INSTALL_PATH} --disable-yasm --enable-shared --disable-static && make && make install elif [[ ${DEPENDENCY_NAME} == "libav" ]]; then - export LIBAV_VERSION=11.3 - wget https://libav.org/releases/libav-${LIBAV_VERSION}.tar.gz - tar -xvf libav-${LIBAV_VERSION}.tar.gz - cd libav-${LIBAV_VERSION} + wget https://libav.org/releases/libav-${DEPENDENCY_VERSION}.tar.gz + tar -xvf libav-${DEPENDENCY_VERSION}.tar.gz + cd libav-${DEPENDENCY_VERSION} ./configure --prefix=${DEPENDENCY_INSTALL_PATH} --disable-yasm --enable-shared --disable-static && make && make install fi diff --git a/tools/travis.osx.install.deps.sh b/tools/travis.osx.install.deps.sh index 6f44e39d..b1cd1ff0 100755 --- a/tools/travis.osx.install.deps.sh +++ b/tools/travis.osx.install.deps.sh @@ -19,10 +19,10 @@ brew install freeglut if [[ ${DEPENDENCY_NAME} == "ffmpeg" ]]; then brew install ffmpeg elif [[ ${DEPENDENCY_NAME} == "libav" ]]; then - export LIBAV_VERSION=11.3 - wget https://libav.org/releases/libav-${LIBAV_VERSION}.tar.gz - tar -xvf libav-${LIBAV_VERSION}.tar.gz - cd libav-${LIBAV_VERSION} + + wget https://libav.org/releases/libav-${DEPENDENCY_VERSION}.tar.gz + tar -xvf libav-${DEPENDENCY_VERSION}.tar.gz + cd libav-${DEPENDENCY_VERSION} ./configure --disable-yasm --enable-shared --disable-static && make -k && make install fi From 72d73a5ffe7bafee7e472e8cf03392b5c69b95dc Mon Sep 17 00:00:00 2001 From: cchampet Date: Thu, 10 Dec 2015 10:41:36 +0100 Subject: [PATCH 07/14] Travis: build ffmpeg/libav dependencies the same way in both linux and osx * Because we cannot specify a dependency version when using homebrew. * It is easier to maintain. * Note: removed 'lsb_release -a' since this command works only on linux. It prints platform info, so it is not a big deal to remove it. --- tools/travis.linux.install.deps.sh | 2 -- tools/travis.osx.install.deps.sh | 11 +---------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/tools/travis.linux.install.deps.sh b/tools/travis.linux.install.deps.sh index f135265d..d4e1a8fe 100755 --- a/tools/travis.linux.install.deps.sh +++ b/tools/travis.linux.install.deps.sh @@ -3,8 +3,6 @@ # Print commands and their arguments as they are executed. set -x -lsb_release -a - if [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then if [[ ${DEPENDENCY_NAME} == "ffmpeg" ]]; then diff --git a/tools/travis.osx.install.deps.sh b/tools/travis.osx.install.deps.sh index b1cd1ff0..e4e11895 100755 --- a/tools/travis.osx.install.deps.sh +++ b/tools/travis.osx.install.deps.sh @@ -16,13 +16,4 @@ pip install nose brew install freeglut # Main dependency -if [[ ${DEPENDENCY_NAME} == "ffmpeg" ]]; then - brew install ffmpeg -elif [[ ${DEPENDENCY_NAME} == "libav" ]]; then - - wget https://libav.org/releases/libav-${DEPENDENCY_VERSION}.tar.gz - tar -xvf libav-${DEPENDENCY_VERSION}.tar.gz - cd libav-${DEPENDENCY_VERSION} - ./configure --disable-yasm --enable-shared --disable-static && make -k && make install - -fi +./travis.linux.install.deps.sh From d1c2876f80935ae7b2b7507673dad090aed2b2db Mon Sep 17 00:00:00 2001 From: cchampet Date: Thu, 10 Dec 2015 10:42:48 +0100 Subject: [PATCH 08/14] Travis: added -k option when build dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ‘--keep-going’: continue as much as possible after an error. --- tools/travis.linux.install.deps.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/travis.linux.install.deps.sh b/tools/travis.linux.install.deps.sh index d4e1a8fe..d2ba5c0d 100755 --- a/tools/travis.linux.install.deps.sh +++ b/tools/travis.linux.install.deps.sh @@ -11,14 +11,14 @@ if [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then bunzip2 ffmpeg-${DEPENDENCY_VERSION}.tar.bz2 tar -xvf ffmpeg-${DEPENDENCY_VERSION}.tar cd ffmpeg-${DEPENDENCY_VERSION} - ./configure --prefix=${DEPENDENCY_INSTALL_PATH} --disable-yasm --enable-shared --disable-static && make && make install + ./configure --prefix=${DEPENDENCY_INSTALL_PATH} --disable-yasm --enable-shared --disable-static && make -k && make install elif [[ ${DEPENDENCY_NAME} == "libav" ]]; then wget https://libav.org/releases/libav-${DEPENDENCY_VERSION}.tar.gz tar -xvf libav-${DEPENDENCY_VERSION}.tar.gz cd libav-${DEPENDENCY_VERSION} - ./configure --prefix=${DEPENDENCY_INSTALL_PATH} --disable-yasm --enable-shared --disable-static && make && make install + ./configure --prefix=${DEPENDENCY_INSTALL_PATH} --disable-yasm --enable-shared --disable-static && make -k && make install fi From dd884c5fd2f1e14657aa7557d4a7c0a56714f0cc Mon Sep 17 00:00:00 2001 From: cchampet Date: Thu, 10 Dec 2015 10:45:28 +0100 Subject: [PATCH 09/14] Travis: fix jobs exclusion --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c39732ce..bfcbb57b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,9 +30,9 @@ matrix: # generate coverage only with gcc exclude: - compiler: clang - env: DEPENDENCY_NAME=ffmpeg ENABLE_COVERAGE=true + env: DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.2.9 ENABLE_COVERAGE=true - compiler: clang - env: DEPENDENCY_NAME=libav ENABLE_COVERAGE=true + env: DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=true fast_finish: true # This results in a 2×2×2x2 build matrix. From 243ce64816f7f2750caf30a71a31615ba60e04f4 Mon Sep 17 00:00:00 2001 From: cchampet Date: Thu, 10 Dec 2015 11:18:48 +0100 Subject: [PATCH 10/14] Travis: fix how to call build scripts on osx --- tools/travis.osx.install.deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/travis.osx.install.deps.sh b/tools/travis.osx.install.deps.sh index e4e11895..83595e7e 100755 --- a/tools/travis.osx.install.deps.sh +++ b/tools/travis.osx.install.deps.sh @@ -16,4 +16,4 @@ pip install nose brew install freeglut # Main dependency -./travis.linux.install.deps.sh +./tools/travis.linux.install.deps.sh From db2a351e28422cbf455769ce153e615af1e24296 Mon Sep 17 00:00:00 2001 From: cchampet Date: Thu, 10 Dec 2015 11:20:23 +0100 Subject: [PATCH 11/14] Travis: exclude osx jobs which compute a coverage Because since commit 9b76aab, we launch pyTests only on linux. --- .travis.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bfcbb57b..f08a976b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,12 +27,17 @@ env: - DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.2.9 ENABLE_COVERAGE=false matrix: - # generate coverage only with gcc exclude: + # generate coverage only with gcc - compiler: clang env: DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.2.9 ENABLE_COVERAGE=true - compiler: clang env: DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=true + # generate coverage only on linux + - os: osx + env: DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=true + - os: osx + env: DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.2.9 ENABLE_COVERAGE=true fast_finish: true # This results in a 2×2×2x2 build matrix. From 2d537ab3c3659406df101973f37a1cd0992f6f35 Mon Sep 17 00:00:00 2001 From: cchampet Date: Thu, 10 Dec 2015 12:34:43 +0100 Subject: [PATCH 12/14] Travis: fixed cmake env when build on osx --- tools/travis.build.sh | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/tools/travis.build.sh b/tools/travis.build.sh index f9270473..a3fd015d 100755 --- a/tools/travis.build.sh +++ b/tools/travis.build.sh @@ -7,14 +7,8 @@ set -x mkdir -p ${AVTRANSCODER_BUILD_PATH} cd ${AVTRANSCODER_BUILD_PATH} -# Customize environment -if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then - # Ask cmake to search in all dependencies we've installed manually - export CMAKE_PREFIX_PATH=${DEPENDENCY_INSTALL_PATH} -elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then - # Ask cmake to search in all homebrew packages - export CMAKE_PREFIX_PATH=$(echo /usr/local/Cellar/${DEPENDENCY_NAME}/* | sed 's/ /;/g') -fi +# Ask cmake to search in all dependencies we've installed manually +export CMAKE_PREFIX_PATH=${DEPENDENCY_INSTALL_PATH} # Build avTranscoder cmake .. -DCMAKE_INSTALL_PREFIX=${AVTRANSCODER_INSTALL_PATH} -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH -DCMAKE_BUILD_TYPE=Release -DAVTRANSCODER_PYTHON_VERSION_OF_BINDING=2.7 -DAVTRANSCODER_COVERAGE=${ENABLE_COVERAGE} From 0ffd508f3d81b966acf0cf0c59e4355bb63cb275 Mon Sep 17 00:00:00 2001 From: cchampet Date: Thu, 10 Dec 2015 14:06:32 +0100 Subject: [PATCH 13/14] Travis: fixed condition to launch pyTests --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f08a976b..82f73615 100644 --- a/.travis.yml +++ b/.travis.yml @@ -79,7 +79,7 @@ script: - ./tools/travis.build.sh # launch tests - - if [ ${TRAVIS_OS_NAME} = "linux" && ${DEPENDENCY_NAME} = "ffmpeg" ]; then ./tools/travis.python.nosetests.sh; fi + - if [ ${TRAVIS_OS_NAME} = "linux" ] && [ ${DEPENDENCY_NAME} = "ffmpeg" ]; then ./tools/travis.python.nosetests.sh; fi after_success: # generate coverage for coveralls From ca7e485fc05f2f69ca486b1f10fb790ef42ab737 Mon Sep 17 00:00:00 2001 From: cchampet Date: Sun, 20 Dec 2015 15:21:05 +0100 Subject: [PATCH 14/14] Travis: fixed installation of dependencies on osx --- tools/travis/osx.install.deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/travis/osx.install.deps.sh b/tools/travis/osx.install.deps.sh index 83595e7e..2b0289ea 100755 --- a/tools/travis/osx.install.deps.sh +++ b/tools/travis/osx.install.deps.sh @@ -16,4 +16,4 @@ pip install nose brew install freeglut # Main dependency -./tools/travis.linux.install.deps.sh +./tools/travis/linux.install.deps.sh