Commit37af8e4

committed

Appveyor: update FFmpeg version to 4.* and use Python3 for unit tests

1 parent1c95f19 commit37af8e4Copy full SHA for 37af8e4

File tree

+16

-11

lines changed

+16

-11

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ platform:`
`8`	`8`	`environment:`
`9`	`9`	`global:`
`10`	`10`	`DEPENDENCY_NAME:ffmpeg`
`11`		`-DEPENDENCY_VERSION:2.4.5`
	`11`	`+DEPENDENCY_VERSION:4.2.1`
`12`	`12`	`DEPENDENCY_INSTALL_PATH:C:\ProgramData\install-dependency`
`13`	`13`	`AVTRANSCODER_INSTALL_PATH:C:\projects\avtranscoder\build\install-avtranscoder`
`14`	`14`
`@@ -25,10 +25,10 @@ install:`
`25`	`25`
`26`	`26`	`# Get the correct python version`
`27`	`27`	`-ps:if($env:platform -eq 'x86') {`
`28`		`-$env:PYTHON = "C:\Python27";`
	`28`	`+$env:PYTHON = "C:\Python35";`
`29`	`29`	`}`
`30`	`30`	`else {`
`31`		`-$env:PYTHON = "C:\Python27-x64";`
	`31`	`+$env:PYTHON = "C:\Python35-x64";`
`32`	`32`	`}`
`33`	`33`	`# Prepend newly installed Python to the PATH of this build`
`34`	`34`	`-cmd:set PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%`
`@@ -37,7 +37,7 @@ install:`
`37`	`37`	`-"python --version"`
`38`	`38`	`-"python -c\"import struct; print(struct.calcsize('P') * 8)\""`
`39`	`39`	`# Upgrade to the latest version of pip to avoid it displaying warnings about it being out of date.`
`40`		`- -pip install --disable-pip-version-check --user --upgrade pip`
	`40`	`+ -"python -mpip install --disable-pip-version-check --user --upgrade pip"`
`41`	`41`
`42`	`42`	`# Install tests dependencies`
`43`	`43`	`-pip install nose`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,12 @@ MKDIR build`
`4`	`4`	`cd build`
`5`	`5`
`6`	`6`	`:: Configure`
`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`
	`7`	`+call cmake.exe .. -G"NMake Makefiles"^`
	`8`	`+ -DCMAKE_BUILD_TYPE=Release^`
	`9`	`+ -DCMAKE_INSTALL_PREFIX=%AVTRANSCODER_INSTALL_PATH%^`
	`10`	`+ -DCMAKE_PREFIX_PATH=%DEPENDENCY_INSTALL_PATH%^`
	`11`	`+ -DPYTHON_LIBRARY="C:\Python35\libs\python35.lib"^`
	`12`	`+ -DAVTRANSCODER_PYTHON_VERSION_OF_BINDING=3.5`
`8`	`13`
`9`	`14`	`:: Build & Install`
`10`	`15`	`call nmake /F Makefile`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`setPWD=C:\projects\avtranscoder`
`4`	`4`
`5`	`5`	`:: Get avtranscoder library`
`6`		`-setPYTHONPATH=%AVTRANSCODER_INSTALL_PATH%\lib\python2.7\site-packages;%PYTHONPATH%`
	`6`	`+setPYTHONPATH=%AVTRANSCODER_INSTALL_PATH%\lib\python3.5\site-packages;%PYTHONPATH%`
`7`	`7`	`setPATH=%DEPENDENCY_INSTALL_PATH%\bin;%AVTRANSCODER_INSTALL_PATH%\lib;%PATH%`
`8`	`8`
`9`	`9`	`:: Get avtranscoder profiles`
`@@ -22,7 +22,7 @@ set AVTRANSCODER_TEST_IMAGE_JPG_FILE=%PWD%\avTranscoder-data\image\BigBuckBunny\`
`22`	`22`
`23`	`23`	`:: Launch tests`
`24`	`24`	`cd test\pyTest`
`25`		`-nosetests`
	`25`	`+python -m nose`
`26`	`26`	`cd ..\..`
`27`	`27`
`28`	`28`	`@echooff`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,12 @@ if %platform% == x86 set PLATFORM_VERSION=32`
`4`	`4`	`if%platform%== X64setPLATFORM_VERSION=64`
`5`	`5`
`6`	`6`	`:: Installing ffmpeg dev (include + apps)`
`7`		`-curl -kLO http://ffmpeg.zeranoe.com/builds/win%PLATFORM_VERSION%/dev/ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-dev.7z`
`8`		`-7z x ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-dev.7z`
	`7`	`+curl -kLO http://ffmpeg.zeranoe.com/builds/win%PLATFORM_VERSION%/dev/ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-dev.zip`
	`8`	`+7z x ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-dev.zip`
`9`	`9`
`10`	`10`	`:: Installing ffmpeg shared (libs)`
`11`		`-curl -kLO http://ffmpeg.zeranoe.com/builds/win%PLATFORM_VERSION%/shared/ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-shared.7z`
`12`		`-7z x ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-shared.7z`
	`11`	`+curl -kLO http://ffmpeg.zeranoe.com/builds/win%PLATFORM_VERSION%/shared/ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-shared.zip`
	`12`	`+7z x ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-shared.zip`
`13`	`13`
`14`	`14`	`move ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-shared\bin ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-dev`
`15`	`15`	`move ffmpeg-%DEPENDENCY_VERSION%-win%PLATFORM_VERSION%-dev%DEPENDENCY_INSTALL_PATH%`

Comments

(0)