From 46edcf8c3bea5dd821576719407fc8180290fc9e Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Tue, 23 Feb 2016 10:49:20 +0100 Subject: [PATCH 01/11] Appveyor: activate x64 build --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index fed23628..2e8b47e4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,7 @@ os: platform: - x86 -# - x64 + - x64 environment: FFMPEG_VERSION: 2.4.5 From cdcfe5271b8ac1e071f3c4e7890abc748e3bf521 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Tue, 23 Feb 2016 11:29:00 +0100 Subject: [PATCH 02/11] Appveyor: fixed python version used if the build target is x64 --- appveyor.yml | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 2e8b47e4..16bb12ab 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,27 +6,44 @@ platform: - x64 environment: - FFMPEG_VERSION: 2.4.5 - DEPENDENCY_INSTALL_PATH: C:\ProgramData\ffmpeg-2.4.5 - AVTRANSCODER_INSTALL_PATH: C:\projects\avtranscoder\build\install + global: + FFMPEG_VERSION: 2.4.5 + DEPENDENCY_INSTALL_PATH: C:\ProgramData\ffmpeg-2.4.5 + AVTRANSCODER_INSTALL_PATH: C:\projects\avtranscoder\build\install -matrix: - fast_finish: true + matrix: + - fast_finish: true init: - call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" %platform% -before_build: +install: + # Install build dependencies - choco install -y swig - tools/appveyor/win.install.deps.bat -build_script: - - tools/appveyor/build.bat + # Get the correct python version + - ps: if($env:platform -eq 'x86') { + $env:PYTHON = "C:\Python27"; + } + else { + $env:PYTHON = "C:\Python27-x64"; + } + # Prepend newly installed Python to the PATH of this build + - cmd: set PATH=%PYTHON%;%PYTHON%\Scripts;%PATH% + - cmd: echo %PATH% + # Check that we have the expected version and architecture for Python + - "python --version" + - "python -c \"import struct; print(struct.calcsize('P') * 8)\"" + # Upgrade to the latest version of pip to avoid it displaying warnings about it being out of date. + - pip install --disable-pip-version-check --user --upgrade pip -before_test: - - set PATH=C:\Python27\scripts;%PATH% + # Install tests dependencies - pip install nose +build_script: + - tools/appveyor/build.bat + test_script: - cd .. - tools/appveyor/python.nosetests.bat From 2aecf6d3b55fa6e91a493bef746a3bb6cb381d0c Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Tue, 23 Feb 2016 19:06:23 +0100 Subject: [PATCH 03/11] Appveyor: deploy only one artifact This artifact contains both ffmpeg and avtranscoder. --- appveyor.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 16bb12ab..076efdb3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,6 +7,7 @@ platform: environment: global: + DEPENDENCY_NAME: ffmpeg FFMPEG_VERSION: 2.4.5 DEPENDENCY_INSTALL_PATH: C:\ProgramData\ffmpeg-2.4.5 AVTRANSCODER_INSTALL_PATH: C:\projects\avtranscoder\build\install @@ -53,21 +54,16 @@ on_failure: - type "C:\projects\avtranscoder\build\CMakeFiles\CMakeOutput.log" on_success: - - 7z a ffmpeg.zip %DEPENDENCY_INSTALL_PATH% - - 7z a avtranscoder.zip %AVTRANSCODER_INSTALL_PATH% + - 7z a avtranscoder-win${PLATFORM}-${DEPENDENCY_NAME}-${FFMPEG_VERSION}.zip %DEPENDENCY_INSTALL_PATH% %AVTRANSCODER_INSTALL_PATH% artifacts: - - path: ffmpeg.zip - name: ffmpeg - type: zip - - - path: avtranscoder.zip + - path: avtranscoder-win${PLATFORM}-${DEPENDENCY_NAME}-${FFMPEG_VERSION}.zip name: avtranscoder type: zip deploy: - provider: GitHub - artifact: ffmpeg,avtranscoder + artifact: avtranscoder auth_token: secure: sApasbQe2i7Uu+XNhlkXg+F6zI0VNHUjhq5QfK6/+NSs4lX/9BwhkLvibQc6bmMv on: From bdf565643c6e218e7b92f3152b9d9b95baad4ac6 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Tue, 23 Feb 2016 19:07:02 +0100 Subject: [PATCH 04/11] Appveyor: push release to github whatever the branch is --- appveyor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 076efdb3..b10b2da0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -67,5 +67,4 @@ deploy: auth_token: secure: sApasbQe2i7Uu+XNhlkXg+F6zI0VNHUjhq5QfK6/+NSs4lX/9BwhkLvibQc6bmMv on: - branch: master appveyor_repo_tag: true From c6e6eea5feff71160ec0213278cbe01cb3b63b9a Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Tue, 23 Feb 2016 19:07:11 +0100 Subject: [PATCH 05/11] Travis: push release to github whatever the branch is --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9c8717aa..ead6f2da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -128,5 +128,6 @@ deploy: file: avtranscoder-${TRAVIS_OS_NAME}-${CC}-${DEPENDENCY_NAME}-${DEPENDENCY_VERSION}.tgz skip_cleanup: true on: - branch: master + tags: true + all_branches: true condition: ${ENABLE_COVERAGE} = false From 91951d96297bbf4005c4a14fe1e245447d8d46dc Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Tue, 23 Feb 2016 19:08:44 +0100 Subject: [PATCH 06/11] Appveyor: renamed env variable FFMPEG_VERSION to DEPENDENCY_VERSION --- appveyor.yml | 6 +++--- tools/appveyor/win.install.deps.bat | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b10b2da0..739f68b6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,7 +8,7 @@ platform: environment: global: DEPENDENCY_NAME: ffmpeg - FFMPEG_VERSION: 2.4.5 + DEPENDENCY_VERSION: 2.4.5 DEPENDENCY_INSTALL_PATH: C:\ProgramData\ffmpeg-2.4.5 AVTRANSCODER_INSTALL_PATH: C:\projects\avtranscoder\build\install @@ -54,10 +54,10 @@ on_failure: - type "C:\projects\avtranscoder\build\CMakeFiles\CMakeOutput.log" on_success: - - 7z a avtranscoder-win${PLATFORM}-${DEPENDENCY_NAME}-${FFMPEG_VERSION}.zip %DEPENDENCY_INSTALL_PATH% %AVTRANSCODER_INSTALL_PATH% + - 7z a avtranscoder-win${PLATFORM}-${DEPENDENCY_NAME}-${DEPENDENCY_VERSION}.zip %DEPENDENCY_INSTALL_PATH% %AVTRANSCODER_INSTALL_PATH% artifacts: - - path: avtranscoder-win${PLATFORM}-${DEPENDENCY_NAME}-${FFMPEG_VERSION}.zip + - path: avtranscoder-win${PLATFORM}-${DEPENDENCY_NAME}-${DEPENDENCY_VERSION}.zip name: avtranscoder type: zip diff --git a/tools/appveyor/win.install.deps.bat b/tools/appveyor/win.install.deps.bat index 7f399154..016b0244 100755 --- a/tools/appveyor/win.install.deps.bat +++ b/tools/appveyor/win.install.deps.bat @@ -4,14 +4,14 @@ if %platform% == x86 set PLATFORM_VERSION=32 if %platform% == X64 set PLATFORM_VERSION=64 :: Installing ffmpeg dev (include + apps) -curl -kLO http://ffmpeg.zeranoe.com/builds/win%PLATFORM_VERSION%/dev/ffmpeg-%FFMPEG_VERSION%-win%PLATFORM_VERSION%-dev.7z -7z x ffmpeg-%FFMPEG_VERSION%-win%PLATFORM_VERSION%-dev.7z +curl -kLO http://ffmpeg.zeranoe.com/builds/win%PLATFORM_VERSION%/dev/ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-dev.7z +7z x ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-dev.7z :: Installing ffmpeg shared (libs) -curl -kLO http://ffmpeg.zeranoe.com/builds/win%PLATFORM_VERSION%/shared/ffmpeg-%FFMPEG_VERSION%-win%PLATFORM_VERSION%-shared.7z -7z x ffmpeg-%FFMPEG_VERSION%-win%PLATFORM_VERSION%-shared.7z +curl -kLO http://ffmpeg.zeranoe.com/builds/win%PLATFORM_VERSION%/shared/ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-shared.7z +7z x ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-shared.7z -move ffmpeg-%FFMPEG_VERSION%-win%PLATFORM_VERSION%-shared\bin ffmpeg-%FFMPEG_VERSION%-win%PLATFORM_VERSION%-dev -move ffmpeg-%FFMPEG_VERSION%-win%PLATFORM_VERSION%-dev C:\ProgramData\ffmpeg-%FFMPEG_VERSION% +move ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-shared\bin ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-dev +move ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-dev C:\ProgramData\ffmpeg-%DEPENDENCY_VERSION% @echo off From 9f1b0bb09ecb809d57a419e15943e82a94f89019 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Tue, 23 Feb 2016 19:15:51 +0100 Subject: [PATCH 07/11] Appveyor: fixed name of zip to deploy --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 739f68b6..828546ba 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -54,10 +54,10 @@ on_failure: - type "C:\projects\avtranscoder\build\CMakeFiles\CMakeOutput.log" on_success: - - 7z a avtranscoder-win${PLATFORM}-${DEPENDENCY_NAME}-${DEPENDENCY_VERSION}.zip %DEPENDENCY_INSTALL_PATH% %AVTRANSCODER_INSTALL_PATH% + - 7z a avtranscoder-win%PLATFORM%-%DEPENDENCY_NAME%-%DEPENDENCY_VERSION%.zip %DEPENDENCY_INSTALL_PATH% %AVTRANSCODER_INSTALL_PATH% artifacts: - - path: avtranscoder-win${PLATFORM}-${DEPENDENCY_NAME}-${DEPENDENCY_VERSION}.zip + - path: avtranscoder-win%PLATFORM%-%DEPENDENCY_NAME%-%DEPENDENCY_VERSION%.zip name: avtranscoder type: zip From b93c6e9b24a4bfdfdd251438e088afe8e20c555e Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Tue, 23 Feb 2016 19:17:20 +0100 Subject: [PATCH 08/11] Appveyor: symmetry with releases from Travis Same path to access ffmpeg and avtranscoder. --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 828546ba..31b610b5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,8 +9,8 @@ environment: global: DEPENDENCY_NAME: ffmpeg DEPENDENCY_VERSION: 2.4.5 - DEPENDENCY_INSTALL_PATH: C:\ProgramData\ffmpeg-2.4.5 - AVTRANSCODER_INSTALL_PATH: C:\projects\avtranscoder\build\install + DEPENDENCY_INSTALL_PATH: C:\ProgramData\ffmpeg-2.4.5\install-dependency + AVTRANSCODER_INSTALL_PATH: C:\projects\avtranscoder\build\install-avtranscoder matrix: - fast_finish: true From 9b063282c354dcde4f4ed9c4d0e8810ec706cad6 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Wed, 24 Feb 2016 09:34:36 +0100 Subject: [PATCH 09/11] Appveyor: fixed path to install ffmpeg dependency --- tools/appveyor/win.install.deps.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/appveyor/win.install.deps.bat b/tools/appveyor/win.install.deps.bat index 016b0244..6c37998f 100755 --- a/tools/appveyor/win.install.deps.bat +++ b/tools/appveyor/win.install.deps.bat @@ -12,6 +12,6 @@ curl -kLO http://ffmpeg.zeranoe.com/builds/win%PLATFORM_VERSION%/shared/ffmpeg-% 7z x ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-shared.7z move ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-shared\bin ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-dev -move ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-dev C:\ProgramData\ffmpeg-%DEPENDENCY_VERSION% +move ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-dev %DEPENDENCY_INSTALL_PATH% @echo off From c50bcc33d8949ad65782766e7377a835bb1bdd11 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Wed, 24 Feb 2016 09:35:50 +0100 Subject: [PATCH 10/11] Appveyor: fixed CMAKE_INSTALL_PREFIX when build avtranscoder --- tools/appveyor/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/appveyor/build.bat b/tools/appveyor/build.bat index e71e0850..d3393bc4 100755 --- a/tools/appveyor/build.bat +++ b/tools/appveyor/build.bat @@ -4,7 +4,7 @@ MKDIR build cd build :: Configure -call cmake.exe .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%%AVTRANSCODER_INSTALL_PATH%% -DCMAKE_PREFIX_PATH=%DEPENDENCY_INSTALL_PATH% -DAVTRANSCODER_PYTHON_VERSION_OF_BINDING=2.7 +call cmake.exe .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%AVTRANSCODER_INSTALL_PATH% -DCMAKE_PREFIX_PATH=%DEPENDENCY_INSTALL_PATH% -DAVTRANSCODER_PYTHON_VERSION_OF_BINDING=2.7 :: Build & Install call nmake /F Makefile From 47da2e19e61e5a758269aced41ce3a1ba73392b3 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Wed, 24 Feb 2016 09:43:49 +0100 Subject: [PATCH 11/11] Appveyor: fixed output directory to dependency --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 31b610b5..700a5110 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,7 +9,7 @@ environment: global: DEPENDENCY_NAME: ffmpeg DEPENDENCY_VERSION: 2.4.5 - DEPENDENCY_INSTALL_PATH: C:\ProgramData\ffmpeg-2.4.5\install-dependency + DEPENDENCY_INSTALL_PATH: C:\ProgramData\install-dependency AVTRANSCODER_INSTALL_PATH: C:\projects\avtranscoder\build\install-avtranscoder matrix: