diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2018-01-09 08:14:46 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-09 08:14:46 (GMT) |
| commit | d135f20ae8887acc7716561bc8f4c7eb6d58d24c (patch) | |
| tree | 8c988503dc2f0f2dc757442a073c06b7a9a16078 /Tools/msi/bundle/packagegroups | |
| parent | ca0c5f26563349ed761af13590acef80e1064eab (diff) | |
| download | cpython-d135f20ae8887acc7716561bc8f4c7eb6d58d24c.zip cpython-d135f20ae8887acc7716561bc8f4c7eb6d58d24c.tar.gz cpython-d135f20ae8887acc7716561bc8f4c7eb6d58d24c.tar.bz2 | |
bpo-32507: Change Windows install to include app-local UCRT (#5119)
Diffstat (limited to 'Tools/msi/bundle/packagegroups')
| -rw-r--r-- | Tools/msi/bundle/packagegroups/crt.wxs | 50 |
1 files changed, 12 insertions, 38 deletions
diff --git a/Tools/msi/bundle/packagegroups/crt.wxs b/Tools/msi/bundle/packagegroups/crt.wxs index dc40475..61b756f 100644 --- a/Tools/msi/bundle/packagegroups/crt.wxs +++ b/Tools/msi/bundle/packagegroups/crt.wxs @@ -2,48 +2,22 @@ <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> <PackageGroup Id="crt"> - <PackageGroupRef Id="crt_14.0_v6.0" /> - <PackageGroupRef Id="crt_14.0_v6.1" /> - <PackageGroupRef Id="crt_14.0_v6.2" /> - <PackageGroupRef Id="crt_14.0_v6.3" /> - </PackageGroup> - </Fragment> - - <?foreach ver in v6.0;v6.1;v6.2;v6.3 ?> - <?if "$(var.ver)" = "v6.0" ?> - <?define msuver=6.0 ?> - <?elseif "$(var.ver)" = "v6.1" ?> - <?define msuver=6.1 ?> - <?elseif "$(var.ver)" = "v6.2" ?> - <?define msuver=8-RT ?> - <?elseif "$(var.ver)" = "v6.3" ?> - <?define msuver=8.1 ?> - <?else ?> - <?error unknown version $(var.ver) ?> - <?endif ?> - - <Fragment> - <PackageGroup Id="crt_14.0_$(var.ver)"> - <MsuPackage Id="crt_14.0_$(var.ver)_x86" - KB="2999226" - SourceFile="!(bindpath.redist)\Windows$(var.msuver)-KB2999226-x86.msu" - DisplayName="!(loc.CRTDescription)" - Description="!(loc.CRTDescription)" + <MsiPackage Id="ucrt_AllUsers" + SourceFile="ucrt.msi" Compressed="$(var.CompressMSI)" DownloadUrl="$(var.DownloadUrl)" - InstallCondition="not CRTInstalled and VersionNT = $(var.ver) and not VersionNT64 and (Include_core or Include_exe or Include_launcher or Include_pip) and not LauncherOnly" /> - - <MsuPackage Id="crt_14.0_$(var.ver)_x64" - KB="2999226" - SourceFile="!(bindpath.redist)\Windows$(var.msuver)-KB2999226-x64.msu" - DisplayName="!(loc.CRTDescription)" - Description="!(loc.CRTDescription)" + ForcePerMachine="yes" + InstallCondition="InstallAllUsers and not CRTInstalled and (Include_core or Include_exe or Include_pip) and not LauncherOnly"> + <MsiProperty Name="TARGETDIR" Value="[TargetDir]" /> + </MsiPackage> + <MsiPackage Id="ucrt_JustForMe" + SourceFile="ucrt.msi" Compressed="$(var.CompressMSI)" DownloadUrl="$(var.DownloadUrl)" - InstallCondition="not CRTInstalled and VersionNT64 = $(var.ver) and (Include_core or Include_exe or Include_launcher or Include_pip) and not LauncherOnly" /> + ForcePerMachine="no" + InstallCondition="not InstallAllUsers and not CRTInstalled and (Include_core or Include_exe or Include_pip) and not LauncherOnly"> + <MsiProperty Name="TARGETDIR" Value="[TargetDir]" /> + </MsiPackage> </PackageGroup> </Fragment> - - <?undef msuver ?> - <?endforeach ?> </Wix>
\ No newline at end of file |