diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-07-09 05:43:48 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-07-09 05:43:48 (GMT) |
| commit | b85b427507a8034878d08c2abe2d6b1b7eab97d0 (patch) | |
| tree | 6c53f355d62725cd89b51f3ad1f68fa5fa69db8a /Tools/msi/msi.props | |
| parent | 494374922c909bfb7c833032a686cc173762d988 (diff) | |
| download | cpython-b85b427507a8034878d08c2abe2d6b1b7eab97d0.zip cpython-b85b427507a8034878d08c2abe2d6b1b7eab97d0.tar.gz cpython-b85b427507a8034878d08c2abe2d6b1b7eab97d0.tar.bz2 | |
Fixes installer rebuild, snapshot versioning, and the README.txt file.
Diffstat (limited to 'Tools/msi/msi.props')
| -rw-r--r-- | Tools/msi/msi.props | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Tools/msi/msi.props b/Tools/msi/msi.props index 1d9f0f0..2d13aef 100644 --- a/Tools/msi/msi.props +++ b/Tools/msi/msi.props @@ -53,8 +53,13 @@ <CRTRedist Condition="!Exists($(CRTRedist))"></CRTRedist> <DocFilename>python$(MajorVersionNumber)$(MinorVersionNumber)$(MicroVersionNumber)$(ReleaseLevelName).chm</DocFilename> - <RevisionNumber>$(ReleaseLevelNumber)</RevisionNumber> - <RevisionNumber Condition="!$(BuildForRelease)">$([System.Math]::Floor($([System.DateTime]::Now.Subtract($([System.DateTime]::new(2001, 1, 1))).TotalDays)))</RevisionNumber> + <InstallerVersion>$(MajorVersionNumber).$(MinorVersionNumber).$(Field3Value).0</InstallerVersion> + </PropertyGroup> + + <PropertyGroup Condition="!$(BuildForRelease)"> + <RevisionNumber Condition="'$(RevisionNumber)' == ''">$([System.Math]::Floor($([System.DateTime]::Now.Subtract($([System.DateTime]::new(2001, 1, 1))).TotalDays)))</RevisionNumber> + <PythonVersion>$(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber)dev$(RevisionNumber)</PythonVersion> + <InstallerVersion>$(MajorVersionNumber).$(MinorVersionNumber).$(RevisionNumber).0</InstallerVersion> </PropertyGroup> <PropertyGroup> @@ -62,7 +67,7 @@ <Bitness Condition="$(Platform) == 'x64'">64-bit</Bitness> <DefineConstants> $(DefineConstants); - Version=$(MajorVersionNumber).$(MinorVersionNumber).$(Field3Value).0; + Version=$(InstallerVersion); ShortVersion=$(MajorVersionNumber).$(MinorVersionNumber); LongVersion=$(PythonVersion); MajorVersionNumber=$(MajorVersionNumber); |