Skip to content

Commit 921bd0a

Browse files
alberthdevalberthdev
committed
appveyor/msvc: bump msvc static Qt version to 5.15.0
 * Update BuildQtDevArchive to be more generalized + configurable + maybe less spaghetti-y (+upload current cfgs) * Update appveyor.yml to use newer libpng install format (microsoft/vcpkg#8622) * Update appveyor_helper to use new Qt 5.15.0 binaries + change path to upload built binaries into CE-Programming/CEmu instead of @alberthdev specific folder
1 parent d0a8e2c commit 921bd0a

File tree

7 files changed

+663
-29
lines changed

7 files changed

+663
-29
lines changed

‎appveyor.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ install:
3535
- vcpkg install libarchive:x64-windows-static --recurse
3636

3737
# Install libpng-apng for all targets
38-
- vcpkg install libpng-apng:x86-windows --recurse
39-
- vcpkg install libpng-apng:x64-windows --recurse
40-
- vcpkg install libpng-apng:x86-windows-static --recurse
41-
- vcpkg install libpng-apng:x64-windows-static --recurse
38+
- vcpkg install libpng[core,apng]:x86-windows --recurse
39+
- vcpkg install libpng[core,apng]:x64-windows --recurse
40+
- vcpkg install libpng[core,apng]:x86-windows-static --recurse
41+
- vcpkg install libpng[core,apng]:x64-windows-static --recurse
4242

4343
- md build_32
4444
- md build_64

‎gui/qt/deploy-scripts/BuildQtDevArchive.py‎

Lines changed: 602 additions & 0 deletions
Large diffs are not rendered by default.

‎gui/qt/deploy-scripts/appveyor_helper.py‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
BINTRAY_SNAPSHOT_SERVER_PATH = "https://oss.jfrog.org/artifactory/oss-snapshot-local"
4343
BINTRAY_RELEASE_SERVER_PATH = "https://oss.jfrog.org/artifactory/oss-release-local"
44-
BINTRAY_MAVEN_GROUP_PATH = "/org/github/alberthdev/cemu/"
44+
BINTRAY_MAVEN_GROUP_PATH = "/org/github/CE-Programming/CEmu/"
4545
MAX_ATTEMPTS = 5
4646
SHA256_STRICT = False
4747

@@ -329,8 +329,8 @@ def dl_and_validate(url):
329329
if check_url(url + ".sha256"):
330330
dlfile(url + ".sha256")
331331
else:
332-
# https://oss.jfrog.org/artifactory/oss-snapshot-local/org/github/alberthdev/cemu/appveyor-qt/Qt5.12.0_Rel_Static_Win32_DevDeploy.7z
333-
# https://oss.jfrog.org/api/storage/oss-snapshot-local/org/github/alberthdev/cemu/appveyor-qt/Qt5.12.0_Rel_Static_Win32_DevDeploy.7z
332+
# https://oss.jfrog.org/artifactory/oss-snapshot-local/org/github/CE-Programming/CEmu/appveyor-qt/Qt5.15.0_Rel_Static_Win32_DevDeploy.7z
333+
# https://oss.jfrog.org/api/storage/oss-snapshot-local/org/github/CE-Programming/CEmu/appveyor-qt/Qt5.15.0_Rel_Static_Win32_DevDeploy.7z
334334
url_parsed = urlparse(url)
335335
if url_parsed.netloc == "oss.jfrog.org" and url_parsed.path.startswith("/artifactory"):
336336
file_info_json_url = url.replace("://oss.jfrog.org/artifactory/", "://oss.jfrog.org/api/storage/")
@@ -395,14 +395,14 @@ def extract(filename):
395395

396396
def install_deps():
397397
print(" * Attempting to download dependencies...")
398-
dl_and_validate('https://oss.jfrog.org/artifactory/oss-snapshot-local/org/github/alberthdev/cemu/appveyor-qt/Qt5.12.0_Rel_Static_Win32_DevDeploy.7z.001')
399-
dl_and_validate('https://oss.jfrog.org/artifactory/oss-snapshot-local/org/github/alberthdev/cemu/appveyor-qt/Qt5.12.0_Rel_Static_Win32_DevDeploy.7z.002')
400-
dl_and_validate('https://oss.jfrog.org/artifactory/oss-snapshot-local/org/github/alberthdev/cemu/appveyor-qt/Qt5.12.0_Rel_Static_Win64_DevDeploy.7z.001')
401-
dl_and_validate('https://oss.jfrog.org/artifactory/oss-snapshot-local/org/github/alberthdev/cemu/appveyor-qt/Qt5.12.0_Rel_Static_Win64_DevDeploy.7z.002')
398+
dl_and_validate('https://oss.jfrog.org/artifactory/oss-snapshot-local/org/github/CE-Programming/CEmu/appveyor-qt/Qt5.15.0_Rel_Static_Win32_DevDeploy.7z.001')
399+
dl_and_validate('https://oss.jfrog.org/artifactory/oss-snapshot-local/org/github/CE-Programming/CEmu/appveyor-qt/Qt5.15.0_Rel_Static_Win32_DevDeploy.7z.002')
400+
dl_and_validate('https://oss.jfrog.org/artifactory/oss-snapshot-local/org/github/CE-Programming/CEmu/appveyor-qt/Qt5.15.0_Rel_Static_Win64_DevDeploy.7z.001')
401+
dl_and_validate('https://oss.jfrog.org/artifactory/oss-snapshot-local/org/github/CE-Programming/CEmu/appveyor-qt/Qt5.15.0_Rel_Static_Win64_DevDeploy.7z.002')
402402

403403
print(" * Attempting to install dependencies...")
404-
extract('Qt5.12.0_Rel_Static_Win32_DevDeploy.7z.001')
405-
extract('Qt5.12.0_Rel_Static_Win64_DevDeploy.7z.001')
404+
extract('Qt5.15.0_Rel_Static_Win32_DevDeploy.7z.001')
405+
extract('Qt5.15.0_Rel_Static_Win64_DevDeploy.7z.001')
406406

407407
print(" * Successfully installed build dependencies!")
408408

@@ -670,36 +670,36 @@ def deploy_snapshots():
670670
# Release
671671
collect_static_main_files("x86 Static", os.path.join("build_static_32", "release"), os.path.join("deploy_static", "release32"),
672672
#extra_wc = {
673-
# "EGL Library" : r"C:\Qt\Qt5.12.0-static\bin\libEGL.dll",
674-
# "GLESv2 Library" : r"C:\Qt\Qt5.12.0-static\bin\libGLESv2.dll",
675-
# "DirectX Compiler Library" : r"C:\Qt\5.12.0\msvc2015\bin\d3dcompiler_*.dll",
676-
# "Mesa OpenGL Software Rendering Library" : r"C:\Qt\5.12.0\msvc2015\bin\opengl32sw.dll",
673+
# "EGL Library" : r"C:\Qt\Qt5.15.0-static\bin\libEGL.dll",
674+
# "GLESv2 Library" : r"C:\Qt\Qt5.15.0-static\bin\libGLESv2.dll",
675+
# "DirectX Compiler Library" : r"C:\Qt\5.15.0\msvc2015\bin\d3dcompiler_*.dll",
676+
# "Mesa OpenGL Software Rendering Library" : r"C:\Qt\5.15.0\msvc2015\bin\opengl32sw.dll",
677677
# }
678678
)
679679
collect_static_main_files("x64 Static", os.path.join("build_static_64", "release"), os.path.join("deploy_static", "release64"),
680680
#extra_wc = {
681-
# "EGL Library" : r"C:\Qt\Qt5.12.0x64-static\bin\libEGL.dll",
682-
# "GLESv2 Library" : r"C:\Qt\Qt5.12.0x64-static\bin\libGLESv2.dll",
683-
# "DirectX Compiler Library" : r"C:\Qt\5.12.0\msvc2015_64\bin\d3dcompiler_*.dll",
684-
# "Mesa OpenGL Software Rendering Library" : r"C:\Qt\5.12.0\msvc2015_64\bin\opengl32sw.dll",
681+
# "EGL Library" : r"C:\Qt\Qt5.15.0x64-static\bin\libEGL.dll",
682+
# "GLESv2 Library" : r"C:\Qt\Qt5.15.0x64-static\bin\libGLESv2.dll",
683+
# "DirectX Compiler Library" : r"C:\Qt\5.15.0\msvc2015_64\bin\d3dcompiler_*.dll",
684+
# "Mesa OpenGL Software Rendering Library" : r"C:\Qt\5.15.0\msvc2015_64\bin\opengl32sw.dll",
685685
# }
686686
)
687687

688688
# Debug
689689
collect_static_main_files("x86 Static Debug", os.path.join("build_static_32", "debug"), os.path.join("deploy_static", "release32_debug"),
690690
#extra_wc = {
691-
# "EGL Library" : r"C:\Qt\Qt5.12.0-static\bin\libEGLd.dll",
692-
# "GLESv2 Library" : r"C:\Qt\Qt5.12.0-static\bin\libGLESv2d.dll",
693-
# "DirectX Compiler Library" : r"C:\Qt\5.12.0\msvc2015\bin\d3dcompiler_*.dll",
694-
# "Mesa OpenGL Software Rendering Library" : r"C:\Qt\5.12.0\msvc2015\bin\opengl32sw.dll",
691+
# "EGL Library" : r"C:\Qt\Qt5.15.0-static\bin\libEGLd.dll",
692+
# "GLESv2 Library" : r"C:\Qt\Qt5.15.0-static\bin\libGLESv2d.dll",
693+
# "DirectX Compiler Library" : r"C:\Qt\5.15.0\msvc2015\bin\d3dcompiler_*.dll",
694+
# "Mesa OpenGL Software Rendering Library" : r"C:\Qt\5.15.0\msvc2015\bin\opengl32sw.dll",
695695
# }
696696
)
697697
collect_static_main_files("x64 Static Debug", os.path.join("build_static_64", "debug"), os.path.join("deploy_static", "release64_debug"),
698698
#extra_wc = {
699-
# "EGL Library" : r"C:\Qt\Qt5.12.0x64-static\bin\libEGLd.dll",
700-
# "GLESv2 Library" : r"C:\Qt\Qt5.12.0x64-static\bin\libGLESv2d.dll",
701-
# "DirectX Compiler Library" : r"C:\Qt\5.12.0\msvc2015_64\bin\d3dcompiler_*.dll",
702-
# "Mesa OpenGL Software Rendering Library" : r"C:\Qt\5.12.0\msvc2015_64\bin\opengl32sw.dll",
699+
# "EGL Library" : r"C:\Qt\Qt5.15.0x64-static\bin\libEGLd.dll",
700+
# "GLESv2 Library" : r"C:\Qt\Qt5.15.0x64-static\bin\libGLESv2d.dll",
701+
# "DirectX Compiler Library" : r"C:\Qt\5.15.0\msvc2015_64\bin\d3dcompiler_*.dll",
702+
# "Mesa OpenGL Software Rendering Library" : r"C:\Qt\5.15.0\msvc2015_64\bin\opengl32sw.dll",
703703
# }
704704
)
705705

‎gui/qt/deploy-scripts/qt_dev_archive.base.cfg‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
fmt = [OUTPUT_ARCHIVE_PREFIX=Qt{qt_version}_Rel_{BUILD_TYPE}_Win{ARCH}, OUTPUT_ARCHIVE_SUFFIX=_DevDeploy, LIBRESSL_VERSION={LIBRESSL_MAJOR_VERSION}.{LIBRESSL_MINOR_VERSION}.{LIBRESSL_PATCH_VERSION}]

‎gui/qt/deploy-scripts/qt_dev_archive.dynold.amd64.cfg‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Example Qt archive config
2+
# This is the older (and no longer used) x64 dynamic 5.12.0 script, translated to the newer config.
3+
fmt = [ARCH=64, QT_ARCH=x64, OUTPUT_ARCHIVE_PREFIX=Qt{qt_version}_Rel_Win{ARCH}, OUTPUT_ARCHIVE_SUFFIX=_DevDeploy, QT_MAJOR_VERSION=5, QT_MINOR_VERSION=12, QT_PATCH_VERSION=0]
4+
5+
# Qt configuration
6+
qt-version = {QT_MAJOR_VERSION}.{QT_MINOR_VERSION}.{QT_PATCH_VERSION}
7+
qt-dir = Qt{qt_version}{QT_ARCH}
8+
qt-lib-dll-subdir = 5.12\msvc2015
9+
10+
# General configuration
11+
output-archive = {OUTPUT_ARCHIVE_PREFIX}{OUTPUT_ARCHIVE_SUFFIX}.7z

‎gui/qt/deploy-scripts/qt_dev_archive.static.amd64.cfg‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Static Qt archive config
2+
fmt = [ARCH=64, QT_ARCH=x64, BUILD_TYPE=Static, OUTPUT_ARCHIVE_PREFIX=Qt{qt_version}_Rel_{BUILD_TYPE}_Win{ARCH}, OUTPUT_ARCHIVE_SUFFIX=_DevDeploy, QT_MAJOR_VERSION=5, QT_MINOR_VERSION=15, QT_PATCH_VERSION=0, LIBRESSL_MAJOR_VERSION=3, LIBRESSL_MINOR_VERSION=1, LIBRESSL_PATCH_VERSION=3, LIBRESSL_VERSION={LIBRESSL_MAJOR_VERSION}.{LIBRESSL_MINOR_VERSION}.{LIBRESSL_PATCH_VERSION}]
3+
4+
# Qt configuration
5+
qt-version = {QT_MAJOR_VERSION}.{QT_MINOR_VERSION}.{QT_PATCH_VERSION}
6+
qt-dir = Qt{qt_version}{QT_ARCH}-static
7+
8+
# General configuration
9+
addl-path = [LibreSSL-{LIBRESSL_VERSION}-win{ARCH}]
10+
output-archive = {OUTPUT_ARCHIVE_PREFIX}{OUTPUT_ARCHIVE_SUFFIX}.7z

‎gui/qt/deploy-scripts/qt_dev_archive.static.x86.cfg‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Static Qt archive config
2+
fmt = [ARCH=32, QT_ARCH=, BUILD_TYPE=Static, OUTPUT_ARCHIVE_PREFIX=Qt{qt_version}_Rel_{BUILD_TYPE}_Win{ARCH}, OUTPUT_ARCHIVE_SUFFIX=_DevDeploy, QT_MAJOR_VERSION=5, QT_MINOR_VERSION=15, QT_PATCH_VERSION=0, LIBRESSL_MAJOR_VERSION=3, LIBRESSL_MINOR_VERSION=1, LIBRESSL_PATCH_VERSION=3, LIBRESSL_VERSION={LIBRESSL_MAJOR_VERSION}.{LIBRESSL_MINOR_VERSION}.{LIBRESSL_PATCH_VERSION}]
3+
4+
# Qt configuration
5+
qt-version = {QT_MAJOR_VERSION}.{QT_MINOR_VERSION}.{QT_PATCH_VERSION}
6+
qt-dir = Qt{qt_version}{QT_ARCH}-static
7+
8+
# General configuration
9+
addl-path = [LibreSSL-{LIBRESSL_VERSION}-win{ARCH}]
10+
output-archive = {OUTPUT_ARCHIVE_PREFIX}{OUTPUT_ARCHIVE_SUFFIX}.7z

0 commit comments

Comments
 (0)