diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-03-01 03:53:50 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-03-01 03:53:50 (GMT) |
| commit | e4969f5df832eb8f626544d38ee11b75b52b4aee (patch) | |
| tree | 224c8c8914af9b5821b9ea344a15895632728bd4 /Tools/msi/bundle/packagegroups | |
| parent | a473b9da152d4cdd10eccc6d8eafa2b519da121d (diff) | |
| download | cpython-e4969f5df832eb8f626544d38ee11b75b52b4aee.zip cpython-e4969f5df832eb8f626544d38ee11b75b52b4aee.tar.gz cpython-e4969f5df832eb8f626544d38ee11b75b52b4aee.tar.bz2 | |
Updates CRT installation for Windows installer.
Bundling versions of the CRT prior to 14.0 is no longer supported.
Diffstat (limited to 'Tools/msi/bundle/packagegroups')
| -rw-r--r-- | Tools/msi/bundle/packagegroups/crt.wxs | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/Tools/msi/bundle/packagegroups/crt.wxs b/Tools/msi/bundle/packagegroups/crt.wxs index e19b4f9..b079700 100644 --- a/Tools/msi/bundle/packagegroups/crt.wxs +++ b/Tools/msi/bundle/packagegroups/crt.wxs @@ -2,6 +2,11 @@ <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" /> + <MsiPackage Id="crt_AllUsers" SourceFile="crt.msi" Compressed="$(var.CompressMSI)" @@ -22,4 +27,42 @@ </MsiPackage> </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)" + 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)" /> + + <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)" + 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)" /> + </PackageGroup> + </Fragment> + + <?undef msuver ?> + <?endforeach ?> </Wix>
\ No newline at end of file |