Issue #24585: Enables build-to-build upgrades that preserve settings.

Rather than using Burn "Persisted" variables we now add registry keys for each added feature. These can be detected by the installer regardless of which version installed them, and we use this for Modify and Upgrade. In particular, Upgrades can't access the Persisted variables, but can find well-known registry keys.
There are also some changes to the bootstrap app to properly handle upgrades.
Finally, a few minor improvements to the Windows build to keep things tidier.

2 files changed, 54 insertions, 12 deletions

diff --git a/PCbuild/build.bat b/PCbuild/build.bat
index 3f8e231..17f8686 100644
--- a/PCbuild/build.bat
+++ b/PCbuild/build.bat
@@ -25,16 +25,17 @@ set verbose=/nologo /v:m
 set kill=

 

 :CheckOpts

-if '%1'=='-c' (set conf=%2) & shift & shift & goto CheckOpts

-if '%1'=='-p' (set platf=%2) & shift & shift & goto CheckOpts

-if '%1'=='-r' (set target=Rebuild) & shift & goto CheckOpts

-if '%1'=='-t' (set target=%2) & shift & shift & goto CheckOpts

-if '%1'=='-d' (set conf=Debug) & shift & goto CheckOpts

-if '%1'=='-e' call "%dir%get_externals.bat" & shift & goto CheckOpts

-if '%1'=='-m' (set parallel=/m) & shift & goto CheckOpts

-if '%1'=='-M' (set parallel=) & shift & goto CheckOpts

-if '%1'=='-v' (set verbose=/v:n) & shift & goto CheckOpts

-if '%1'=='-k' (set kill=true) & shift & goto CheckOpts

+if '%~1'=='-c' (set conf=%2) & shift & shift & goto CheckOpts

+if '%~1'=='-p' (set platf=%2) & shift & shift & goto CheckOpts

+if '%~1'=='-r' (set target=Rebuild) & shift & goto CheckOpts

+if '%~1'=='-t' (set target=%2) & shift & shift & goto CheckOpts

+if '%~1'=='-d' (set conf=Debug) & shift & goto CheckOpts

+if '%~1'=='-e' call "%dir%get_externals.bat" & shift & goto CheckOpts

+if '%~1'=='-m' (set parallel=/m) & shift & goto CheckOpts

+if '%~1'=='-M' (set parallel=) & shift & goto CheckOpts

+if '%~1'=='-v' (set verbose=/v:n) & shift & goto CheckOpts

+if '%~1'=='-k' (set kill=true) & shift & goto CheckOpts

+if '%~1'=='-V' shift & goto Version

 

 if '%platf%'=='x64' (set vs_platf=x86_amd64)

 

@@ -50,3 +51,9 @@ rem Passing %1-9 is not the preferred option, but argument parsing in
 rem batch is, shall we say, "lackluster"

 echo on

 msbuild "%dir%pcbuild.proj" /t:%target% %parallel% %verbose% /p:Configuration=%conf% /p:Platform=%platf% %1 %2 %3 %4 %5 %6 %7 %8 %9

+

+@goto :eof

+

+:Version

+rem Display the current build version information

+msbuild "%dir%python.props" /t:ShowVersionInfo /v:m /nologo %1 %2 %3 %4 %5 %6 %7 %8 %9

diff --git a/PCbuild/python.props b/PCbuild/python.props
index 1431ddc..857b8f8 100644
--- a/PCbuild/python.props
+++ b/PCbuild/python.props
@@ -42,7 +42,9 @@
     
     <!-- Full path of the resulting python.exe binary -->
     <PythonExe Condition="'$(PythonExe)' == ''">$(BuildPath)python$(PyDebugExt).exe</PythonExe>
-
+  </PropertyGroup>
+  
+  <PropertyGroup Condition="'$(OverrideVersion)' == ''">
     <!--
     Read version information from Include\patchlevel.h. The following properties are set:
     
@@ -70,7 +72,40 @@
     <ReleaseLevelName Condition="$(_ReleaseLevel) == 'ALPHA'">a$(ReleaseSerial)</ReleaseLevelName>
     <ReleaseLevelName Condition="$(_ReleaseLevel) == 'BETA'">b$(ReleaseSerial)</ReleaseLevelName>
     <ReleaseLevelName Condition="$(_ReleaseLevel) == 'GAMMA'">rc$(ReleaseSerial)</ReleaseLevelName>
+  </PropertyGroup>
+  
+  <PropertyGroup Condition="'$(OverrideVersion)' != ''">
+    <!--
+    Override the version number when building by specifying OverrideVersion.
+    For example:
+    
+        PCBuild\build.bat "/p:OverrideVersion=3.5.2a1"
     
+    Use the -V option to check your version is valid:
+    
+        PCBuild\build.bat -V "/p:OverrideVersion=3.5.2a1"
+          PythonVersionNumber: 3.5.2
+          PythonVersion:       3.5.2a1
+          PythonVersionHex:    0x030502A1
+          Field3Value:         2101
+    
+    Note that this only affects the version numbers embedded in resources and
+    installers, but not sys.version.
+    -->
+    <MajorVersionNumber>$([System.Text.RegularExpressions.Regex]::Match($(OverrideVersion), `(\d+)\.(\d+)\.(\d+)((a|b|rc)(\d))?`).Groups[1].Value)</MajorVersionNumber>
+    <MinorVersionNumber>$([System.Text.RegularExpressions.Regex]::Match($(OverrideVersion), `(\d+)\.(\d+)\.(\d+)((a|b|rc)(\d))?`).Groups[2].Value)</MinorVersionNumber>
+    <MicroVersionNumber>$([System.Text.RegularExpressions.Regex]::Match($(OverrideVersion), `(\d+)\.(\d+)\.(\d+)((a|b|rc)(\d))?`).Groups[3].Value)</MicroVersionNumber>
+    <ReleaseLevelName>$([System.Text.RegularExpressions.Regex]::Match($(OverrideVersion), `(\d+)\.(\d+)\.(\d+)((a|b|rc)(\d))?`).Groups[4].Value)</ReleaseLevelName>
+    <_ReleaseLevel>$([System.Text.RegularExpressions.Regex]::Match($(OverrideVersion), `(\d+)\.(\d+)\.(\d+)((a|b|rc)(\d))?`).Groups[5].Value)</_ReleaseLevel>
+    <ReleaseSerial>$([System.Text.RegularExpressions.Regex]::Match($(OverrideVersion), `(\d+)\.(\d+)\.(\d+)((a|b|rc)(\d))?`).Groups[6].Value)</ReleaseSerial>
+    <ReleaseSerial Condition="'$(ReleaseSerial)' == ''">0</ReleaseSerial>
+    <ReleaseLevelNumber>15</ReleaseLevelNumber>
+    <ReleaseLevelNumber Condition="$(_ReleaseLevel) == 'a'">10</ReleaseLevelNumber>
+    <ReleaseLevelNumber Condition="$(_ReleaseLevel) == 'b'">11</ReleaseLevelNumber>
+    <ReleaseLevelNumber Condition="$(_ReleaseLevel) == 'rc'">12</ReleaseLevelNumber>
+  </PropertyGroup>
+  
+  <PropertyGroup>
     <PythonVersionNumber>$(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber)</PythonVersionNumber>
     <PythonVersion>$(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber)$(ReleaseLevelName)</PythonVersion>
     <PythonVersionHex>$([msbuild]::BitwiseOr(
@@ -110,7 +145,7 @@
   <Target Name="ShowVersionInfo">
     <Message Importance="high" Text="PythonVersionNumber: $(PythonVersionNumber)" />
     <Message Importance="high" Text="PythonVersion:       $(PythonVersion)" />
-    <Message Importance="high" Text="$([System.String]::Format(`PythonVersionHex:    0x{0:x}`, $([System.UInt32]::Parse($(PythonVersionHex)))))" />
+    <Message Importance="high" Text="PythonVersionHex:    0x$([System.UInt32]::Parse($(PythonVersionHex)).ToString(`X08`))" />
     <Message Importance="high" Text="Field3Value:         $(Field3Value)" />
   </Target>
 </Project>