appveyor: fix build and tests of avtranscoder

Clement Champetier · Clement Champetier · commit 3febb6c81f0d · 2015-11-12T19:11:15.000+01:00
* Add file tools/appveyor.build.bat
* Build on both x86 and x64 (but not 'Any CPU')
diff --git a/appveyor.yml b/appveyor.yml
@@ -3,7 +3,7 @@ os:
 
 platform:
   - x86
-  - Any CPU
+  - x64
 
 matrix:
   fast_finish: true
@@ -16,15 +16,15 @@ before_build:
   - tools/appveyor.win.install.deps.bat
 
 build_script:
-  - MKDIR build
-  - cd build
-  - call cmake.exe .. -G "NMake Makefiles" -DCMAKE_INSTALL_PREFIX=%~dp0 -DCMAKE_PREFIX_PATH="%~dp0\ffmpeg-2.2.11-win32-dev"
-  - call nmake /F Makefile install
+  - tools/appveyor.build.bat
 
 before_test:
-  - pip install nosetests
+  - set PATH=C:\Python27\scripts;%PATH%
+  - pip install nose
 
 test_script:
   - cd ..
   - tools/appveyor.python.nosetests.bat
 
+on_failure:
+  - type "C:\projects\avtranscoder\build\CMakeFiles\CMakeOutput.log"
diff --git a/tools/appveyor.build.bat b/tools/appveyor.build.bat
@@ -0,0 +1,18 @@
+@echo on
+
+set FFMPEG_VERSION=2.2.11
+
+IF %platform% EQU x32 set PLATFORM=32
+IF %platform% EQU x64 set PLATFORM=64
+
+MKDIR build
+cd build
+
+:: Configure
+call cmake.exe .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%CD% -DCMAKE_PREFIX_PATH=C:\ProgramData\ffmpeg-%FFMPEG_VERSION%-win%PLATFORM%-dev -DAVTRANSCODER_PYTHON_VERSION_OF_BINDING=2.7
+
+:: Build & Install
+call nmake /F Makefile
+call nmake /F Makefile install
+
+@echo off
diff --git a/tools/appveyor.python.nosetests.bat b/tools/appveyor.python.nosetests.bat
@@ -1,18 +1,26 @@
-set PWD=%~dp0
+@echo on
+
+set PWD=C:\projects\avtranscoder
+set FFMPEG_VERSION=2.2.11
+
+IF %platform% EQU x32 set PLATFORM=32
+IF %platform% EQU x64 set PLATFORM=64
 
 :: Get avtranscoder library
-set PYTHONPATH=%PWD%/build/dist/lib/python2.7.6/site-packages/:%PYTHONPATH%
+set PYTHONPATH=%PWD%\build\lib\python2.7\site-packages;%PYTHONPATH%
+set PATH=C:\ProgramData\ffmpeg-%FFMPEG_VERSION%-win%PLATFORM%-dev\bin;%PWD%\build\lib;%PATH%
 
 :: Get avtranscoder profiles
-set AVPROFILES=%PWD%/build/dist/share/ressource
+set AVPROFILES=%PWD%\build\share\avprofiles
 
 :: Get assets
 git clone https://github.com/avTranscoder/avTranscoder-data.git
-set AVTRANSCODER_TEST_VIDEO_FILE=%PWD%/avTranscoder-data/video/BigBuckBunny/BigBuckBunny_480p_stereo.avi
-set AVTRANSCODER_TEST_AUDIO_WAVE_FILE=%PWD%/avTranscoder-data/audio/frequenciesPerChannel.wav
-set AVTRANSCODER_TEST_AUDIO_MOV_FILE=%PWD%/avTranscoder-data/video/BigBuckBunny/BigBuckBunny_1080p_5_1.mov
+set AVTRANSCODER_TEST_VIDEO_FILE=%PWD%\avTranscoder-data/video\BigBuckBunny\BigBuckBunny_480p_stereo.avi
+set AVTRANSCODER_TEST_AUDIO_WAVE_FILE=%PWD%\avTranscoder-data\audio\frequenciesPerChannel.wav
+set AVTRANSCODER_TEST_AUDIO_MOV_FILE=%PWD%\avTranscoder-data\video\BigBuckBunny\BigBuckBunny_1080p_5_1.mov
 
 :: Launch tests
-cd test/pyTest
+cd test\pyTest
 nosetests
 
+@echo off
diff --git a/tools/appveyor.win.install.deps.bat b/tools/appveyor.win.install.deps.bat
@@ -1,11 +1,20 @@
+@echo on
+
 set FFMPEG_VERSION=2.2.11
 
+IF %platform% EQU x32 set PLATFORM=32
+IF %platform% EQU x64 set PLATFORM=64
+
+
 :: Installing ffmpeg dev (include + apps)
-curl -kLO http://ffmpeg.zeranoe.com/builds/win32/dev/ffmpeg-%FFMPEG_VERSION%-win32-dev.7z
-7z x ffmpeg-%FFMPEG_VERSION%-win32-dev.7z
+curl -kLO http://ffmpeg.zeranoe.com/builds/win%PLATFORM%/dev/ffmpeg-%FFMPEG_VERSION%-win%PLATFORM%-dev.7z
+7z x ffmpeg-%FFMPEG_VERSION%-win%PLATFORM%-dev.7z
 
 :: Installing ffmpeg shared (libs)
-curl -kLO http://ffmpeg.zeranoe.com/builds/win32/shared/ffmpeg-%FFMPEG_VERSION%-win32-shared.7z
-7z x ffmpeg-%FFMPEG_VERSION%-win32-shared.7z
+curl -kLO http://ffmpeg.zeranoe.com/builds/win%PLATFORM%/shared/ffmpeg-%FFMPEG_VERSION%-win%PLATFORM%-shared.7z
+7z x ffmpeg-%FFMPEG_VERSION%-win%PLATFORM%-shared.7z
+
+move ffmpeg-%FFMPEG_VERSION%-win%PLATFORM%-shared\bin ffmpeg-%FFMPEG_VERSION%-win%PLATFORM%-dev
+move ffmpeg-%FFMPEG_VERSION%-win%PLATFORM%-dev C:\ProgramData\
 
-move ffmpeg-%FFMPEG_VERSION%-win32-shared\bin ffmpeg-%FFMPEG_VERSION%-win32-dev
+@echo off
