mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Issue #23612: Fixes upgrade code and version for Windows installer.

Browse source
This commit is contained in:
Steve Dower 2015-03-08 15:29:39 -07:00
parent 1872f93fd1
commit c49de35585
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Tools/msi/bundle/Default.thm
View file

@ -115,7 +115,7 @@
<Image X="0" Y="0" Width="162" Height="352" ImageFile="SideBar.png"/> <Image X="0" Y="0" Width="162" Height="352" ImageFile="SideBar.png"/>
<Hypertext Name="FailureLogFileLink" X="185" Y="71" Width="-11" Height="60" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext> <Hypertext Name="FailureLogFileLink" X="185" Y="71" Width="-11" Height="60" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
<Hypertext Name="FailureMessageText" X="185" Y="-100" Width="-11" Height="34" FontId="3" TabStop="yes" HideWhenDisabled="yes">Failure Message</Hypertext> <Hypertext Name="FailureMessageText" X="185" Y="-100" Width="-11" Height="60" FontId="3" TabStop="yes" HideWhenDisabled="yes"></Hypertext>
<Text Name="FailureRestartText" X="185" Y="-40" Width="-11" Height="34" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRestartText)</Text> <Text Name="FailureRestartText" X="185" Y="-40" Width="-11" Height="34" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRestartText)</Text>
<Button Name="FailureRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.FailureRestartButton)</Button> <Button Name="FailureRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.FailureRestartButton)</Button>
<Button Name="FailureCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.CloseButton)</Button> <Button Name="FailureCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.CloseButton)</Button>

4
Tools/msi/bundle/bundle.wxs
View file

@ -2,11 +2,11 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:bal="http://schemas.microsoft.com/wix/BalExtension"> xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
<Bundle Name="!(loc.FullProductName)" <Bundle Name="!(loc.FullProductName)"
UpgradeCode="$(var.UpgradeCode)" UpgradeCode="$(var.CoreUpgradeCode)"
Version="$(var.Version)" Version="$(var.Version)"
IconSourceFile="bundle.ico" IconSourceFile="bundle.ico"
Manufacturer="!(loc.Manufacturer)" Manufacturer="!(loc.Manufacturer)"
UpdateUrl="http://www.python.org/" AboutUrl="http://www.python.org/"
DisableModify="button" DisableModify="button"
Compressed="no"> Compressed="no">
<BootstrapperApplication Id="PythonBA" SourceFile="$(var.BootstrapApp)"> <BootstrapperApplication Id="PythonBA" SourceFile="$(var.BootstrapApp)">

4
Tools/msi/msi.props
View file

@ -62,7 +62,7 @@
<Bitness Condition="$(Platform) == 'x64'">64-bit</Bitness> <Bitness Condition="$(Platform) == 'x64'">64-bit</Bitness>
<DefineConstants> <DefineConstants>
$(DefineConstants); $(DefineConstants);
Version=$(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber).$(RevisionNumber); Version=$(MajorVersionNumber).$(MinorVersionNumber).$(Field3Value).0;
ShortVersion=$(MajorVersionNumber).$(MinorVersionNumber); ShortVersion=$(MajorVersionNumber).$(MinorVersionNumber);
LongVersion=$(PythonVersion); LongVersion=$(PythonVersion);
MajorVersionNumber=$(MajorVersionNumber); MajorVersionNumber=$(MajorVersionNumber);
@ -142,7 +142,7 @@
</ItemGroup> </ItemGroup>
<Target Name="_GenerateGuids" AfterTargets="PrepareForBuild"> <Target Name="_GenerateGuids" AfterTargets="PrepareForBuild">
<PropertyGroup> <PropertyGroup>
<_Uuids>@(_Uuid->'("%(Identity)", "%(Uri)")',',')</_Uuids> <_Uuids>@(_Uuid->'("%(Identity)", "$(MajorVersionNumber).$(MinorVersionNumber)/%(Uri)")',',')</_Uuids>
<_GenerateCommand>import uuid; print('\n'.join('{}={}'.format(i, uuid.uuid5(uuid.UUID('c8d9733e-a70c-43ff-ab0c-e26456f11083'), '$(ReleaseUri)' + j)) for i,j in [$(_Uuids.Replace(`"`,`'`))]))</_GenerateCommand> <_GenerateCommand>import uuid; print('\n'.join('{}={}'.format(i, uuid.uuid5(uuid.UUID('c8d9733e-a70c-43ff-ab0c-e26456f11083'), '$(ReleaseUri)' + j)) for i,j in [$(_Uuids.Replace(`"`,`'`))]))</_GenerateCommand>
</PropertyGroup> </PropertyGroup>