diff options
| author | Larry Hastings <larry@hastings.org> | 2015-12-06 00:49:19 (GMT) |
|---|---|---|
| committer | Larry Hastings <larry@hastings.org> | 2015-12-06 00:49:19 (GMT) |
| commit | a8f4405044f2ef834a389f50557e81221c42786c (patch) | |
| tree | 6701021b10b0887f993fc97e3436b502ba15ed89 | |
| parent | ba11daa4e880e16d56ed02e7e14d95f3b2c44eaf (diff) | |
| parent | 10fa83cb77299edb6feeaff2f6d0fe44a674ca4f (diff) | |
| download | cpython-a8f4405044f2ef834a389f50557e81221c42786c.zip cpython-a8f4405044f2ef834a389f50557e81221c42786c.tar.gz cpython-a8f4405044f2ef834a389f50557e81221c42786c.tar.bz2 | |
Merge.
| -rw-r--r-- | Tools/msi/bundle/bundle.targets | 2 | ||||
| -rw-r--r-- | Tools/msi/uploadrelease.proj | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Tools/msi/bundle/bundle.targets b/Tools/msi/bundle/bundle.targets index 57ca1dc..aeeff3b 100644 --- a/Tools/msi/bundle/bundle.targets +++ b/Tools/msi/bundle/bundle.targets @@ -18,7 +18,7 @@ <!-- See Tools/msi/buildrelease.bat for help on configuring the download URL --> <DownloadUrl Condition="'$(DownloadUrl)' == '' and '$(DownloadUrlBase)' != ''">$(DownloadUrlBase.TrimEnd(`/`))/{version}/{arch}{releasename}/{msi}</DownloadUrl> - <DefineConstants Condition="'$(DownloadUrl)' != ''">$(DefineConstants);DownloadUrl=$(DownloadUrl.Replace(`{version}`, `$(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber)`).Replace(`{arch}`, `$(ArchName)`).Replace(`{releasename}`, `$(ReleaseName)`).Replace(`{msi}`, `{2}`))</DefineConstants> + <DefineConstants Condition="'$(DownloadUrl)' != ''">$(DefineConstants);DownloadUrl=$(DownloadUrl.Replace(`{version}`, `$(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber)`).Replace(`{arch}`, `$(ArchName)`).Replace(`{releasename}`, `$(ReleaseLevelName)`).Replace(`{msi}`, `{2}`))</DefineConstants> <DefineConstants Condition="'$(DownloadUrl)' == ''">$(DefineConstants);DownloadUrl={2}</DefineConstants> </PropertyGroup> diff --git a/Tools/msi/uploadrelease.proj b/Tools/msi/uploadrelease.proj index ec4ede5..0d472de 100644 --- a/Tools/msi/uploadrelease.proj +++ b/Tools/msi/uploadrelease.proj @@ -16,7 +16,7 @@ <PropertyGroup> <EXETarget>$(DownloadUrlBase.TrimEnd(`/`))/$(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber)</EXETarget> - <MSITarget>$(DownloadUrl.TrimEnd(`/`))</MSITarget> + <MSITarget>$(DownloadUrl.Replace(`{version}`, `$(MajorVersionNumber).$(MinorVersionNumber).$(MicroVersionNumber)`).Replace(`{arch}`, `$(ArchName)`).Replace(`{releasename}`, `$(ReleaseLevelName)`).Replace(`{msi}`, ``).TrimEnd(`/`))</MSITarget> </PropertyGroup> <ItemGroup> |