Mirrors/aqtinstall
1
0
Fork 0
mirror of https://github.com/miurahr/aqtinstall.git synced 2025-12-18 05:04:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add msvc2019

Browse Source
This commit is contained in:
Mizux Seiha
2020-05-01 17:26:02 +02:00
parent 84c731c100
commit 8a927e4b09
6 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
README.rst
View File

@@ -20,7 +20,7 @@ Another Qt installer(aqt)
:target: https://github.com/miurahr/aqtinstall/actions?query=workflow%3A%22Test+on+GH+actions+environment%22 :target: https://github.com/miurahr/aqtinstall/actions?query=workflow%3A%22Test+on+GH+actions+environment%22
+--------+-----------+---------+ +--------+-----------+---------+
| Jobs | Mac | Release | | Jobs | Mac | Release |
| | Linux | Status | | | Linux | Status |
| | Windows | | | | Windows | |
| | Mirror | | | | Mirror | |
@@ -80,10 +80,15 @@ General usage looks like this:
* Host is one of: `linux`, `mac`, `windows` * Host is one of: `linux`, `mac`, `windows`
* Target is one of: `desktop`, `android`, `ios` (iOS only works with mac host) * Target is one of: `desktop`, `android`, `ios` (iOS only works with mac host)
* For some platforms you also need to specify an arch: * For some platforms you also need to specify an arch:
* For windows, choose one of: `win64_msvc2017_64`, `win32_msvc2017`, `win64_msvc2015_64`, `win32_msvc2015`, * For windows, choose one of:
`win64_mingw73`, `win32_mingw73`, `win64_mingw53`, `win32_mingw53`, `win64_msvc2017_winrt_x64`, * `win64_msvc2019_64`, `win32_msvc2019`,
`win64_msvc2017_winrt_x86`, `win64_msvc2017_winrt_armv7` * `win64_msvc2017_64`, `win32_msvc2017`,
* For android and Qt 5.13 or below, choose one of: `android_x86_64`, `android_arm64_v8a`, `android_x86`, * `win64_msvc2015_64`, `win32_msvc2015`,
* `win64_mingw73`, `win32_mingw73`,
* `win64_mingw53`, `win32_mingw53`,
* `win64_msvc2019_winrt_x64`, `win64_msvc2019_winrt_x86`, `win64_msvc2019_winrt_armv7`
* `win64_msvc2017_winrt_x64`, `win64_msvc2017_winrt_x86`, `win64_msvc2017_winrt_armv7`
* For android and Qt 5.13 or below, choose one of: `android_x86_64`, `android_arm64_v8a`, `android_x86`,
`android_armv7` `android_armv7`
* You can specify external 7zip command path instead of built-in extractor. * You can specify external 7zip command path instead of built-in extractor.
* When specify all for extra modules option '-m' all extra modules are installed. * When specify all for extra modules option '-m' all extra modules are installed.
@@ -119,7 +124,7 @@ run such as follows:
.. code-block:: bash .. code-block:: bash
C:\> mkdir Qt C:\> mkdir Qt
C:\> aqt install --outputdir c:\Qt 5.11.3 windows desktop win64_msvc2017_64 C:\> aqt install --outputdir c:\Qt 5.11.3 windows desktop win64_msvc2019_64
Example: Installing Qt SDK 5.12.0 for Linux with QtCharts and QtNetworkAuth: Example: Installing Qt SDK 5.12.0 for Linux with QtCharts and QtNetworkAuth:
@@ -148,8 +153,8 @@ Example: Install vcredist:
.. code-block:: bash .. code-block:: bash
C:\ aqt tool windows tools_vcredist 2019-02-13-1 qt.tools.vcredist_msvc2017_x64 C:\ aqt tool windows tools_vcredist 2019-02-13-1 qt.tools.vcredist_msvc2019_x64
C:\ .\Qt\Tools\vcredist\vcredist_msvc2017_x64.exe /norestart /q C:\ .\Qt\Tools\vcredist\vcredist_msvc2019_x64.exe /norestart /q
Example: Install OpenSSL: Example: Install OpenSSL:

10
aqt/cli.py
View File

@@ -191,11 +191,15 @@ class Cli():
install_parser.add_argument('arch', nargs='?', help="\ntarget linux/desktop: gcc_64, wasm_32" install_parser.add_argument('arch', nargs='?', help="\ntarget linux/desktop: gcc_64, wasm_32"
"\ntarget mac/desktop: clang_64, wasm_32" "\ntarget mac/desktop: clang_64, wasm_32"
"\ntarget mac/ios: ios" "\ntarget mac/ios: ios"
"\nwindows/desktop: win64_msvc2017_64, win64_msvc2015_64" "\nwindows/desktop: win64_msvc2019_64, win32_msvc2019"
"\n win32_msvc2015, win32_mingw53" "\n win64_msvc2017_64, win32_msvc2017"
"\n win64_msvc2015_64, win32_msvc2015"
"\n win64_mingw73, win32_mingw73" "\n win64_mingw73, win32_mingw73"
"\n win32_mingw53"
"\n wasm_32" "\n wasm_32"
"\nwindows/winrt: win64_msvc2017_winrt_x64, win64_msvc2017_winrt_x86" "\nwindows/winrt: win64_msvc2019_winrt_x64, win64_msvc2019_winrt_x86"
"\n win64_msvc2017_winrt_x64, win64_msvc2017_winrt_x86"
"\n win64_msvc2019_winrt_armv7"
"\n win64_msvc2017_winrt_armv7" "\n win64_msvc2017_winrt_armv7"
"\nandroid: Qt 5.14: android (optional)" "\nandroid: Qt 5.14: android (optional)"
"\n Qt 5.13 or below: android_x86_64, android_arm64_v8a" "\n Qt 5.13 or below: android_x86_64, android_arm64_v8a"

7
aqt/combinations.json
View File

@@ -9,6 +9,8 @@
{"os_name": "mac", "target": "desktop", "arch": "clang_64"}, {"os_name": "mac", "target": "desktop", "arch": "clang_64"},
{"os_name": "mac", "target": "desktop", "arch": "wasm_32"}, {"os_name": "mac", "target": "desktop", "arch": "wasm_32"},
{"os_name": "mac", "target": "ios", "arch": "ios"}, {"os_name": "mac", "target": "ios", "arch": "ios"},
{"os_name": "windows", "target": "desktop", "arch": "win64_msvc2019_64"},
{"os_name": "windows", "target": "desktop", "arch": "win32_msvc2019"},
{"os_name": "windows", "target": "desktop", "arch": "win64_msvc2017_64"}, {"os_name": "windows", "target": "desktop", "arch": "win64_msvc2017_64"},
{"os_name": "windows", "target": "desktop", "arch": "win32_msvc2017"}, {"os_name": "windows", "target": "desktop", "arch": "win32_msvc2017"},
{"os_name": "windows", "target": "desktop", "arch": "win64_msvc2015_64"}, {"os_name": "windows", "target": "desktop", "arch": "win64_msvc2015_64"},
@@ -17,6 +19,9 @@
{"os_name": "windows", "target": "desktop", "arch": "win32_mingw73"}, {"os_name": "windows", "target": "desktop", "arch": "win32_mingw73"},
{"os_name": "windows", "target": "desktop", "arch": "win64_mingw53"}, {"os_name": "windows", "target": "desktop", "arch": "win64_mingw53"},
{"os_name": "windows", "target": "desktop", "arch": "win32_mingw53"}, {"os_name": "windows", "target": "desktop", "arch": "win32_mingw53"},
{"os_name": "windows", "target": "winrt", "arch": "win64_msvc2019_winrt_x64"},
{"os_name": "windows", "target": "winrt", "arch": "win64_msvc2019_winrt_x86"},
{"os_name": "windows", "target": "winrt", "arch": "win64_msvc2019_winrt_armv7"},
{"os_name": "windows", "target": "winrt", "arch": "win64_msvc2017_winrt_x64"}, {"os_name": "windows", "target": "winrt", "arch": "win64_msvc2017_winrt_x64"},
{"os_name": "windows", "target": "winrt", "arch": "win64_msvc2017_winrt_x86"}, {"os_name": "windows", "target": "winrt", "arch": "win64_msvc2017_winrt_x86"},
{"os_name": "windows", "target": "winrt", "arch": "win64_msvc2017_winrt_armv7"}, {"os_name": "windows", "target": "winrt", "arch": "win64_msvc2017_winrt_armv7"},
@@ -45,6 +50,8 @@
{"os_name": "mac", "target": "desktop", "tool_name": "tools_telemetry", "arch": "qt.tools.qtcreator.telemetry"}, {"os_name": "mac", "target": "desktop", "tool_name": "tools_telemetry", "arch": "qt.tools.qtcreator.telemetry"},
{"os_name": "windows", "target": "desktop", "tool_name": "tools_openssl_x64", "arch": "qt.tools.openssl.win_x64"}, {"os_name": "windows", "target": "desktop", "tool_name": "tools_openssl_x64", "arch": "qt.tools.openssl.win_x64"},
{"os_name": "windows", "target": "desktop", "tool_name": "tools_openssl_x86", "arch": "qt.tools.openssl.win_x86"}, {"os_name": "windows", "target": "desktop", "tool_name": "tools_openssl_x86", "arch": "qt.tools.openssl.win_x86"},
{"os_name": "windows", "target": "desktop", "tool_name": "tools_vcredist", "arch": "qt.tools.vcredist_msvc2019_x64"},
{"os_name": "windows", "target": "desktop", "tool_name": "tools_vcredist", "arch": "qt.tools.vcredist_msvc2019_x86"},
{"os_name": "windows", "target": "desktop", "tool_name": "tools_vcredist", "arch": "qt.tools.vcredist_msvc2017_x64"}, {"os_name": "windows", "target": "desktop", "tool_name": "tools_vcredist", "arch": "qt.tools.vcredist_msvc2017_x64"},
{"os_name": "windows", "target": "desktop", "tool_name": "tools_vcredist", "arch": "qt.tools.vcredist_msvc2017_x86"}, {"os_name": "windows", "target": "desktop", "tool_name": "tools_vcredist", "arch": "qt.tools.vcredist_msvc2017_x86"},
{"os_name": "windows", "target": "desktop", "tool_name": "tools_vcredist", "arch": "qt.tools.vcredist_msvc2015_x64"}, {"os_name": "windows", "target": "desktop", "tool_name": "tools_vcredist", "arch": "qt.tools.vcredist_msvc2015_x64"},

9
ci/generate_azure_pipelines_matrices.py
View File

@@ -72,6 +72,8 @@ mac_build_jobs.append(
# Windows Desktop # Windows Desktop
windows_build_jobs.extend( windows_build_jobs.extend(
[ [
BuildJob('5.12.6', 'windows', 'desktop', 'win64_msvc2019_64', 'msvc2019_64'),
BuildJob('5.12.6', 'windows', 'desktop', 'win32_msvc2019', 'msvc2019'),
BuildJob('5.12.6', 'windows', 'desktop', 'win64_msvc2017_64', 'msvc2017_64'), BuildJob('5.12.6', 'windows', 'desktop', 'win64_msvc2017_64', 'msvc2017_64'),
BuildJob('5.12.6', 'windows', 'desktop', 'win32_msvc2017', 'msvc2017'), BuildJob('5.12.6', 'windows', 'desktop', 'win32_msvc2017', 'msvc2017'),
] ]
@@ -84,6 +86,7 @@ windows_build_jobs.append(
windows_build_jobs.extend( windows_build_jobs.extend(
[ [
BuildJob('5.13.2', 'windows', 'desktop', 'win64_msvc2019_64', 'msvc2019_64'),
BuildJob('5.13.2', 'windows', 'desktop', 'win64_msvc2017_64', 'msvc2017_64'), BuildJob('5.13.2', 'windows', 'desktop', 'win64_msvc2017_64', 'msvc2017_64'),
BuildJob('5.13.2', 'windows', 'desktop', 'win64_msvc2015_64', 'msvc2015_64'), BuildJob('5.13.2', 'windows', 'desktop', 'win64_msvc2015_64', 'msvc2015_64'),
BuildJob('5.13.2', 'windows', 'desktop', 'win64_mingw73', 'mingw73_64'), BuildJob('5.13.2', 'windows', 'desktop', 'win64_mingw73', 'mingw73_64'),
@@ -94,7 +97,10 @@ windows_build_jobs.extend(
windows_build_jobs.extend( windows_build_jobs.extend(
[ [
BuildJob('5.14.0', 'windows', 'desktop', 'win64_msvc2019_64', 'msvc2019_64'),
BuildJob('5.14.0', 'windows', 'desktop', 'win64_msvc2017_64', 'msvc2017_64'),
BuildJob('5.14.0', 'windows', 'desktop', 'win64_msvc2015_64', 'msvc2015_64'), BuildJob('5.14.0', 'windows', 'desktop', 'win64_msvc2015_64', 'msvc2015_64'),
BuildJob('5.14.0', 'windows', 'desktop', 'win32_msvc2019', 'msvc2019'),
BuildJob('5.14.0', 'windows', 'desktop', 'win32_msvc2017', 'msvc2017'), BuildJob('5.14.0', 'windows', 'desktop', 'win32_msvc2017', 'msvc2017'),
] ]
) )
@@ -123,7 +129,10 @@ mac_build_jobs.append(
BuildJob('5.13.2', 'mac', 'desktop', 'clang_64', 'clang_64', module='qcharts qtnetworkauth') BuildJob('5.13.2', 'mac', 'desktop', 'clang_64', 'clang_64', module='qcharts qtnetworkauth')
) )
windows_build_jobs.append( windows_build_jobs.append(
BuildJob('5.13.2', 'windows', 'desktop', 'win64_msvc2019_64', 'msvc2019_64', module='qcharts qtnetworkauth')
BuildJob('5.13.2', 'windows', 'desktop', 'win64_msvc2017_64', 'msvc2017_64', module='qcharts qtnetworkauth') BuildJob('5.13.2', 'windows', 'desktop', 'win64_msvc2017_64', 'msvc2017_64', module='qcharts qtnetworkauth')
BuildJob('5.14.0', 'windows', 'desktop', 'win64_msvc2019_64', 'msvc2019_64', module='qcharts qtnetworkauth')
BuildJob('5.14.0', 'windows', 'desktop', 'win64_msvc2017_64', 'msvc2017_64', module='qcharts qtnetworkauth')
) )

4
ci/steps.yml
View File

@@ -110,7 +110,9 @@ steps:
} else { } else {
echo '##vso[task.setvariable variable=ARCHITECTURE]x86' echo '##vso[task.setvariable variable=ARCHITECTURE]x86'
} }
if ('$(ARCH)' -like '*msvc2017*') { if ('$(ARCH)' -like '*msvc2019*') {
echo '##vso[task.setvariable variable=VSVER]2019'
} elseif ('$(ARCH)' -like '*msvc2017*') {
echo '##vso[task.setvariable variable=VSVER]2017' echo '##vso[task.setvariable variable=VSVER]2017'
} else { } else {
echo '##vso[task.setvariable variable=VSVER]2015' echo '##vso[task.setvariable variable=VSVER]2015'

2
docs/cli.rst
View File

@@ -39,7 +39,7 @@ long options may be truncated to the shortest unambiguous abbreviation.
* clang_64 for mac desktip * clang_64 for mac desktip
* win64_msvc2017_64, win64_msvc2015_64, in32_msvc2015, win32_mingw53 for windows desktop * win64_msvc2019_64, win64_msvc2017_64, win64_msvc2015_64, in32_msvc2015, win32_mingw53 for windows desktop
* android_x86, android_armv7 for android * android_x86, android_armv7 for android