diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-11-22 18:20:11 -0800 |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-11-22 18:20:11 -0800 |
| commit | 10fa83cb77299edb6feeaff2f6d0fe44a674ca4f (patch) | |
| tree | 5612035e0da6cf1a5e53230ecaf3b2a11c4269c7 | |
| parent | 8f576d961910020cd27f5cb266a3c92bafc4f6cd (diff) | |
| download | cpython-git-10fa83cb77299edb6feeaff2f6d0fe44a674ca4f.tar.gz | |
Fixes upload directories for Windows installer.
| -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 57ca1dcfe1..aeeff3b710 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 ec4ede5950..0d472dea54 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> |