Issue #23260: Update Windows installer

7 files changed, 154 insertions, 0 deletions

diff --git a/Tools/msi/test/test.props b/Tools/msi/test/test.props
new file mode 100644
index 0000000..d269107
--- /dev/null
+++ b/Tools/msi/test/test.props
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <Import Project="..\msi.props" />
+    <ItemGroup>
+        <Compile Include="*.wxs" />
+    </ItemGroup>
+    <ItemGroup>
+        <EmbeddedResource Include="*.wxl" />
+    </ItemGroup>
+    <ItemGroup>
+        <InstallFiles Include="$(PySourcePath)Lib\test\**\*"
+                      Exclude="$(PySourcePath)Lib\**\*.pyc;$(PySourcePath)Lib\**\*.pyo">
+            <SourceBase>$(PySourcePath)</SourceBase>
+            <Source>!(bindpath.src)</Source>
+            <TargetBase>$(PySourcePath)</TargetBase>
+            <Target_></Target_>
+            <Group>test_py</Group>
+        </InstallFiles>
+    </ItemGroup>
+    
+    <Import Project="..\msi.targets" />
+</Project>
\ No newline at end of file
diff --git a/Tools/msi/test/test.wixproj b/Tools/msi/test/test.wixproj
new file mode 100644
index 0000000..d747cc0
--- /dev/null
+++ b/Tools/msi/test/test.wixproj
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <ProjectGuid>{DE0B7CC2-4358-4131-B3F4-C31C7F2CD468}</ProjectGuid>
+        <SchemaVersion>2.0</SchemaVersion>
+        <OutputName>test</OutputName>
+        <OutputType>Package</OutputType>
+        <DefineConstants>IncludeDefaultFeature=1;$(DefineConstants)</DefineConstants>
+    </PropertyGroup>
+    <Import Project="test.props" />
+</Project>
\ No newline at end of file
diff --git a/Tools/msi/test/test.wxs b/Tools/msi/test/test.wxs
new file mode 100644
index 0000000..d4ac33f
--- /dev/null
+++ b/Tools/msi/test/test.wxs
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Product Id="*" Language="!(loc.LCID)" Name="!(loc.Title)" Version="$(var.Version)" Manufacturer="!(loc.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
+        <Package InstallerVersion="300" Compressed="yes" InstallScope="perUser" Platform="$(var.Platform)" />
+        <MediaTemplate EmbedCab="yes" CompressionLevel="high" />
+        
+        <PropertyRef Id="UpgradeTable" />
+        <PropertyRef Id="REGISTRYKEY" />
+        
+        <?ifdef IncludeDefaultFeature ?>
+        <Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)">
+            <ComponentGroupRef Id="test_py" />
+            <ComponentGroupRef Id="test_extensions" />
+        </Feature>
+        <?endif ?>
+        <?ifdef IncludeSymbols ?>
+        <Feature Id="Symbols" AllowAdvertise="no" Title="!(loc.TitlePdb)" Description="!(loc.DescriptionPdb)">
+            <ComponentGroupRef Id="test_extensions_symbols" />
+        </Feature>
+        <?endif ?>
+        <?ifdef IncludeDebugBinaries ?>
+        <Feature Id="DebugBinaries" AllowAdvertise="no" Title="!(loc.Title_d)" Description="!(loc.Description_d)">
+            <ComponentGroupRef Id="test_extensions_d" />
+        </Feature>
+        <?endif ?>
+    </Product>
+</Wix>
diff --git a/Tools/msi/test/test_d.wixproj b/Tools/msi/test/test_d.wixproj
new file mode 100644
index 0000000..84d4313
--- /dev/null
+++ b/Tools/msi/test/test_d.wixproj
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <ProjectGuid>{41F5AE8D-24CD-4D03-BE75-AA6F7FAB4097}</ProjectGuid>
+        <SchemaVersion>2.0</SchemaVersion>
+        <OutputName>test_d</OutputName>
+        <OutputType>Package</OutputType>
+        <DefineConstants>IncludeDebugBinaries=1;$(DefineConstants)</DefineConstants>
+    </PropertyGroup>
+    <Import Project="test.props" />
+</Project>
\ No newline at end of file
diff --git a/Tools/msi/test/test_en-US.wxl b/Tools/msi/test/test_en-US.wxl
new file mode 100644
index 0000000..e615c7a
--- /dev/null
+++ b/Tools/msi/test/test_en-US.wxl
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WixLocalization Culture="en-us" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+    <String Id="Descriptor">Test Suite</String>
+    <String Id="ShortDescriptor">test</String>
+    <String Id="NativeModulesTitle">!(loc.FullProductName) native libtest</String>
+    <String Id="NativeModulesDescription">!(loc.ProductName) Native Test Modules</String>
+</WixLocalization>
diff --git a/Tools/msi/test/test_files.wxs b/Tools/msi/test/test_files.wxs
new file mode 100644
index 0000000..2d5f593
--- /dev/null
+++ b/Tools/msi/test/test_files.wxs
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Fragment>
+        <ComponentGroup Id="test_extensions">
+            <Component Id="_testcapi.pyd" Directory="DLLs" Guid="*">
+                <File Id="_testcapi.pyd" Name="_testcapi.pyd" KeyPath="yes" />
+            </Component>
+            <Component Id="_ctypes_test.pyd" Directory="DLLs" Guid="*">
+                <File Id="_ctypes_test.pyd" Name="_ctypes_test.pyd" KeyPath="yes" />
+            </Component>
+            <Component Id="_testbuffer.pyd" Directory="DLLs" Guid="*">
+                <File Id="_testbuffer.pyd" Name="_testbuffer.pyd" KeyPath="yes" />
+            </Component>
+            <Component Id="_testimportmultiple.pyd" Directory="DLLs" Guid="*">
+                <File Id="_testimportmultiple.pyd" Name="_testimportmultiple.pyd" KeyPath="yes" />
+            </Component>
+        </ComponentGroup>
+    </Fragment>
+    
+    <Fragment>
+        <ComponentGroup Id="test_extensions_symbols">
+            <Component Id="_testcapi.pdb" Directory="DLLs" Guid="*">
+                <File Id="_testcapi.pdb" Name="_testcapi.pdb" />
+            </Component>
+            <Component Id="_ctypes_test.pdb" Directory="DLLs" Guid="*">
+                <File Id="_ctypes_test.pdb" Name="_ctypes_test.pdb" />
+            </Component>
+            <Component Id="_testbuffer.pdb" Directory="DLLs" Guid="*">
+                <File Id="_testbuffer.pdb" Name="_testbuffer.pdb" />
+            </Component>
+            <Component Id="_testimportmultiple.pdb" Directory="DLLs" Guid="*">
+                <File Id="_testimportmultiple.pdb" Name="_testimportmultiple.pdb" />
+            </Component>
+        </ComponentGroup>
+    </Fragment>
+    
+    <Fragment>
+        <ComponentGroup Id="test_extensions_d">
+            <Component Id="_testcapi_d.pyd" Directory="DLLs" Guid="*">
+                <File Id="_testcapi_d.pyd" Name="_testcapi_d.pyd" />
+            </Component>
+            <Component Id="_ctypes_test_d.pyd" Directory="DLLs" Guid="*">
+                <File Id="_ctypes_test_d.pyd" Name="_ctypes_test_d.pyd" />
+            </Component>
+            <Component Id="_testbuffer_d.pyd" Directory="DLLs" Guid="*">
+                <File Id="_testbuffer_d.pyd" Name="_testbuffer_d.pyd" />
+            </Component>
+            <Component Id="_testimportmultiple_d.pyd" Directory="DLLs" Guid="*">
+                <File Id="_testimportmultiple_d.pyd" Name="_testimportmultiple_d.pyd" />
+            </Component>
+            <Component Id="_testcapi_d.pdb" Directory="DLLs" Guid="*">
+                <File Id="_testcapi_d.pdb" Name="_testcapi_d.pdb" />
+            </Component>
+            <Component Id="_ctypes_test_d.pdb" Directory="DLLs" Guid="*">
+                <File Id="_ctypes_test_d.pdb" Name="_ctypes_test_d.pdb" />
+            </Component>
+            <Component Id="_testbuffer_d.pdb" Directory="DLLs" Guid="*">
+                <File Id="_testbuffer_d.pdb" Name="_testbuffer_d.pdb" />
+            </Component>
+            <Component Id="_testimportmultiple_d.pdb" Directory="DLLs" Guid="*">
+                <File Id="_testimportmultiple_d.pdb" Name="_testimportmultiple_d.pdb" />
+            </Component>
+        </ComponentGroup>
+    </Fragment>
+</Wix>
diff --git a/Tools/msi/test/test_pdb.wixproj b/Tools/msi/test/test_pdb.wixproj
new file mode 100644
index 0000000..d607a47
--- /dev/null
+++ b/Tools/msi/test/test_pdb.wixproj
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <ProjectGuid>{7CF48ADD-CFAA-499F-9A05-BA18440A3344}</ProjectGuid>
+        <SchemaVersion>2.0</SchemaVersion>
+        <OutputName>test_pdb</OutputName>
+        <OutputType>Package</OutputType>
+        <DefineConstants>IncludeSymbols=1;$(DefineConstants)</DefineConstants>
+    </PropertyGroup>
+    <Import Project="test.props" />
+</Project>
\ No newline at end of file