Skip to content

Commit 1a3af03

Browse files
committed
appveyor: fix Qt shared path + tmp rm CEmu build to assist w/my sanity
Given the updated vcpkg, the build is taking a significantly longer time to run due to needing to build all of the vcpkg-installed libraries from scratch. Therefore, to save sanity and allow the built libraries to get cached, the actual CEmu build steps have been removed temporarily until things work here.
1 parent 659c9a7 commit 1a3af03

File tree

1 file changed

+2
-51
lines changed

1 file changed

+2
-51
lines changed

appveyor.yml

Lines changed: 2 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ environment:
66
secure: QyZ6LhunNhgW3l/1aiGROg==
77
GOOGLE_URL_SHORTENER_API_KEY:
88
secure: yPv9WtzW+27giJAicFEXGV0KENiee+3+BG2CIOLarbu5wsm7q/h0Ixqsq70CITPi
9-
QT5_BIN_DIR_DYNAMIC_32: C:\Qt\5.15.0\msvc2015\bin
10-
QT5_BIN_DIR_DYNAMIC_64: C:\Qt\5.15.0\msvc2015_64\bin
9+
QT5_BIN_DIR_DYNAMIC_32: C:\Qt\5.15.0\msvc2019\bin
10+
QT5_BIN_DIR_DYNAMIC_64: C:\Qt\5.15.0\msvc2019_64\bin
1111
QT5_BIN_DIR_STATIC_32: C:\Qt\Qt5.15.0-static\bin
1212
QT5_BIN_DIR_STATIC_64: C:\Qt\Qt5.15.0x64-static\bin
1313

@@ -51,55 +51,6 @@ install:
5151
- vcpkg integrate install
5252
- cd %APPVEYOR_BUILD_FOLDER%
5353

54-
build_script:
55-
# Figure out version to set - if tag is defined, use that.
56-
# If not, set it to a space (which would evaluate to empty in our QMake command).
57-
- cmd: if defined APPVEYOR_REPO_TAG_NAME (set CEMU_VERSION=%APPVEYOR_REPO_TAG_NAME% & echo Using tagged version %CEMU_VERSION%) ELSE (set "CEMU_VERSION= " & echo No version defined, using empty version '%CEMU_VERSION%' and allowing QMake to set default for dev.)
58-
59-
- setlocal
60-
61-
- call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
62-
63-
- cd build_32
64-
- '%QT5_BIN_DIR_DYNAMIC_32%\qmake -spec win32-msvc -tp vc CEMU_VERSION=%CEMU_VERSION% LIBPNG_APNG_FROM_VCPKG=1 "..\gui\qt\CEmu.pro"'
65-
- msbuild CEmu.vcxproj /p:Configuration=Debug
66-
- '%QT5_BIN_DIR_DYNAMIC_32%\qmake -spec win32-msvc -tp vc CEMU_VERSION=%CEMU_VERSION% LIBPNG_APNG_FROM_VCPKG=1 "..\gui\qt\CEmu.pro"'
67-
- msbuild CEmu.vcxproj /p:Configuration=Release
68-
- cd ..
69-
70-
- cd build_static_32
71-
- '%QT5_BIN_DIR_STATIC_32%\qmake -spec win32-msvc -tp vc CEMU_VERSION=%CEMU_VERSION% LIBPNG_APNG_FROM_VCPKG=1 "..\gui\qt\CEmu.pro"'
72-
- msbuild CEmu.vcxproj /p:Configuration=Debug /p:VcpkgTriplet=x86-windows-static
73-
- '%QT5_BIN_DIR_STATIC_32%\qmake -spec win32-msvc -tp vc CEMU_VERSION=%CEMU_VERSION% LIBPNG_APNG_FROM_VCPKG=1 "..\gui\qt\CEmu.pro"'
74-
- msbuild CEmu.vcxproj /p:Configuration=Release /p:VcpkgTriplet=x86-windows-static
75-
- cd ..
76-
77-
- endlocal
78-
79-
- setlocal
80-
81-
- call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64
82-
83-
- cd build_64
84-
- '%QT5_BIN_DIR_DYNAMIC_64%\qmake -spec win32-msvc -tp vc CEMU_VERSION=%CEMU_VERSION% LIBPNG_APNG_FROM_VCPKG=1 "..\gui\qt\CEmu.pro"'
85-
- msbuild CEmu.vcxproj /p:Configuration=Debug /p:Platform="x64"
86-
- '%QT5_BIN_DIR_DYNAMIC_64%\qmake -spec win32-msvc -tp vc CEMU_VERSION=%CEMU_VERSION% LIBPNG_APNG_FROM_VCPKG=1 "..\gui\qt\CEmu.pro"'
87-
- msbuild CEmu.vcxproj /p:Configuration=Release /p:Platform="x64"
88-
- cd ..
89-
90-
- cd build_static_64
91-
- '%QT5_BIN_DIR_STATIC_64%\qmake -spec win32-msvc -tp vc CEMU_VERSION=%CEMU_VERSION% LIBPNG_APNG_FROM_VCPKG=1 "..\gui\qt\CEmu.pro"'
92-
- msbuild CEmu.vcxproj /p:Configuration=Debug /p:Platform="x64" /p:VcpkgTriplet=x64-windows-static
93-
- '%QT5_BIN_DIR_STATIC_64%\qmake -spec win32-msvc -tp vc CEMU_VERSION=%CEMU_VERSION% LIBPNG_APNG_FROM_VCPKG=1 "..\gui\qt\CEmu.pro"'
94-
- msbuild CEmu.vcxproj /p:Configuration=Release /p:Platform="x64" /p:VcpkgTriplet=x64-windows-static
95-
- cd ..
96-
97-
- endlocal
98-
99-
after_build:
100-
- cd %APPVEYOR_BUILD_FOLDER%
101-
- C:\Python35\python -u gui\qt\deploy-scripts\appveyor_helper.py deploy
102-
10354
on_success:
10455
- cd %APPVEYOR_BUILD_FOLDER%
10556
# - C:\Python35\python -u gui\qt\deploy-scripts\build_status.py SUCCESS

0 commit comments

Comments
 (0)