From 97a72a9ee2d2041cb858b036909e12a3f206fa19 Mon Sep 17 00:00:00 2001 From: pokamest Date: Thu, 21 Sep 2023 11:28:18 +0100 Subject: [PATCH] build_windows.bat fix --- deploy/PrivacyTechAppleCertDeveloperId.p12 | Bin 3336 -> 0 bytes deploy/PrivacyTechAppleCertInstallerId.p12 | Bin 3332 -> 0 bytes deploy/PrivacyTechWindowsCert.pfx | Bin 9546 -> 0 bytes deploy/WWDRCA.cer | Bin 1062 -> 0 bytes deploy/build_windows.bat | 36 ++++++++------------- 5 files changed, 13 insertions(+), 23 deletions(-) delete mode 100755 deploy/PrivacyTechAppleCertDeveloperId.p12 delete mode 100755 deploy/PrivacyTechAppleCertInstallerId.p12 delete mode 100644 deploy/PrivacyTechWindowsCert.pfx delete mode 100644 deploy/WWDRCA.cer diff --git a/deploy/PrivacyTechAppleCertDeveloperId.p12 b/deploy/PrivacyTechAppleCertDeveloperId.p12 deleted file mode 100755 index a04ec85a02ac7e68cd42ccd951d286abb33fe7ae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3336 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 diff --git a/deploy/PrivacyTechWindowsCert.pfx b/deploy/PrivacyTechWindowsCert.pfx deleted file mode 100644 index 42c49a339f02c9f69fbfcad55f92bf99830662b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9546 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 D2`7-6 diff --git a/deploy/build_windows.bat b/deploy/build_windows.bat index b6892f3d1..7ae3e9f69 100644 --- a/deploy/build_windows.bat +++ b/deploy/build_windows.bat @@ -14,41 +14,31 @@ set PROJECT_DIR=%cd% set SCRIPT_DIR=%PROJECT_DIR:"=%\deploy set WORK_DIR=%SCRIPT_DIR:"=%\build_%BUILD_ARCH:"=% -rmdir /Q /S %WORK_DIR% -mkdir %WORK_DIR% - - set APP_NAME=AmneziaVPN set APP_FILENAME=%APP_NAME:"=%.exe set APP_DOMAIN=org.amneziavpn.package -set RELEASE_DIR=%WORK_DIR:"=% -set OUT_APP_DIR=%RELEASE_DIR:"=%\client\release -set PREBILT_DEPLOY_DATA_DIR=%SCRIPT_DIR:"=%\data\deploy-prebuilt\windows\x%BUILD_ARCH:"=% +set OUT_APP_DIR=%WORK_DIR:"=%\client\release +set PREBILT_DEPLOY_DATA_DIR=%PROJECT_DIR:"=%\client\3rd-prebuilt\deploy-prebuilt\windows\x%BUILD_ARCH:"=% set DEPLOY_DATA_DIR=%SCRIPT_DIR:"=%\data\windows\x%BUILD_ARCH:"=% -set INSTALLER_DATA_DIR=%RELEASE_DIR:"=%\installer\packages\%APP_DOMAIN:"=%\data +set INSTALLER_DATA_DIR=%WORK_DIR:"=%\installer\packages\%APP_DOMAIN:"=%\data set TARGET_FILENAME=%PROJECT_DIR:"=%\%APP_NAME:"=%_x%BUILD_ARCH:"=%.exe echo "Environment:" +echo "WORK_DIR: %WORK_DIR%" echo "APP_FILENAME: %APP_FILENAME%" echo "PROJECT_DIR: %PROJECT_DIR%" echo "SCRIPT_DIR: %SCRIPT_DIR%" -echo "RELEASE_DIR: %RELEASE_DIR%" echo "OUT_APP_DIR: %OUT_APP_DIR%" echo "DEPLOY_DATA_DIR: %DEPLOY_DATA_DIR%" echo "INSTALLER_DATA_DIR: %INSTALLER_DATA_DIR%" -echo "QMAKE_STASH_FILE: %QMAKE_STASH_FILE%" echo "TARGET_FILENAME: %TARGET_FILENAME%" -rem Signing staff -powershell Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Scope LocalMachine -powershell Get-ExecutionPolicy -List - -powershell Import-PfxCertificate -FilePath %SCRIPT_DIR:"=%\PrivacyTechWindowsCert.pfx -CertStoreLocation Cert:\LocalMachine\My -Password $(ConvertTo-SecureString -String $Env:WIN_CERT_PW -AsPlainText -Force) - echo "Cleanup..." -Rmdir /Q /S %RELEASE_DIR% +rmdir /Q /S %WORK_DIR% Del %TARGET_FILENAME% +mkdir %WORK_DIR% + call "%QT_BIN_DIR:"=%\qt-cmake" --version "%QT_BIN_DIR:"=%\windeployqt" -v cmake --version @@ -69,11 +59,11 @@ copy "%WORK_DIR:"=%\service\server\release\%APP_NAME:"=%-service.exe" %OUT_APP_D echo "Signing exe" cd %OUT_APP_DIR% -signtool sign /v /sm /s My /n "Privacy Technologies OU" /fd sha256 /tr http://timestamp.comodoca.com/?td=sha256 /td sha256 *.exe - +signtool sign /v /n "Privacy Technologies OU" /fd sha256 /tr http://timestamp.comodoca.com/?td=sha256 /td sha256 *.exe + "%QT_BIN_DIR:"=%\windeployqt" --release --qmldir "%PROJECT_DIR:"=%\client" --force --no-translations "%OUT_APP_DIR:"=%\%APP_FILENAME:"=%" -signtool sign /v /sm /s My /n "Privacy Technologies OU" /fd sha256 /tr http://timestamp.comodoca.com/?td=sha256 /td sha256 *.dll +signtool sign /v /n "Privacy Technologies OU" /fd sha256 /tr http://timestamp.comodoca.com/?td=sha256 /td sha256 *.dll echo "Copying deploy data..." xcopy %DEPLOY_DATA_DIR% %OUT_APP_DIR% /s /e /y /i /f @@ -81,7 +71,7 @@ xcopy %PREBILT_DEPLOY_DATA_DIR% %OUT_APP_DIR% /s /e /y /i /f copy "%WORK_DIR:"=%\service\wireguard-service\release\wireguard-service.exe" %OUT_APP_DIR%\wireguard\ cd %SCRIPT_DIR% -xcopy %SCRIPT_DIR:"=%\installer %RELEASE_DIR:"=%\installer /s /e /y /i /f +xcopy %SCRIPT_DIR:"=%\installer %WORK_DIR:"=%\installer /s /e /y /i /f mkdir %INSTALLER_DATA_DIR% echo "Deploy finished, content:" @@ -91,14 +81,14 @@ cd %OUT_APP_DIR% echo "Compressing data..." "%QIF_BIN_DIR:"=%\archivegen" -c 9 %INSTALLER_DATA_DIR:"=%\%APP_NAME:"=%.7z . -cd "%RELEASE_DIR:"=%\installer" +cd "%WORK_DIR:"=%\installer" echo "Creating installer..." "%QIF_BIN_DIR:"=%\binarycreator" --offline-only -v -c config\windows.xml -p packages -f %TARGET_FILENAME% timeout 5 cd %PROJECT_DIR% -signtool sign /v /sm /s My /n "Privacy Technologies OU" /fd sha256 /tr http://timestamp.comodoca.com/?td=sha256 /td sha256 "%TARGET_FILENAME%" +signtool sign /v /n "Privacy Technologies OU" /fd sha256 /tr http://timestamp.comodoca.com/?td=sha256 /td sha256 "%TARGET_FILENAME%" echo "Finished, see %TARGET_FILENAME%" exit 0