From 564685c1120d26473a803575127a26ae9d9b3101 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Fri, 20 Nov 2015 11:41:03 +0100 Subject: [PATCH 1/3] Travis: rename environment variables which indicate the paths --- .travis.yml | 10 +++++----- tools/travis.build.sh | 8 ++++---- tools/travis.gcc.generate.coverage.sh | 2 +- tools/travis.gcc.install.coverage.sh | 2 +- tools/travis.linux.install.deps.sh | 6 +++--- tools/travis.python.nosetests.sh | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index cdd81f46..dcbda99e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,9 +15,9 @@ compiler: env: global: - - AVTRANSCODER_BUILD=${TRAVIS_BUILD_DIR}/build-avtranscoder - - AVTRANSCODER_INSTALL=${TRAVIS_BUILD_DIR}/install-avtranscoder - - DEPENDENCY_INSTALL=${TRAVIS_BUILD_DIR}/install-dependency + - AVTRANSCODER_BUILD_PATH=${TRAVIS_BUILD_DIR}/build-avtranscoder + - AVTRANSCODER_INSTALL_PATH=${TRAVIS_BUILD_DIR}/install-avtranscoder + - DEPENDENCY_INSTALL_PATH=${TRAVIS_BUILD_DIR}/install-dependency - CI_NODE_TOTAL=2 matrix: - DEPENDENCY_MODE=libav ENABLE_COVERAGE=true @@ -54,7 +54,7 @@ cache: apt: true # Caching other directories directories: - - ${DEPENDENCY_INSTALL} + - ${DEPENDENCY_INSTALL_PATH} before_script: - env | sort @@ -84,7 +84,7 @@ after_success: before_deploy: # 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_MODE}.tgz ${DEPENDENCY_INSTALL_PATH} ${AVTRANSCODER_INSTALL_PATH} deploy: provider: releases diff --git a/tools/travis.build.sh b/tools/travis.build.sh index b6ba4c8d..f6edf831 100755 --- a/tools/travis.build.sh +++ b/tools/travis.build.sh @@ -4,19 +4,19 @@ set -x # Create directory of build -mkdir -p ${AVTRANSCODER_BUILD} -cd ${AVTRANSCODER_BUILD} +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} + 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') fi # Build avTranscoder -cmake .. -DCMAKE_INSTALL_PREFIX=${AVTRANSCODER_INSTALL} -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH -DCMAKE_BUILD_TYPE=Release -DAVTRANSCODER_PYTHON_VERSION_OF_BINDING=2.7 -DAVTRANSCODER_COVERAGE=${ENABLE_COVERAGE} +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} make -j${CI_NODE_TOTAL} make install diff --git a/tools/travis.gcc.generate.coverage.sh b/tools/travis.gcc.generate.coverage.sh index b93e99d4..35afb6e9 100755 --- a/tools/travis.gcc.generate.coverage.sh +++ b/tools/travis.gcc.generate.coverage.sh @@ -4,7 +4,7 @@ set -x # capture coverage info -lcov --capture --directory ${AVTRANSCODER_BUILD} --output-file coverage.info +lcov --capture --directory ${AVTRANSCODER_BUILD_PATH} --output-file coverage.info # filter out system and test code lcov --remove coverage.info '/usr/*' '*/*PYTHON_wrap.*' --output-file coverage.info diff --git a/tools/travis.gcc.install.coverage.sh b/tools/travis.gcc.install.coverage.sh index bc88c2b6..5df17566 100755 --- a/tools/travis.gcc.install.coverage.sh +++ b/tools/travis.gcc.install.coverage.sh @@ -12,7 +12,7 @@ sudo make -C lcov-1.11/ install gem install coveralls-lcov # init coverage to 0 (optional) -lcov --directory ${AVTRANSCODER_BUILD} --zerocounters +lcov --directory ${AVTRANSCODER_BUILD_PATH} --zerocounters # install nosetests plugins sudo pip install coverage diff --git a/tools/travis.linux.install.deps.sh b/tools/travis.linux.install.deps.sh index 5efa4faa..46cc80fc 100755 --- a/tools/travis.linux.install.deps.sh +++ b/tools/travis.linux.install.deps.sh @@ -5,7 +5,7 @@ set -x lsb_release -a -if [ ! -d "${DEPENDENCY_INSTALL}/lib/" ]; then +if [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then if [[ ${DEPENDENCY_MODE} == "ffmpeg" ]]; then @@ -14,7 +14,7 @@ if [ ! -d "${DEPENDENCY_INSTALL}/lib/" ]; then bunzip2 ffmpeg-${FFMPEG_VERSION}.tar.bz2 tar -xvf ffmpeg-${FFMPEG_VERSION}.tar cd ffmpeg-${FFMPEG_VERSION} - ./configure --prefix=${DEPENDENCY_INSTALL} --disable-yasm --enable-shared --disable-static && make && make install + ./configure --prefix=${DEPENDENCY_INSTALL_PATH} --disable-yasm --enable-shared --disable-static && make && make install elif [[ ${DEPENDENCY_MODE} == "libav" ]]; then @@ -22,7 +22,7 @@ if [ ! -d "${DEPENDENCY_INSTALL}/lib/" ]; then wget https://libav.org/releases/libav-${LIBAV_VERSION}.tar.gz tar -xvf libav-${LIBAV_VERSION}.tar.gz cd libav-${LIBAV_VERSION} - ./configure --prefix=${DEPENDENCY_INSTALL} --disable-yasm --enable-shared --disable-static && make && make install + ./configure --prefix=${DEPENDENCY_INSTALL_PATH} --disable-yasm --enable-shared --disable-static && make && make install fi diff --git a/tools/travis.python.nosetests.sh b/tools/travis.python.nosetests.sh index 65945ec1..1096f333 100755 --- a/tools/travis.python.nosetests.sh +++ b/tools/travis.python.nosetests.sh @@ -4,8 +4,8 @@ set -x # Get avtranscoder library -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${DEPENDENCY_INSTALL}/lib -export PYTHONPATH=${AVTRANSCODER_INSTALL}/lib/python2.7/site-packages/:$PYTHONPATH +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${DEPENDENCY_INSTALL_PATH}/lib +export PYTHONPATH=${AVTRANSCODER_INSTALL_PATH}/lib/python2.7/site-packages/:$PYTHONPATH # Get assets git clone https://github.com/avTranscoder/avTranscoder-data.git From db20d625f8c3138ae9988934137d91b2183c4a82 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Fri, 20 Nov 2015 11:44:55 +0100 Subject: [PATCH 2/3] Travis: remove CI_NODE_TOTAL env variable * Travis already optimize it. * Add 'make -k' option to continue as much as possible after an error (easier to debug). --- .travis.yml | 1 - tools/travis.build.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index dcbda99e..af612cbe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,6 @@ env: - AVTRANSCODER_BUILD_PATH=${TRAVIS_BUILD_DIR}/build-avtranscoder - AVTRANSCODER_INSTALL_PATH=${TRAVIS_BUILD_DIR}/install-avtranscoder - DEPENDENCY_INSTALL_PATH=${TRAVIS_BUILD_DIR}/install-dependency - - CI_NODE_TOTAL=2 matrix: - DEPENDENCY_MODE=libav ENABLE_COVERAGE=true - DEPENDENCY_MODE=libav ENABLE_COVERAGE=false diff --git a/tools/travis.build.sh b/tools/travis.build.sh index f6edf831..cde33c27 100755 --- a/tools/travis.build.sh +++ b/tools/travis.build.sh @@ -18,5 +18,5 @@ fi # 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} -make -j${CI_NODE_TOTAL} +make -k make install From a39d549add7471d29103764cff303881bdd55252 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Fri, 20 Nov 2015 11:47:32 +0100 Subject: [PATCH 3/3] Travis: create archive of binaries without the absolute paths --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index af612cbe..b06d12ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,8 +16,10 @@ compiler: env: global: - AVTRANSCODER_BUILD_PATH=${TRAVIS_BUILD_DIR}/build-avtranscoder - - AVTRANSCODER_INSTALL_PATH=${TRAVIS_BUILD_DIR}/install-avtranscoder - - DEPENDENCY_INSTALL_PATH=${TRAVIS_BUILD_DIR}/install-dependency + - AVTRANSCODER_INSTALL=install-avtranscoder + - AVTRANSCODER_INSTALL_PATH=${TRAVIS_BUILD_DIR}/${AVTRANSCODER_INSTALL} + - 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 @@ -83,7 +85,7 @@ after_success: before_deploy: # create archive - cd ${TRAVIS_BUILD_DIR} - - tar -cvzf avtranscoder-${TRAVIS_OS_NAME}-${CC}-${DEPENDENCY_MODE}.tgz ${DEPENDENCY_INSTALL_PATH} ${AVTRANSCODER_INSTALL_PATH} + - tar -cvzf avtranscoder-${TRAVIS_OS_NAME}-${CC}-${DEPENDENCY_MODE}.tgz ${DEPENDENCY_INSTALL} ${AVTRANSCODER_INSTALL} deploy: provider: releases pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy