Skip to content

Commit

Permalink
ci/appveyor: use qt5.3~5.6, vs2013~2015
Browse files Browse the repository at this point in the history
  • Loading branch information
wang-bin committed Mar 27, 2016
1 parent e4bdd17 commit 3345670
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 23 deletions.
29 changes: 14 additions & 15 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,40 +10,39 @@ environment:
matrix:
- arch: x64
cc: VS2013
qt: 5.5.0
suffix: -debug
qt: 5.5
toolchain_version: 12
mode: debug
QTDIR: C:\Qt\5.5\msvc2013_64

- arch: x86
cc: VS2013
qt: 5.5.0
suffix: -xp
cc: VS2015
qt: 5.6
toolchain_version: 14
mode: release
QTDIR: C:\projects\QtAV\build\Qt
QTDIR: C:\Qt\5.6\msvc2015

- arch: 32
cc: MinGW
qt: 5.5.0
suffix: GCC492-dwarf
qt: 5.4
toolchain_version: 491
mode: release
QTDIR: C:\Qt\5.5\mingw492_32
QTDIR: C:\Qt\5.4\mingw491_32

- arch: 32
cc: MinGW
qt: 5.5.0
suffix: GCC492-dwarf
qt: 5.3
toolchain_version: 482
mode: debug
QTDIR: C:\Qt\5.5\mingw492_32
QTDIR: C:\Qt\5.3\mingw482_32

matrix:
fast_finish: false

init:
- set vcarch=%arch%
- if "%arch%" == "x64" set vcarch=amd64
- if not %cc%==MinGW call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" %vcarch%
- C:\Qt\Tools\mingw492_32\bin\g++ --version
- if not %cc%==MinGW call "C:\Program Files (x86)\Microsoft Visual Studio %toolchain_version%.0\VC\vcvarsall.bat" %vcarch%
- echo NUMBER_OF_PROCESSORS=%NUMBER_OF_PROCESSORS%
- echo PROCESSOR_IDENTIFIER=%PROCESSOR_IDENTIFIER%
- echo QTDIR=%QTDIR%
Expand All @@ -56,7 +55,7 @@ install:

before_build:
- set PATH=%QTDIR%\bin;%PATH%
- if %cc%==MinGW set PATH=C:\Qt\Tools\mingw492_32\bin;%PATH%
- if %cc%==MinGW set PATH=C:\Qt\Tools\mingw%toolchain_version%_32\bin;%PATH%
- echo PATH=%PATH%

build_script:
Expand Down
3 changes: 3 additions & 0 deletions tools/ci/win/deploy_win.bat
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

copy /y %QTDIR%\bin\av*.dll bin
copy /y %QTDIR%\bin\sw*.dll bin
if exist %QTDIR%\bin\ass.dll copy /y %QTDIR%\bin\ass.dll bin
if exist %QTDIR%\bin\libass.dll copy /y %QTDIR%\bin\libass.dll bin
if exist %QTDIR%\bin\po*.dll copy /y %QTDIR%\bin\po*.dll bin
if exist %QTDIR%\bin\msvc*.dll copy /y %QTDIR%\bin\msvc*.dll bin
Expand Down Expand Up @@ -29,6 +30,7 @@ if "%mode%" == "debug" (
if exist %QTDIR%\bin\Qt5Core.dll copy /y %QTDIR%\bin\Qt5Core.dll bin
if exist %QTDIR%\bin\Qt5Gui.dll copy /y %QTDIR%\bin\Qt5Gui.dll bin
if exist %QTDIR%\bin\Qt5OpenGL.dll copy /y %QTDIR%\bin\Qt5OpenGL.dll bin
if exist %QTDIR%\bin\Qt5Sql.dll copy /y %QTDIR%\bin\Qt5Sql.dll bin
if exist %QTDIR%\bin\Qt5Svg.dll copy /y %QTDIR%\bin\Qt5Svg.dll bin
if exist %QTDIR%\bin\Qt5Widgets.dll copy /y %QTDIR%\bin\Qt5Widgets.dll bin
if exist %QTDIR%\bin\Qt5Network.dll copy /y %QTDIR%\bin\Qt5Network.dll bin
Expand All @@ -38,6 +40,7 @@ if "%mode%" == "debug" (
if exist bin\lib*GL*d.dll del bin\lib*GL*d.dll
:: delete debug dlls. assume no *dd.dll
forfiles /S /M *d.dll /P bin /C "cmd /C del @path"
forfiles /S /M *.pdb /P bin /C "cmd /C del @path"
)
dir bin
xcopy /syi tools\install_sdk\mkspecs mkspecs
Expand Down
8 changes: 0 additions & 8 deletions tools/ci/win/install_dep.bat
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
if "%QTDIR:~0,6%" == "C:\Qt\" goto getdep

echo downloading qt "http://sourceforge.net/projects/buildqt/files/release/%qt%/Qt%qt%-%cc%%arch%%suffix%.7z/download"
appveyor DownloadFile "http://sourceforge.net/projects/buildqt/files/release/%qt%/Qt%qt%-%cc%%arch%%suffix%.7z/download" -FileName qt.7z
7z x qt.7z > NUL
move Qt%qt%-* %QTDIR%

:getdep
echo downloading qtav dep "http://sourceforge.net/projects/qtav/files/depends/QtAV-depends-windows-x86+x64.7z/download"
appveyor DownloadFile "http://sourceforge.net/projects/qtav/files/depends/QtAV-depends-windows-x86+x64.7z/download" -FileName av.7z
7z x av.7z > NUL
Expand Down

0 comments on commit 3345670

Please sign in to comment.