Travis: deploy ffmpeg/libav dependency

Clement Champetier · Clement Champetier · commit b526dd3e5197 · 2015-04-30T13:19:09.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,8 @@
 env:
   global:
-     - AVTRANSCODER_BUILD=${TRAVIS_BUILD_DIR}/build
-     - AVTRANSCODER_INSTALL=${TRAVIS_BUILD_DIR}/install
+     - AVTRANSCODER_BUILD=${TRAVIS_BUILD_DIR}/build-avtranscoder
+     - AVTRANSCODER_INSTALL=${TRAVIS_BUILD_DIR}/install-avtranscoder
+     - DEPENDENCY_INSTALL=${TRAVIS_BUILD_DIR}/install-dependency
      - J='-j3'
   matrix:
     - DEPENDENCY_MODE=libav
@@ -35,7 +36,7 @@ script:
   # Build
   - mkdir -p ${AVTRANSCODER_BUILD}
   - cd ${AVTRANSCODER_BUILD}
-  - cmake .. -DCMAKE_INSTALL_PREFIX=${AVTRANSCODER_INSTALL} -DCMAKE_BUILD_TYPE=Release -DAVTRANSCODER_PYTHON_VERSION_OF_BINDING=2.7 -DAVTRANSCODER_COVERAGE=True
+  - cmake .. -DCMAKE_INSTALL_PREFIX=${AVTRANSCODER_INSTALL} -DCMAKE_PREFIX_PATH=${DEPENDENCY_INSTALL} -DCMAKE_BUILD_TYPE=Release -DAVTRANSCODER_PYTHON_VERSION_OF_BINDING=2.7 -DAVTRANSCODER_COVERAGE=True
   - make $J install
 
   # Launch tests
@@ -48,8 +49,8 @@ after_success:
   - if [ "${CC}" = "gcc" ]; then ./tools/travis.gcc.generate.coverage.sh; fi
 
 before_deploy:
-  - cd ${AVTRANSCODER_INSTALL}
-  - tar -cvzf avtranscoder_install.tgz .
+  - cd ${TRAVIS_BUILD_DIR}
+  - tar -cvzf avtranscoder_install.tgz ${DEPENDENCY_INSTALL} ${AVTRANSCODER_INSTALL}
 
 deploy:
   provider: releases
diff --git a/tools/travis.linux.install.deps.sh b/tools/travis.linux.install.deps.sh
@@ -16,13 +16,13 @@ if [[ ${DEPENDENCY_MODE} == "ffmpeg" ]]; then
     sudo bunzip2 ffmpeg-${FFMPEG_VERSION}.tar.bz2
     sudo tar -xvf ffmpeg-${FFMPEG_VERSION}.tar
     cd ffmpeg-${FFMPEG_VERSION}
-    sudo ./configure --disable-yasm --enable-shared --disable-static && sudo make && sudo make install
+    sudo ./configure --prefix=${DEPENDENCY_INSTALL} --disable-yasm --enable-shared --disable-static && sudo make && sudo make install
 
 elif [[ ${DEPENDENCY_MODE} == "libav" ]]; then
     export LIBAV_VERSION=11.3
     sudo wget https://libav.org/releases/libav-${LIBAV_VERSION}.tar.gz
     sudo tar -xvf libav-${LIBAV_VERSION}.tar.gz
     cd libav-${LIBAV_VERSION}
-    sudo ./configure --disable-yasm --enable-shared --disable-static && sudo make && sudo make install
+    sudo ./configure --prefix=${DEPENDENCY_INSTALL} --disable-yasm --enable-shared --disable-static && sudo make && sudo make install
 
 fi
diff --git a/tools/travis.python.nosetests.sh b/tools/travis.python.nosetests.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 # Get avtranscoder library
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${DEPENDENCY_INSTALL}/lib
 export PYTHONPATH=${AVTRANSCODER_INSTALL}/lib/python2.7.6/site-packages/:$PYTHONPATH
 
 # Get avtranscoder profiles
