diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2016-09-17 23:13:59 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2016-09-17 23:13:59 (GMT) |
| commit | 7358efa50bcbad1b48610fc0f96e01d8a8c519ae (patch) | |
| tree | 7eca82f79fbc3c4560793a00b5b26b1b20d60256 /Tools/msi | |
| parent | a7b1058c173c793d84b9f6849e64e08ad67f0cde (diff) | |
| parent | 1c75c18ed2242a9e274eea11815c67fe8a67df40 (diff) | |
| download | cpython-7358efa50bcbad1b48610fc0f96e01d8a8c519ae.zip cpython-7358efa50bcbad1b48610fc0f96e01d8a8c519ae.tar.gz cpython-7358efa50bcbad1b48610fc0f96e01d8a8c519ae.tar.bz2 | |
Issue #28110: launcher.msi has different product codes between 32-bit and 64-bit
Diffstat (limited to 'Tools/msi')
| -rw-r--r-- | Tools/msi/bundle/bundle.targets | 10 | ||||
| -rw-r--r-- | Tools/msi/bundle/packagegroups/launcher.wxs | 4 | ||||
| -rw-r--r-- | Tools/msi/make_zip.proj | 2 |
3 files changed, 3 insertions, 13 deletions
diff --git a/Tools/msi/bundle/bundle.targets b/Tools/msi/bundle/bundle.targets index aeeff3b..e0dae21 100644 --- a/Tools/msi/bundle/bundle.targets +++ b/Tools/msi/bundle/bundle.targets @@ -87,16 +87,6 @@ <MSBuild Projects="@(Package)" Targets="$(BuildPackagesTargets)" BuildInParallel="true" /> </Target> - <Target Name="BuildLauncher" BeforeTargets="BeforeBuild" Condition="'$(RebuildAll)' != 'false'"> - <!-- - Build the launcher MSI using Exec rather than MSBuild - Also, never use the test marker for the launcher. It's going to corrupt things anyway, so we'll - just disable it by default. - --> - <Exec Command='msbuild ..\launcher\launcher.wixproj /p:Platform=x86 /p:ReleaseUri="$(ReleaseUri)" /p:OutputPath="$(BuildPath.TrimEnd(`\`))" /p:OutputSuffix=$(Platform) /p:BuildForRelease=$(BuildForRelease) /p:UseTestMarker=false' - ContinueOnError="false" /> - </Target> - <Target Name="BuildBootstrapApplication" BeforeTargets="BeforeBuild"> <Message Text="Building bootstrap app" Importance="high" /> diff --git a/Tools/msi/bundle/packagegroups/launcher.wxs b/Tools/msi/bundle/packagegroups/launcher.wxs index 4444f45..7dae8ca 100644 --- a/Tools/msi/bundle/packagegroups/launcher.wxs +++ b/Tools/msi/bundle/packagegroups/launcher.wxs @@ -4,7 +4,7 @@ <PackageGroup Id="launcher"> <!-- The All Users launcher is always the 32-bit version --> <MsiPackage Id="launcher_AllUsers" - SourceFile="launcher.msi" + SourceFile="!(bindpath.build32)en-us\launcher.msi" Compressed="$(var.CompressMSI)" DownloadUrl="$(var.DownloadUrl)" ForcePerMachine="yes" @@ -14,7 +14,7 @@ InstallCondition="(InstallAllUsers or InstallLauncherAllUsers) and Include_launcher and not DetectedLauncher" /> <MsiPackage Id="launcher_JustForMe" - SourceFile="launcher.msi" + SourceFile="!(bindpath.build32)en-us\launcher.msi" Compressed="$(var.CompressMSI)" DownloadUrl="$(var.DownloadUrl)" ForcePerMachine="no" diff --git a/Tools/msi/make_zip.proj b/Tools/msi/make_zip.proj index 13f75ba..c411a48 100644 --- a/Tools/msi/make_zip.proj +++ b/Tools/msi/make_zip.proj @@ -16,7 +16,7 @@ <TargetPath>$(OutputPath)\en-us\$(TargetName)$(TargetExt)</TargetPath> <CleanCommand>rmdir /q/s "$(IntermediateOutputPath)\zip_$(ArchName)"</CleanCommand> <Arguments>"$(PythonExe)" "$(MSBuildThisFileDirectory)\make_zip.py"</Arguments> - <Arguments>$(Arguments) -e -o "$(TargetPath)" -t "$(IntermediateOutputPath)\zip_$(ArchName)" -b "$(OutDir.TrimEnd('\'))"</Arguments> + <Arguments>$(Arguments) -e -o "$(TargetPath)" -t "$(IntermediateOutputPath)\zip_$(ArchName)" -a "$(ArchName)"</Arguments> <Environment>set DOC_FILENAME=python$(PythonVersion).chm set VCREDIST_PATH=$(VS140COMNTOOLS)\..\..\VC\redist\$(Platform)\Microsoft.VC140.CRT</Environment> </PropertyGroup> |