From 727b4e1733dbf18b8acbb046e0f5a16acd6c6299 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Tue, 26 Mar 2019 17:26:01 +0000 Subject: [PATCH] [misc] improve Appx creation workflow * Automatically build each arch and fix a missing variable --- ChangeLog.txt | 4 ++-- Makefile.am | 2 +- Makefile.in | 2 +- res/appstore/packme.cmd | 11 ++++++----- src/rufus.rc | 10 +++++----- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 81f6155d..f44905d8 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,6 +1,6 @@ o Version 3.5 (2019.03.??) Add a feature to download official retail Windows 8.1 or Windows 10 ISOs - (Note: 'Check for updates' must also be enabled for the above to be active) + (Note: 'Check for updates' must be enabled for the above to be active) Add Windows To Go support for MCT generated Windows ISOs Add a notice about the 'WppRecorder.sys' Microsoft bug for Windows 10 1809 ISOs Add a notice about trying to format a drive larger than 2 TB in MBR mode @@ -8,7 +8,7 @@ o Version 3.5 (2019.03.??) Report the full PID and command line of potentially blocking processes in the log Fix a potential silent abort when the drive is in use Fix 'Quick Format' option always being activated - Fix some unwanted file system changes occurring after an ISO had been selected + Fix potential change of the selected file system after an ISO has been loaded o Version 3.4 (2018.12.05) Set the default image selection directory to Downloads\ instead of My Documents\ diff --git a/Makefile.am b/Makefile.am index 8977f1f6..938c8f20 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,7 +13,7 @@ release: all @mv $(TARGET)$(EXEEXT) $(TARGET)-$(VERSION)$(SUFFIX)$(EXEEXT) @cmd.exe //c _sign.cmd $(TARGET)-$(VERSION)$(SUFFIX)$(EXEEXT) -appx: $(TARGET)-$(VERSION)$(SUFFIX)$(EXEEXT) +appx: $(file > cmd.sed,$(SEDCMD)) @sed -i -e "s/@@TAGVER@@/$(TAGVER)/g" cmd.sed @sed -b -i -f cmd.sed res/appstore/AppxManifest.xml diff --git a/Makefile.in b/Makefile.in index e2b0a9bb..9b7e36ee 100644 --- a/Makefile.in +++ b/Makefile.in @@ -510,7 +510,7 @@ release: all @mv $(TARGET)$(EXEEXT) $(TARGET)-$(VERSION)$(SUFFIX)$(EXEEXT) @cmd.exe //c _sign.cmd $(TARGET)-$(VERSION)$(SUFFIX)$(EXEEXT) -appx: $(TARGET)-$(VERSION)$(SUFFIX)$(EXEEXT) +appx: $(file > cmd.sed,$(SEDCMD)) @sed -i -e "s/@@TAGVER@@/$(TAGVER)/g" cmd.sed @sed -b -i -f cmd.sed res/appstore/AppxManifest.xml diff --git a/res/appstore/packme.cmd b/res/appstore/packme.cmd index bb09acad..66a9bf13 100644 --- a/res/appstore/packme.cmd +++ b/res/appstore/packme.cmd @@ -7,6 +7,7 @@ del /q *.appxbundle >NUL 2>&1 del /q *.map >NUL 2>&1 set WDK_PATH=C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x64 +set MSBUILD_PATH=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin set MANIFEST=AppxManifest.xml set ARCHS=x86 x64 arm arm64 @@ -14,10 +15,10 @@ cd /d "%~dp0" setlocal EnableDelayedExpansion set FILES_TO_SIGN= for %%a in (%ARCHS%) do ( - if not exist "..\..\%%a\Release\rufus.exe" ( - echo The %%a VS2017 Release build of Rufus does not exist! - goto out - ) + echo [Building %%a] + "%MSBUILD_PATH%\MSBuild" ..\..\rufus.sln /m /nologo /verbosity:minimal /t:Clean,Build /p:Configuration=Release,Platform=%%a + if ERRORLEVEL 1 goto out + echo. set FILES_TO_SIGN=!FILES_TO_SIGN! "..\..\%%a\Release\rufus.exe" ) "%WDK_PATH%\SignTool" sign /v /sha1 9ce9a71ccab3b38a74781b975f1c228222cf7d3b /fd SHA256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp %FILES_TO_SIGN% @@ -45,7 +46,7 @@ for %%a in (%ARCHS%) do ( copy "..\..\icons\rufus-48.png" "Assets\Square44x44Logo.targetsize-48_altform-unplated.png" >NUL 2>&1 copy "..\..\icons\rufus-150.png" "Assets\Square150x150Logo.png" >NUL 2>&1 copy "..\..\..\%%a\Release\rufus.exe" "rufus.exe" >NUL 2>&1 - "C:\Program Files (x86)\Windows Kits\10\bin\10.0.17134.0\x64\MakePri" createconfig /o /dq en-US /cf priconfig.xml + "%WDK_PATH%\MakePri" createconfig /o /dq en-US /cf priconfig.xml "%WDK_PATH%\MakePri" new /o /pr . /cf priconfig.xml "%WDK_PATH%\MakeAppx" pack /o /d . /p ../Rufus-%%a.appx if ERRORLEVEL 1 goto out diff --git a/src/rufus.rc b/src/rufus.rc index 71b44957..af8b429b 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 232, 326 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_ACCEPTFILES -CAPTION "Rufus 3.5.1493" +CAPTION "Rufus 3.5.1494" FONT 9, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP @@ -394,8 +394,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,1493,0 - PRODUCTVERSION 3,5,1493,0 + FILEVERSION 3,5,1494,0 + PRODUCTVERSION 3,5,1494,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -413,13 +413,13 @@ BEGIN VALUE "Comments", "https://akeo.ie" VALUE "CompanyName", "Akeo Consulting" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "3.5.1493" + VALUE "FileVersion", "3.5.1494" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2019 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus-3.5.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "3.5.1493" + VALUE "ProductVersion", "3.5.1494" END END BLOCK "VarFileInfo"