Travis: renamed DEPENDENCY_MODE to DEPENDENCY_NAME

cchampet · cchampet · commit 1557d6a0d8b4 · 2015-12-10T10:31:19.000+01:00
diff --git 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
@@ -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
@@ -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
@@ -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
