Issue #28110: launcher.msi has different product codes between 32-bit and 64-bit
This commit is contained in:
commit
f4fc1d12ec
|
@ -77,6 +77,9 @@ Library
|
|||
Windows
|
||||
-------
|
||||
|
||||
- Issue #28110: launcher.msi has different product codes between 32-bit and
|
||||
64-bit
|
||||
|
||||
- Issue #28161: Opening CON for write access fails
|
||||
|
||||
- Issue #28162: WindowsConsoleIO readall() fails if first line starts with
|
||||
|
|
|
@ -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" />
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Reference in New Issue