diff options
| author | Larry Hastings <larry@hastings.org> | 2015-02-08 22:07:35 (GMT) |
|---|---|---|
| committer | Larry Hastings <larry@hastings.org> | 2015-02-08 22:07:35 (GMT) |
| commit | df4fb13cdcbb375c4901158778aef6cc8cf9a255 (patch) | |
| tree | 1786941c32b1b0efbbd376066f69ced5037d713d /Tools/msi/bundle/bundle.targets | |
| parent | f77232b04e176b3be5c115b9217feb3785557868 (diff) | |
| parent | 312cef086b277c6f79cde5b345f0ce1ada81095e (diff) | |
| download | cpython-df4fb13cdcbb375c4901158778aef6cc8cf9a255.zip cpython-df4fb13cdcbb375c4901158778aef6cc8cf9a255.tar.gz cpython-df4fb13cdcbb375c4901158778aef6cc8cf9a255.tar.bz2 | |
Merge.
Diffstat (limited to 'Tools/msi/bundle/bundle.targets')
| -rw-r--r-- | Tools/msi/bundle/bundle.targets | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tools/msi/bundle/bundle.targets b/Tools/msi/bundle/bundle.targets index 7726eea..7697af7 100644 --- a/Tools/msi/bundle/bundle.targets +++ b/Tools/msi/bundle/bundle.targets @@ -14,8 +14,8 @@ <OutputPath>$(OutputPath)en-us\</OutputPath> <OutDir>$(OutputPath)</OutDir> - <DownloadUrl Condition="'$(DownloadUrl)' == '' and '$(DownloadUrlBase)' != ''">$(DownloadUrlBase.TrimEnd(`/`))/$(PythonVersion)/$(ArchName)/{2}</DownloadUrl> - <DefineConstants Condition="'$(DownloadUrl)' != ''">$(DefineConstants);DownloadUrl=$(DownloadUrl)</DefineConstants> + <DownloadUrl Condition="'$(DownloadUrl)' == '' and '$(DownloadUrlBase)' != ''">$(DownloadUrlBase.TrimEnd(`/`))/$(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber)/$(ArchName)$(ReleaseLevelName)/</DownloadUrl> + <DefineConstants Condition="'$(DownloadUrl)' != ''">$(DefineConstants);DownloadUrl=$(DownloadUrl){2}</DefineConstants> <DefineConstants Condition="'$(DownloadUrl)' == ''">$(DefineConstants);DownloadUrl={2}</DefineConstants> </PropertyGroup> |