Merge pull request #3994 from offhub/qt-5.15.14-openssl-3.3.1
Qt 5.15.14 with OpenSSL 3.3.1
This commit is contained in:
DavidXanatos
GitHub
commit
7d600fef89
|
|
@ -66,6 +66,19 @@ on:
|
|||
- '**/AUTHORS'
|
||||
- '**/COPYING'
|
||||
|
||||
env:
|
||||
qt_version: 5.15.14
|
||||
qt6_version: 6.3.1
|
||||
openssl_version: 3.3.1
|
||||
ghSsl_user: offhub # DavidXanatos
|
||||
ghSsl_repo: openssl
|
||||
ghQt6Win7_user: DavidXanatos
|
||||
ghQt6Win7_repo: qtbase
|
||||
ghQtBuilds_user: offhub # xanasoft
|
||||
ghQtBuilds_repo: qt-sbie-builds # qt-builds
|
||||
ghQtBuilds_hash_x86: 1E22E6D81AF478FD52AE5F0F465523CE042325127556B57E6731802D03C04622 # 79755f2bf95d0ca305096fc33582cd557345a79aa63f9821002fdddefdc0fd94
|
||||
ghQtBuilds_hash_x64: 5764FE462D99ADA5871E9D87DCBEA36D40733978C9F9E91E2F9F4D921412DC3B # f9029e02badd6a79d9bb092f9fb0772214dbcf8cd0122422514291d755860c37
|
||||
|
||||
jobs:
|
||||
Build_x64:
|
||||
runs-on: windows-2019
|
||||
|
|
@ -73,7 +86,7 @@ jobs:
|
|||
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
uses: actions/checkout@v4.1.5
|
||||
|
||||
- name: Setup msbuild
|
||||
uses: microsoft/setup-msbuild@v2
|
||||
|
|
@ -93,7 +106,7 @@ jobs:
|
|||
#
|
||||
|
||||
# - name: Install Qt6 x64
|
||||
# uses: jurplel/install-qt-action@v3
|
||||
# uses: jurplel/install-qt-action@v4.0.0
|
||||
# with:
|
||||
# # version: '6.2.4'
|
||||
# version: '6.3.1'
|
||||
|
|
@ -104,7 +117,7 @@ jobs:
|
|||
# cache: true
|
||||
|
||||
- name: Install Qt5 x64
|
||||
run: SandboxiePlus\install_qt.cmd x64
|
||||
run: SandboxiePlus\install_qt.cmd x64 ${{ env.qt_version }} ${{ env.qt6_version }} ${{ env.ghQtBuilds_user }} ${{ env.ghQtBuilds_repo }} ${{ env.ghQtBuilds_hash_x86 }} ${{ env.ghQtBuilds_hash_x64 }}
|
||||
|
||||
- name: Installing Jom
|
||||
# if: steps.cache-qt.outputs.cache-hit != 'true'
|
||||
|
|
@ -115,7 +128,7 @@ jobs:
|
|||
#
|
||||
|
||||
- name: Build Sandboxie-Plus x64
|
||||
run: SandboxiePlus\qmake_plus.cmd x64
|
||||
run: SandboxiePlus\qmake_plus.cmd x64 ${{ env.qt_version }} ${{ env.qt6_version }}
|
||||
|
||||
- name: Build SbieShell x64
|
||||
run: msbuild /t:restore,build -p:RestorePackagesConfig=true SandboxiePlus\SbieShell\SbieShell.sln /p:Configuration="Release" /p:Platform=x64
|
||||
|
|
@ -132,26 +145,26 @@ jobs:
|
|||
#
|
||||
|
||||
# - name: Add Windows 7 compatible Qt6 DLLs
|
||||
# run: Installer\fix_qt6_win7.cmd
|
||||
# run: Installer\fix_qt6_win7.cmd ${{ env.qt6_version }} ${{ env.ghQt6Win7_user }} ${{ env.ghQt6Win7_repo }}
|
||||
|
||||
- name: Add missing languages for Qt5 (issue 1528)
|
||||
run: Installer\fix_qt5_languages.cmd x64
|
||||
run: Installer\fix_qt5_languages.cmd x64 ${{ env.qt_version }} ${{ env.qt6_version }}
|
||||
|
||||
- name: Get openssl binaries
|
||||
run: Installer\get_openssl.cmd
|
||||
run: Installer\get_openssl.cmd ${{ env.openssl_version }} ${{ env.ghSsl_user }} ${{ env.ghSsl_repo }}
|
||||
|
||||
- name: Get 7z binaries
|
||||
run: Installer\get_7zip.cmd
|
||||
|
||||
- name: Merging Build
|
||||
run: Installer\copy_build.cmd x64
|
||||
run: Installer\copy_build.cmd x64 ${{ env.qt_version }} ${{ env.qt6_version }} ${{ env.openssl_version }}
|
||||
|
||||
- name: Collect installer assets
|
||||
run: Installer\get_assets.cmd
|
||||
|
||||
- name: Upload installer assets
|
||||
if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
|
||||
uses: actions/upload-artifact@v4
|
||||
#if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
|
||||
uses: actions/upload-artifact@v4.3.3
|
||||
with:
|
||||
name: Assets
|
||||
path: |
|
||||
|
|
@ -159,8 +172,8 @@ jobs:
|
|||
retention-days: 60
|
||||
|
||||
- name: Upload Sandboxie x64
|
||||
if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
|
||||
uses: actions/upload-artifact@v4
|
||||
#if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
|
||||
uses: actions/upload-artifact@v4.3.3
|
||||
with:
|
||||
name: Sandboxie_x64
|
||||
path: |
|
||||
|
|
@ -174,7 +187,7 @@ jobs:
|
|||
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
uses: actions/checkout@v4.1.5
|
||||
|
||||
- name: Setup msbuild
|
||||
uses: microsoft/setup-msbuild@v2
|
||||
|
|
@ -197,10 +210,10 @@ jobs:
|
|||
#
|
||||
|
||||
- name: Install Qt6 x64
|
||||
uses: jurplel/install-qt-action@v3
|
||||
uses: jurplel/install-qt-action@v4.0.0
|
||||
with:
|
||||
# version: '6.2.4'
|
||||
version: '6.3.1'
|
||||
version: '${{ env.qt6_version }}'
|
||||
# dir: ..
|
||||
# arch: ${{ matrix.qt-target }}
|
||||
arch: 'win64_msvc2019_64'
|
||||
|
|
@ -208,10 +221,10 @@ jobs:
|
|||
cache: true
|
||||
|
||||
- name: Install Qt6 ARM64
|
||||
uses: jurplel/install-qt-action@v3
|
||||
uses: jurplel/install-qt-action@v4.0.0
|
||||
with:
|
||||
# version: '6.2.4'
|
||||
version: '6.3.1'
|
||||
version: '${{ env.qt6_version }}'
|
||||
# dir: ..
|
||||
# arch: ${{ matrix.qt-target }}
|
||||
arch: 'win64_msvc2019_arm64'
|
||||
|
|
@ -227,7 +240,7 @@ jobs:
|
|||
#
|
||||
|
||||
- name: Build Sandboxie-Plus ARM64
|
||||
run: SandboxiePlus\qmake_plus.cmd ARM64
|
||||
run: SandboxiePlus\qmake_plus.cmd ARM64 ${{ env.qt_version }} ${{ env.qt6_version }}
|
||||
|
||||
- name: Build SbieShell ARM64
|
||||
run: msbuild /t:restore,build -p:RestorePackagesConfig=true SandboxiePlus\SbieShell\SbieShell.sln /p:Configuration="Release" /p:Platform=ARM64
|
||||
|
|
@ -244,17 +257,17 @@ jobs:
|
|||
#
|
||||
|
||||
- name: Get openssl binaries
|
||||
run: Installer\get_openssl.cmd
|
||||
run: Installer\get_openssl.cmd ${{ env.openssl_version }} ${{ env.ghSsl_user }} ${{ env.ghSsl_repo }}
|
||||
|
||||
- name: Get 7z binaries
|
||||
run: Installer\get_7zip.cmd
|
||||
|
||||
- name: Merging Build
|
||||
run: Installer\copy_build.cmd ARM64
|
||||
run: Installer\copy_build.cmd ARM64 ${{ env.qt_version }} ${{ env.qt6_version }} ${{ env.openssl_version }}
|
||||
|
||||
- name: Upload Sandboxie ARM64
|
||||
if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
|
||||
uses: actions/upload-artifact@v4
|
||||
#if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
|
||||
uses: actions/upload-artifact@v4.3.3
|
||||
with:
|
||||
name: Sandboxie_ARM64
|
||||
path: |
|
||||
|
|
@ -268,7 +281,7 @@ jobs:
|
|||
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
uses: actions/checkout@v4.1.5
|
||||
|
||||
- name: Setup msbuild
|
||||
uses: microsoft/setup-msbuild@v2
|
||||
|
|
@ -285,7 +298,7 @@ jobs:
|
|||
#
|
||||
|
||||
- name: Install Qt5 x86
|
||||
run: SandboxiePlus\install_qt.cmd Win32
|
||||
run: SandboxiePlus\install_qt.cmd Win32 ${{ env.qt_version }} ${{ env.qt6_version }} ${{ env.ghQtBuilds_user }} ${{ env.ghQtBuilds_repo }} ${{ env.ghQtBuilds_hash_x86 }} ${{ env.ghQtBuilds_hash_x64 }}
|
||||
|
||||
- name: Installing Jom
|
||||
# if: steps.cache-qt.outputs.cache-hit != 'true'
|
||||
|
|
@ -296,7 +309,7 @@ jobs:
|
|||
#
|
||||
|
||||
- name: Build Sandboxie-Plus x86
|
||||
run: SandboxiePlus\qmake_plus.cmd Win32
|
||||
run: SandboxiePlus\qmake_plus.cmd Win32 ${{ env.qt_version }} ${{ env.qt6_version }}
|
||||
|
||||
#
|
||||
# Compile Sandboxie Tools
|
||||
|
|
@ -310,20 +323,20 @@ jobs:
|
|||
#
|
||||
|
||||
- name: Add missing languages for Qt5 (issue 1528)
|
||||
run: Installer\fix_qt5_languages.cmd Win32
|
||||
run: Installer\fix_qt5_languages.cmd Win32 ${{ env.qt_version }} ${{ env.qt6_version }}
|
||||
|
||||
- name: Get openssl binaries
|
||||
run: Installer\get_openssl.cmd
|
||||
run: Installer\get_openssl.cmd ${{ env.openssl_version }} ${{ env.ghSsl_user }} ${{ env.ghSsl_repo }}
|
||||
|
||||
- name: Get 7z binaries
|
||||
run: Installer\get_7zip.cmd
|
||||
|
||||
- name: Merging Build
|
||||
run: Installer\copy_build.cmd x86
|
||||
run: Installer\copy_build.cmd x86 ${{ env.qt_version }} ${{ env.qt6_version }} ${{ env.openssl_version }}
|
||||
|
||||
- name: Upload Sandboxie x86
|
||||
if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
|
||||
uses: actions/upload-artifact@v4
|
||||
#if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
|
||||
uses: actions/upload-artifact@v4.3.3
|
||||
with:
|
||||
name: Sandboxie_x86
|
||||
path: |
|
||||
|
|
|
|||
|
|
@ -1,22 +1,29 @@
|
|||
REM @ECHO OFF
|
||||
|
||||
echo %*
|
||||
IF "%~4" == "" ( set "openssl_version=3.3.1" ) ELSE ( set "openssl_version=%~4" )
|
||||
IF "%~3" == "" ( set "qt6_version=6.3.1" ) ELSE ( set "qt6_version=%~3" )
|
||||
IF "%~2" == "" ( set "qt_version=5.15.14" ) ELSE ( set "qt_version=%~2" )
|
||||
|
||||
IF "%openssl_version:~0,3%" == "1.1" ( set "sslMajorVersion=1_1" ) ELSE ( set "sslMajorVersion=3" )
|
||||
|
||||
IF %1 == x86 (
|
||||
set archPath=Win32
|
||||
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars32.bat"
|
||||
set qtPath=%~dp0..\..\Qt\5.15.13\msvc2019
|
||||
set qtPath=%~dp0..\..\Qt\%qt_version%\msvc2019
|
||||
set instPath=%~dp0\SbiePlus_x86
|
||||
)
|
||||
IF %1 == x64 (
|
||||
set archPath=x64
|
||||
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
|
||||
REM set qtPath=%~dp0..\..\Qt\6.3.1\msvc2019_64
|
||||
set qtPath=%~dp0..\..\Qt\5.15.13\msvc2019_64
|
||||
REM set qtPath=%~dp0..\..\Qt\%qt6_version%\msvc2019_64
|
||||
set qtPath=%~dp0..\..\Qt\%qt_version%\msvc2019_64
|
||||
set instPath=%~dp0\SbiePlus_x64
|
||||
)
|
||||
IF %1 == ARM64 (
|
||||
set archPath=ARM64
|
||||
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsamd64_arm64.bat"
|
||||
set qtPath=%~dp0..\..\Qt\6.3.1\msvc2019_arm64
|
||||
set qtPath=%~dp0..\..\Qt\%qt6_version%\msvc2019_arm64
|
||||
set instPath=%~dp0\SbiePlus_a64
|
||||
)
|
||||
set redistPath=%VCToolsRedistDir%\%1\Microsoft.VC142.CRT
|
||||
|
|
@ -72,12 +79,12 @@ copy %qtPath%\plugins\tls\qopensslbackend.dll %instPath%\tls\
|
|||
|
||||
ECHO Copying OpenSSL libraries
|
||||
IF %archPath% == Win32 (
|
||||
copy /y %~dp0OpenSSL\Win_x86\bin\libssl-1_1.dll %instPath%\
|
||||
copy /y %~dp0OpenSSL\Win_x86\bin\libcrypto-1_1.dll %instPath%\
|
||||
copy /y %~dp0OpenSSL\Win_x86\bin\libssl-%sslMajorVersion%.dll %instPath%\
|
||||
copy /y %~dp0OpenSSL\Win_x86\bin\libcrypto-%sslMajorVersion%.dll %instPath%\
|
||||
)
|
||||
IF NOT %archPath% == Win32 (
|
||||
copy /y %~dp0OpenSSL\Win_%archPath%\bin\libssl-1_1-%archPath%.dll %instPath%\
|
||||
copy /y %~dp0OpenSSL\Win_%archPath%\bin\libcrypto-1_1-%archPath%.dll %instPath%\
|
||||
copy /y %~dp0OpenSSL\Win_%archPath%\bin\libssl-%sslMajorVersion%-%archPath%.dll %instPath%\
|
||||
copy /y %~dp0OpenSSL\Win_%archPath%\bin\libcrypto-%sslMajorVersion%-%archPath%.dll %instPath%\
|
||||
)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,14 @@
|
|||
if %1 == x64 if exist %~dp0..\..\Qt\5.15.13\msvc2019_64\bin\lrelease.exe set PATH=%PATH%;%~dp0..\..\Qt\5.15.13\msvc2019_64\bin\
|
||||
if %1 == Win32 if exist %~dp0..\..\Qt\5.15.13\msvc2019\bin\lrelease.exe set PATH=%PATH%;%~dp0..\..\Qt\5.15.13\msvc2019\bin\
|
||||
echo %*
|
||||
IF "%~3" == "" ( set "qt6_version=6.3.1" ) ELSE ( set "qt6_version=%~3" )
|
||||
IF "%~2" == "" ( set "qt_version=5.15.14" ) ELSE ( set "qt_version=%~2" )
|
||||
|
||||
if %1 == x64 if exist %~dp0..\..\Qt\%qt_version%\msvc2019_64\bin\lrelease.exe set PATH=%PATH%;%~dp0..\..\Qt\%qt_version%\msvc2019_64\bin\
|
||||
if %1 == Win32 if exist %~dp0..\..\Qt\%qt_version%\msvc2019\bin\lrelease.exe set PATH=%PATH%;%~dp0..\..\Qt\%qt_version%\msvc2019\bin\
|
||||
mkdir %~dp0qttranslations
|
||||
mkdir %~dp0qttranslations\ts
|
||||
mkdir %~dp0qttranslations\qm
|
||||
set fileName=qttranslations-everywhere-src-6.3.1.zip
|
||||
set downloadUrl=https://download.qt.io/archive/qt/6.3/6.3.1/submodules/%filename%
|
||||
set fileName=qttranslations-everywhere-src-%qt6_version%.zip
|
||||
set downloadUrl=https://download.qt.io/archive/qt/%qt6_version:~0,3%/%qt6_version%/submodules/%filename%
|
||||
curl -LsSO --output-dir %~dp0qttranslations\ %downloadUrl%
|
||||
"C:\Program Files\7-Zip\7z.exe" e -i!*\translations\qt_*.ts -i!*\translations\qtbase_*.ts -i!*\translations\qtmultimedia_*.ts %~dp0qttranslations\%filename% -bd -o%~dp0qttranslations\ts\
|
||||
for %%a in (%~dp0qttranslations\ts\*.ts) do (lrelease.exe -silent %%a -qm %~dp0qttranslations\qm\%%~na.qm)
|
||||
|
|
|
|||
|
|
@ -1,2 +1,7 @@
|
|||
curl --ssl-no-revoke -L https://github.com/DavidXanatos/qtbase/releases/download/v6.3.1-w7/Qt6.3.1-w7.zip -o %~dp0..\..\Qt6.3.1-w7.zip
|
||||
"C:\Program Files\7-Zip\7z.exe" x -o%~dp0..\..\Qt\6.3.1\msvc2019_64\ %~dp0..\..\Qt6.3.1-w7.zip -y
|
||||
echo %*
|
||||
IF "%~3" == "" ( set "ghQt6Win7_repo=qtbase" ) ELSE ( set "ghQt6Win7_repo=%~3" )
|
||||
IF "%~2" == "" ( set "ghQt6Win7_user=DavidXanatos" ) ELSE ( set "ghQt6Win7_user=%~2" )
|
||||
IF "%~1" == "" ( set "qt6_version=6.3.1" ) ELSE ( set "qt6_version=%~1" )
|
||||
|
||||
curl --ssl-no-revoke -L https://github.com/%ghQt6Win7_user%/%ghQt6Win7_repo%/releases/download/v%qt6_version%-w7/Qt%qt6_version%-w7.zip -o %~dp0..\..\Qt%qt6_version%-w7.zip
|
||||
"C:\Program Files\7-Zip\7z.exe" x -o%~dp0..\..\Qt\%qt6_version%\msvc2019_64\ %~dp0..\..\Qt%qt6_version%-w7.zip -y
|
||||
|
|
|
|||
|
|
@ -1,6 +1,44 @@
|
|||
set version=1_1_1p
|
||||
echo %*
|
||||
IF "%~3" == "" ( set "ghSsl_repo=openssl" ) ELSE ( set "ghSsl_repo=%~3" )
|
||||
IF "%~2" == "" ( set "ghSsl_user=DavidXanatos" ) ELSE ( set "ghSsl_user=%~2" )
|
||||
IF "%~1" == "" ( set "openssl_version=3.3.1" ) ELSE ( set "openssl_version=%~1" )
|
||||
|
||||
set "openssl_version_underscore=%openssl_version:.=_%"
|
||||
|
||||
mkdir %~dp0\OpenSSL
|
||||
curl -L --url https://github.com/DavidXanatos/openssl/releases/download/OpenSSL_%version%/OpenSSL-%version%.zip -o %~dp0\OpenSSL\OpenSSL-%version%.zip --ssl-no-revoke
|
||||
"C:\Program Files\7-Zip\7z.exe" x -bd -o%~dp0\OpenSSL\ %~dp0\OpenSSL\OpenSSL-%version%.zip
|
||||
|
||||
rem https://github.com/<repo>/openssl/releases/download/OpenSSL_1_1_1p/OpenSSL-1_1_1p.zip
|
||||
rem https://github.com/<repo>/openssl/releases/download/openssl-3.3.0/openssl-3.3.0.zip
|
||||
curl -L -f --url https://github.com/%ghSsl_user%/%ghSsl_repo%/releases/download/OpenSSL_%openssl_version_underscore%/OpenSSL-%openssl_version_underscore%.zip -o %~dp0\OpenSSL\OpenSSL-%openssl_version%.zip --ssl-no-revoke
|
||||
IF %ERRORLEVEL% EQU 0 goto done
|
||||
curl -L -f --url https://github.com/%ghSsl_user%/%ghSsl_repo%/releases/download/openssl-%openssl_version%/openssl-%openssl_version%.zip -o %~dp0\OpenSSL\OpenSSL-%openssl_version%.zip --ssl-no-revoke
|
||||
IF %ERRORLEVEL% EQU 0 goto done
|
||||
|
||||
:urlfallback
|
||||
setlocal enabledelayedexpansion
|
||||
set "opensslFolders=openssl- openssl_ OpenSSL- OpenSSL_"
|
||||
set "opensslFiles=openssl- openssl_ OpenSSL- OpenSSL_"
|
||||
set "opensslVersions=%openssl_version% %openssl_version_underscore%"
|
||||
for %%i in (%opensslFolders%) do (
|
||||
echo 1=%%i
|
||||
for %%j in (%opensslFiles%) do (
|
||||
echo 2=%%j
|
||||
for %%k in (%opensslVersions%) do (
|
||||
echo 3=%%k
|
||||
for %%l in (%opensslVersions%) do (
|
||||
echo 4=%%l
|
||||
timeout 2 >nul
|
||||
curl -L -f --url https://github.com/%ghSsl_user%/%ghSsl_repo%/releases/download/%%i%%k/%%j%%l.zip -o %~dp0\OpenSSL\OpenSSL-%openssl_version%.zip --ssl-no-revoke
|
||||
IF !ERRORLEVEL! EQU 0 goto done
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
echo No valid URL found.
|
||||
if %ERRORLEVEL% NEQ 0 exit /b 404
|
||||
endlocal
|
||||
|
||||
:done
|
||||
|
||||
"C:\Program Files\7-Zip\7z.exe" x -bd -o%~dp0\OpenSSL\ %~dp0\OpenSSL\OpenSSL-%openssl_version%.zip
|
||||
|
||||
|
|
|
|||
|
|
@ -1,16 +1,24 @@
|
|||
if %1 == Win32 (
|
||||
if exist %~dp0..\..\Qt\5.15.13\msvc2019\bin\qmake.exe goto done
|
||||
echo %*
|
||||
IF "%~7" == "" ( set "ghQtBuilds_hash_x64=f9029e02badd6a79d9bb092f9fb0772214dbcf8cd0122422514291d755860c37" ) ELSE ( set "ghQtBuilds_hash_x64=%~7" )
|
||||
IF "%~6" == "" ( set "ghQtBuilds_hash_x86=79755f2bf95d0ca305096fc33582cd557345a79aa63f9821002fdddefdc0fd94" ) ELSE ( set "ghQtBuilds_hash_x86=%~6" )
|
||||
IF "%~5" == "" ( set "ghQtBuilds_repo=qt-builds" ) ELSE ( set "ghQtBuilds_repo=%~5" )
|
||||
IF "%~4" == "" ( set "ghQtBuilds_user=xanasoft" ) ELSE ( set "ghQtBuilds_user=%~4" )
|
||||
IF "%~3" == "" ( set "qt6_version=6.3.1" ) ELSE ( set "qt6_version=%~3" )
|
||||
IF "%~2" == "" ( set "qt_version=5.15.14" ) ELSE ( set "qt_version=%~2" )
|
||||
|
||||
curl -LsSO --output-dir %~dp0..\..\ https://github.com/xanasoft/qt-builds/releases/download/v5.15.13-ssl-lgpl/qt-everywhere-5.15.13-Windows_10-MSVC2019-x86.7z
|
||||
"C:\Program Files\7-Zip\7z.exe" x -aoa -o%~dp0..\..\Qt\ %~dp0..\..\qt-everywhere-5.15.13-Windows_10-MSVC2019-x86.7z
|
||||
certutil -hashfile %~dp0..\..\qt-everywhere-5.15.13-Windows_10-MSVC2019-x86.7z SHA256 | find /i "79755f2bf95d0ca305096fc33582cd557345a79aa63f9821002fdddefdc0fd94"
|
||||
if %1 == Win32 (
|
||||
if exist %~dp0..\..\Qt\%qt_version%\msvc2019\bin\qmake.exe goto done
|
||||
|
||||
curl -LsSO --output-dir %~dp0..\..\ https://github.com/%ghQtBuilds_user%/%ghQtBuilds_repo%/releases/download/v%qt_version%-ssl-lgpl/qt-everywhere-%qt_version%-Windows_10-MSVC2019-x86.7z
|
||||
"C:\Program Files\7-Zip\7z.exe" x -aoa -o%~dp0..\..\Qt\ %~dp0..\..\qt-everywhere-%qt_version%-Windows_10-MSVC2019-x86.7z
|
||||
certutil -hashfile %~dp0..\..\qt-everywhere-%qt_version%-Windows_10-MSVC2019-x86.7z SHA256 | find /i "%ghQtBuilds_hash_x86%"
|
||||
)
|
||||
if %1 == x64 (
|
||||
if exist %~dp0..\..\Qt\5.15.13\msvc2019_64\bin\qmake.exe goto done
|
||||
if exist %~dp0..\..\Qt\%qt_version%\msvc2019_64\bin\qmake.exe goto done
|
||||
|
||||
curl -LsSO --output-dir %~dp0..\..\ https://github.com/xanasoft/qt-builds/releases/download/v5.15.13-ssl-lgpl/qt-everywhere-5.15.13-Windows_10-MSVC2019-x86_64.7z
|
||||
"C:\Program Files\7-Zip\7z.exe" x -aoa -o%~dp0..\..\Qt\ %~dp0..\..\qt-everywhere-5.15.13-Windows_10-MSVC2019-x86_64.7z
|
||||
certutil -hashfile %~dp0..\..\qt-everywhere-5.15.13-Windows_10-MSVC2019-x86_64.7z SHA256 | find /i "f9029e02badd6a79d9bb092f9fb0772214dbcf8cd0122422514291d755860c37"
|
||||
curl -LsSO --output-dir %~dp0..\..\ https://github.com/%ghQtBuilds_user%/%ghQtBuilds_repo%/releases/download/v%qt_version%-ssl-lgpl/qt-everywhere-%qt_version%-Windows_10-MSVC2019-x86_64.7z
|
||||
"C:\Program Files\7-Zip\7z.exe" x -aoa -o%~dp0..\..\Qt\ %~dp0..\..\qt-everywhere-%qt_version%-Windows_10-MSVC2019-x86_64.7z
|
||||
certutil -hashfile %~dp0..\..\qt-everywhere-%qt_version%-Windows_10-MSVC2019-x86_64.7z SHA256 | find /i "%ghQtBuilds_hash_x64%"
|
||||
)
|
||||
|
||||
if %ERRORLEVEL% == 1 exit /b 1
|
||||
|
|
@ -19,4 +27,4 @@ if %ERRORLEVEL% == 1 exit /b 1
|
|||
|
||||
REM dir %~dp0..\..\
|
||||
REM dir %~dp0..\..\Qt
|
||||
REM dir %~dp0..\..\Qt\5.15.13
|
||||
REM dir %~dp0..\..\Qt\%qt_version%
|
||||
|
|
|
|||
|
|
@ -2,61 +2,66 @@ REM @echo off
|
|||
REM echo Current dir: %cd%
|
||||
REM echo folder: %~dp0
|
||||
REM echo arch: %1
|
||||
REM echo qt_version: %2
|
||||
REM echo qt6_version: %3
|
||||
|
||||
echo %*
|
||||
IF "%~3" == "" ( set "qt6_version=6.3.1" ) ELSE ( set "qt6_version=%~3" )
|
||||
IF "%~2" == "" ( set "qt_version=5.15.14" ) ELSE ( set "qt_version=%~2" )
|
||||
|
||||
IF %1 == Win32 (
|
||||
set qt_path=%~dp0..\..\Qt\5.15.13\msvc2019
|
||||
set qt_path=%~dp0..\..\Qt\%qt_version%\msvc2019
|
||||
|
||||
REM get private headers for QtCore
|
||||
Xcopy /E /I /Y /Q %~dp0..\..\Qt\5.15.13\msvc2019\include\QtCore\5.15.13\QtCore %~dp0..\..\Qt\5.15.13\msvc2019\include\QtCore
|
||||
Xcopy /E /I /Y /Q %~dp0..\..\Qt\%qt_version%\msvc2019\include\QtCore\%qt_version%\QtCore %~dp0..\..\Qt\%qt_version%\msvc2019\include\QtCore
|
||||
|
||||
set build_arch=Win32
|
||||
set qt_params=
|
||||
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars32.bat"
|
||||
)
|
||||
IF %1 == x64 (
|
||||
set qt_path=%~dp0..\..\Qt\5.15.13\msvc2019_64
|
||||
REM set qt_path=%~dp0..\..\Qt\6.3.1\msvc2019_64
|
||||
set qt_path=%~dp0..\..\Qt\%qt_version%\msvc2019_64
|
||||
REM set qt_path=%~dp0..\..\Qt\%qt6_version%\msvc2019_64
|
||||
|
||||
REM get private headers for QtCore
|
||||
Xcopy /E /I /Y /Q %~dp0..\..\Qt\5.15.13\msvc2019_64\include\QtCore\5.15.13\QtCore %~dp0..\..\Qt\5.15.13\msvc2019_64\include\QtCore
|
||||
REM Xcopy /E /I /Y /Q %~dp0..\..\Qt\6.3.1\msvc2019_64\include\QtCore\6.3.1\QtCore %~dp0..\..\Qt\6.3.1\msvc2019_64\include\QtCore
|
||||
Xcopy /E /I /Y /Q %~dp0..\..\Qt\%qt_version%\msvc2019_64\include\QtCore\%qt_version%\QtCore %~dp0..\..\Qt\%qt_version%\msvc2019_64\include\QtCore
|
||||
REM Xcopy /E /I /Y /Q %~dp0..\..\Qt\%qt6_version%\msvc2019_64\include\QtCore\%qt6_version%\QtCore %~dp0..\..\Qt\%qt6_version%\msvc2019_64\include\QtCore
|
||||
|
||||
set build_arch=x64
|
||||
set qt_params=
|
||||
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
|
||||
)
|
||||
IF %1 == ARM64 (
|
||||
set qt_path=%~dp0..\..\Qt\6.3.1\msvc2019_64
|
||||
set qt_path=%~dp0..\..\Qt\%qt6_version%\msvc2019_64
|
||||
|
||||
REM get private headers for QtCore
|
||||
Xcopy /E /I /Y /Q %~dp0..\..\Qt\6.3.1\msvc2019_arm64\include\QtCore\6.3.1\QtCore %~dp0..\..\Qt\6.3.1\msvc2019_arm64\include\QtCore
|
||||
Xcopy /E /I /Y /Q %~dp0..\..\Qt\%qt6_version%\msvc2019_arm64\include\QtCore\%qt6_version%\QtCore %~dp0..\..\Qt\%qt6_version%\msvc2019_arm64\include\QtCore
|
||||
|
||||
set build_arch=ARM64
|
||||
|
||||
REM set qt_params=-qtconf "%~dp0..\..\Qt\6.3.1\msvc2019_arm64\bin\target_qt.conf"
|
||||
REM set qt_params=-qtconf "%~dp0..\..\Qt\%qt6_version%\msvc2019_arm64\bin\target_qt.conf"
|
||||
|
||||
REM type %~dp0..\..\Qt\6.3.1\msvc2019_arm64\bin\target_qt.conf
|
||||
REM type %~dp0..\..\Qt\%qt6_version%\msvc2019_arm64\bin\target_qt.conf
|
||||
|
||||
REM
|
||||
REM The target_qt.conf as provided by the windows-2019 github action runner
|
||||
REM is non functional, hence we create our own working edition here.
|
||||
REM
|
||||
|
||||
echo [DevicePaths] > %~dp0..\..\Qt\6.3.1\msvc2019_arm64\bin\my_target_qt.conf
|
||||
echo Prefix=C:/Qt/Qt-6.3.1 >> %~dp0..\..\Qt\6.3.1\msvc2019_arm64\bin\my_target_qt.conf
|
||||
echo [Paths] >> %~dp0..\..\Qt\6.3.1\msvc2019_arm64\bin\my_target_qt.conf
|
||||
echo Prefix=../ >> %~dp0..\..\Qt\6.3.1\msvc2019_arm64\bin\my_target_qt.conf
|
||||
echo HostPrefix=../../msvc2019_64 >> %~dp0..\..\Qt\6.3.1\msvc2019_arm64\bin\my_target_qt.conf
|
||||
echo HostData=../msvc2019_arm64 >> %~dp0..\..\Qt\6.3.1\msvc2019_arm64\bin\my_target_qt.conf
|
||||
echo Sysroot= >> %~dp0..\..\Qt\6.3.1\msvc2019_arm64\bin\my_target_qt.conf
|
||||
echo SysrootifyPrefix=false >> %~dp0..\..\Qt\6.3.1\msvc2019_arm64\bin\my_target_qt.conf
|
||||
echo TargetSpec=win32-arm64-msvc >> %~dp0..\..\Qt\6.3.1\msvc2019_arm64\bin\my_target_qt.conf
|
||||
echo HostSpec=win32-msvc >> %~dp0..\..\Qt\6.3.1\msvc2019_arm64\bin\my_target_qt.conf
|
||||
echo Documentation=../../Docs/Qt-6.3.1 >> %~dp0..\..\Qt\6.3.1\msvc2019_arm64\bin\my_target_qt.conf
|
||||
echo Examples=../../Examples/Qt-6.3.1 >> %~dp0..\..\Qt\6.3.1\msvc2019_arm64\bin\my_target_qt.conf
|
||||
echo [DevicePaths] > %~dp0..\..\Qt\%qt6_version%\msvc2019_arm64\bin\my_target_qt.conf
|
||||
echo Prefix=C:/Qt/Qt-%qt6_version% >> %~dp0..\..\Qt\%qt6_version%\msvc2019_arm64\bin\my_target_qt.conf
|
||||
echo [Paths] >> %~dp0..\..\Qt\%qt6_version%\msvc2019_arm64\bin\my_target_qt.conf
|
||||
echo Prefix=../ >> %~dp0..\..\Qt\%qt6_version%\msvc2019_arm64\bin\my_target_qt.conf
|
||||
echo HostPrefix=../../msvc2019_64 >> %~dp0..\..\Qt\%qt6_version%\msvc2019_arm64\bin\my_target_qt.conf
|
||||
echo HostData=../msvc2019_arm64 >> %~dp0..\..\Qt\%qt6_version%\msvc2019_arm64\bin\my_target_qt.conf
|
||||
echo Sysroot= >> %~dp0..\..\Qt\%qt6_version%\msvc2019_arm64\bin\my_target_qt.conf
|
||||
echo SysrootifyPrefix=false >> %~dp0..\..\Qt\%qt6_version%\msvc2019_arm64\bin\my_target_qt.conf
|
||||
echo TargetSpec=win32-arm64-msvc >> %~dp0..\..\Qt\%qt6_version%\msvc2019_arm64\bin\my_target_qt.conf
|
||||
echo HostSpec=win32-msvc >> %~dp0..\..\Qt\%qt6_version%\msvc2019_arm64\bin\my_target_qt.conf
|
||||
echo Documentation=../../Docs/Qt-%qt6_version% >> %~dp0..\..\Qt\%qt6_version%\msvc2019_arm64\bin\my_target_qt.conf
|
||||
echo Examples=../../Examples/Qt-%qt6_version% >> %~dp0..\..\Qt\%qt6_version%\msvc2019_arm64\bin\my_target_qt.conf
|
||||
|
||||
set qt_params=-qtconf "%~dp0..\..\Qt\6.3.1\msvc2019_arm64\bin\my_target_qt.conf"
|
||||
set qt_params=-qtconf "%~dp0..\..\Qt\%qt6_version%\msvc2019_arm64\bin\my_target_qt.conf"
|
||||
|
||||
REM set VSCMD_DEBUG=3
|
||||
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsamd64_arm64.bat"
|
||||
|
|
|
|||
Loading…
Reference in New Issue