diff --git a/.travis.yml b/.travis.yml index b06d12ee..02f61bd2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,32 +21,35 @@ 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_MODE=libav ENABLE_COVERAGE=true PYTHON_VERSION=2.7 + - DEPENDENCY_MODE=libav ENABLE_COVERAGE=false PYTHON_VERSION=2.7 + - DEPENDENCY_MODE=libav ENABLE_COVERAGE=false PYTHON_VERSION=2.6 + - DEPENDENCY_MODE=ffmpeg ENABLE_COVERAGE=true PYTHON_VERSION=2.7 + - DEPENDENCY_MODE=ffmpeg ENABLE_COVERAGE=false PYTHON_VERSION=2.7 + - DEPENDENCY_MODE=ffmpeg ENABLE_COVERAGE=false PYTHON_VERSION=2.6 matrix: # generate coverage only with gcc exclude: - compiler: clang - env: DEPENDENCY_MODE=ffmpeg ENABLE_COVERAGE=true + env: DEPENDENCY_MODE=ffmpeg ENABLE_COVERAGE=true PYTHON_VERSION=2.7 - compiler: clang - env: DEPENDENCY_MODE=libav ENABLE_COVERAGE=true + env: DEPENDENCY_MODE=libav ENABLE_COVERAGE=true PYTHON_VERSION=2.7 allow_failures: - os: osx fast_finish: true -# This results in a 2×2×2x2 build matrix. -# Where the variables are: os / compiler / DEPENDENCY_MODE / ENABLE_COVERAGE +# This results in a 2×2×2x2x2 build matrix. +# Where the variables are: os / compiler / DEPENDENCY_MODE / PYTHON_VERSION / ENABLE_COVERAGE addons: apt: - sources: ['kalakris-cmake'] + sources: ['kalakris-cmake', 'pythonxy-devel'] packages: - cmake - swig - - python-dev + - python2.6-dev + - python2.7-dev - python-nose - freeglut3-dev @@ -85,7 +88,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}-${PYTHON_VERSION}-${DEPENDENCY_MODE}.tgz ${DEPENDENCY_INSTALL} ${AVTRANSCODER_INSTALL} deploy: provider: releases diff --git a/tools/travis.build.sh b/tools/travis.build.sh index cde33c27..cc29e67b 100755 --- a/tools/travis.build.sh +++ b/tools/travis.build.sh @@ -17,6 +17,6 @@ elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then 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} +cmake .. -DCMAKE_INSTALL_PREFIX=${AVTRANSCODER_INSTALL_PATH} -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH -DCMAKE_BUILD_TYPE=Release -DAVTRANSCODER_PYTHON_VERSION_OF_BINDING=${PYTHON_VERSION} -DAVTRANSCODER_COVERAGE=${ENABLE_COVERAGE} make -k make install diff --git a/tools/travis.osx.install.deps.sh b/tools/travis.osx.install.deps.sh index 18b2649f..a2cfbd4a 100755 --- a/tools/travis.osx.install.deps.sh +++ b/tools/travis.osx.install.deps.sh @@ -8,8 +8,14 @@ brew update # To build brew install gcc cmake swig doxygen +# To generate python binding +if [[ ${PYTHON_VERSION} == "2.7" ]]; then + brew install python +elif [[ ${PYTHON_VERSION} == "2.6" ]]; then + brew install python26 +fi + # To launch nosetests -brew install python pip install nose # To build avplay application