From 60717700e175d38412559113c8a5388c954c7c91 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sun, 18 Oct 2020 14:10:39 -0500
Subject: Get the internal Burn version to be Major.Minor.Patch.BuildNumber.

---
 src/engine/EngineForApplication.cpp |  2 +-
 src/engine/engine.vcxproj           | 11 +++++++++--
 src/engine/pseudobundle.cpp         |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'src/engine')

diff --git a/src/engine/EngineForApplication.cpp b/src/engine/EngineForApplication.cpp
index 49ffe700..c5eb5467 100644
--- a/src/engine/EngineForApplication.cpp
+++ b/src/engine/EngineForApplication.cpp
@@ -369,7 +369,7 @@ static HRESULT BAEngineSetUpdate(
             sczId = pContext->pEngineState->registration.sczId;
         }
 
-        hr = PseudoBundleInitialize(FILEMAKEVERSION(rmj, rmm, rup, 0), &pContext->pEngineState->update.package, FALSE, sczId, BOOTSTRAPPER_RELATION_UPDATE, BOOTSTRAPPER_PACKAGE_STATE_ABSENT, pContext->pEngineState->registration.sczExecutableName, sczLocalSource ? sczLocalSource : wzLocalSource, wzDownloadSource, qwSize, TRUE, sczCommandline, NULL, NULL, NULL, rgbHash, cbHash);
+        hr = PseudoBundleInitialize(FILEMAKEVERSION(rmj, rmm, rup, rpr), &pContext->pEngineState->update.package, FALSE, sczId, BOOTSTRAPPER_RELATION_UPDATE, BOOTSTRAPPER_PACKAGE_STATE_ABSENT, pContext->pEngineState->registration.sczExecutableName, sczLocalSource ? sczLocalSource : wzLocalSource, wzDownloadSource, qwSize, TRUE, sczCommandline, NULL, NULL, NULL, rgbHash, cbHash);
         ExitOnFailure(hr, "Failed to set update bundle.");
 
         pContext->pEngineState->update.fUpdateAvailable = TRUE;
diff --git a/src/engine/engine.vcxproj b/src/engine/engine.vcxproj
index d3f5b61e..d98cb7e9 100644
--- a/src/engine/engine.vcxproj
+++ b/src/engine/engine.vcxproj
@@ -151,10 +151,17 @@ rc.exe -fo "$(OutDir)engine.res" "$(IntDir)engine.messages.rc"</Command>
   <Target Name="SetWixVersion"
           DependsOnTargets="GetBuildVersion"
           BeforeTargets="ClCompile">
+    <PropertyGroup>
+      <rmj>$(MajorMinorVersion.Split(`.`)[0])</rmj>
+      <rmm>$(MajorMinorVersion.Split(`.`)[1])</rmm>
+      <rup>0</rup>
+      <rpr>$(BuildNumber)</rpr>
+      <szVerMajorMinorBuild>$(rmj).$(rmm).$(rup).$(rpr)</szVerMajorMinorBuild>
+      <wixver>rmj=$(rmj);rmm=$(rmm);rup=$(rup);rpr=$(rpr);szVerMajorMinorBuild="$(szVerMajorMinorBuild)"</wixver>
+    </PropertyGroup>
     <ItemGroup>
       <ClCompile>
-        <!-- TODO: get rmj and rmm dynamically -->
-        <PreprocessorDefinitions>rmj=4;rmm=0;rup=$(BuildNumber);szVerMajorMinorBuild="$(BuildVersion)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+        <PreprocessorDefinitions>$(wixver);%(PreprocessorDefinitions)</PreprocessorDefinitions>
       </ClCompile>
     </ItemGroup>
   </Target>
diff --git a/src/engine/pseudobundle.cpp b/src/engine/pseudobundle.cpp
index ebdc040a..70f93701 100644
--- a/src/engine/pseudobundle.cpp
+++ b/src/engine/pseudobundle.cpp
@@ -126,7 +126,7 @@ extern "C" HRESULT PseudoBundleInitialize(
     }
 
     // Only support progress from engines that are compatible (aka: version greater than or equal to last protocol breaking change *and* versions that are older or the same as this engine).
-    pPackage->Exe.protocol = (FILEMAKEVERSION(3, 6, 2221, 0) <= qwEngineVersion && qwEngineVersion <= FILEMAKEVERSION(rmj, rmm, rup, 0)) ? BURN_EXE_PROTOCOL_TYPE_BURN : BURN_EXE_PROTOCOL_TYPE_NONE;
+    pPackage->Exe.protocol = (FILEMAKEVERSION(3, 6, 2221, 0) <= qwEngineVersion && qwEngineVersion <= FILEMAKEVERSION(rmj, rmm, rup, rpr)) ? BURN_EXE_PROTOCOL_TYPE_BURN : BURN_EXE_PROTOCOL_TYPE_NONE;
     
     // All versions of Burn past v3.9 RTM support suppressing ancestors.
     pPackage->Exe.fSupportsAncestors = FILEMAKEVERSION(3, 9, 1006, 0) <= qwEngineVersion;
-- 
cgit v1.2.3-55-g6feb