Simplify paths used for final artifacts

This commit is contained in:
Odd Stranne
2022-01-05 15:19:30 +01:00
parent d9c1462ccb
commit 51c44b935a

View File

@@ -42,18 +42,11 @@ signtool sign /tr %TIMESTAMP_SERVER% /td sha256 /fd sha256 /sha1 "%CERT_THUMBPRI
IF %ERRORLEVEL% NEQ 0 goto ERROR
:: Copy artifacts
rmdir /s /q %ROOT%bin\dist
mkdir %ROOT%bin\dist\meta
copy /b %ROOT%bin\x64-Release\mullvad-split-tunnel\mullvad-split-tunnel.pdb %ROOT%bin\dist\meta\
:: Build a CAB file for submission to the MS Hardware Dev Center
mkdir %ROOT%bin\dist\win10
mkdir %ROOT%bin\temp\cab
>"%ROOT%bin\dist\win10\mullvad-split-tunnel-amd64.ddf" (
>"%ROOT%bin\temp\cab\mullvad-split-tunnel-amd64.ddf" (
echo .OPTION EXPLICIT ; Generate errors
echo .Set CabinetFileCountThreshold=0
echo .Set FolderFileCountThreshold=0
@@ -66,7 +59,7 @@ mkdir %ROOT%bin\dist\win10
echo .Set Compress=on
echo .Set CabinetNameTemplate=mullvad-split-tunnel-amd64.cab
echo .Set DestinationDir=Package
echo .Set DiskDirectoryTemplate=%ROOT%bin\dist\win10
echo .Set DiskDirectoryTemplate=%ROOT%bin\temp\cab
echo %ROOT%bin\x64-Release\mullvad-split-tunnel\mullvad-split-tunnel.cat
echo %ROOT%bin\x64-Release\mullvad-split-tunnel\mullvad-split-tunnel.inf
echo %ROOT%bin\x64-Release\mullvad-split-tunnel\mullvad-split-tunnel.sys
@@ -76,18 +69,25 @@ mkdir %ROOT%bin\dist\win10
:: makecab produces several garbage files
:: Force current working directory to prevent spreading them out
pushd %ROOT%bin\dist\win10
pushd %ROOT%bin\temp\cab
makecab /f "%ROOT%bin\dist\win10\mullvad-split-tunnel-amd64.ddf"
makecab /f "%ROOT%bin\temp\cab\mullvad-split-tunnel-amd64.ddf"
popd
IF %ERRORLEVEL% NEQ 0 goto ERROR
signtool sign /tr %TIMESTAMP_SERVER% /td sha256 /fd sha256 /sha1 "%CERT_THUMBPRINT%" /v %ROOT%bin\dist\win10\mullvad-split-tunnel-amd64.cab
signtool sign /tr %TIMESTAMP_SERVER% /td sha256 /fd sha256 /sha1 "%CERT_THUMBPRINT%" /v %ROOT%bin\temp\cab\mullvad-split-tunnel-amd64.cab
IF %ERRORLEVEL% NEQ 0 goto ERROR
:: Collect artifacts
mkdir %ROOT%bin\dist
copy /b %ROOT%bin\x64-Release\mullvad-split-tunnel\mullvad-split-tunnel.pdb %ROOT%bin\dist\
copy /b %ROOT%bin\temp\cab\mullvad-split-tunnel-amd64.cab %ROOT%bin\dist\
echo;
echo BUILD COMPLETED SUCCESSFULLY
echo;