diff --git a/.travis.yml b/.travis.yml
index cdd81f46..b06d12ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,10 +15,11 @@ compiler:
env:
global:
- - AVTRANSCODER_BUILD=${TRAVIS_BUILD_DIR}/build-avtranscoder
- - AVTRANSCODER_INSTALL=${TRAVIS_BUILD_DIR}/install-avtranscoder
- - DEPENDENCY_INSTALL=${TRAVIS_BUILD_DIR}/install-dependency
- - CI_NODE_TOTAL=2
+ - AVTRANSCODER_BUILD_PATH=${TRAVIS_BUILD_DIR}/build-avtranscoder
+ - 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
@@ -54,7 +55,7 @@ cache:
apt: true
# Caching other directories
directories:
- - ${DEPENDENCY_INSTALL}
+ - ${DEPENDENCY_INSTALL_PATH}
before_script:
- env | sort
diff --git a/tools/travis.build.sh b/tools/travis.build.sh
index b6ba4c8d..cde33c27 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}
-make -j${CI_NODE_TOTAL}
+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 -k
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
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