Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 42a059b

Browse files
committed
Issue #24268: Adds PCBuild project to build _testmultiphase module.
1 parent f64b9d5 commit 42a059b

5 files changed

Lines changed: 131 additions & 1 deletion

File tree

PCbuild/_testmultiphase.vcxproj

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|x64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="PGInstrument|Win32">
13+
<Configuration>PGInstrument</Configuration>
14+
<Platform>Win32</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="PGInstrument|x64">
17+
<Configuration>PGInstrument</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
20+
<ProjectConfiguration Include="PGUpdate|Win32">
21+
<Configuration>PGUpdate</Configuration>
22+
<Platform>Win32</Platform>
23+
</ProjectConfiguration>
24+
<ProjectConfiguration Include="PGUpdate|x64">
25+
<Configuration>PGUpdate</Configuration>
26+
<Platform>x64</Platform>
27+
</ProjectConfiguration>
28+
<ProjectConfiguration Include="Release|Win32">
29+
<Configuration>Release</Configuration>
30+
<Platform>Win32</Platform>
31+
</ProjectConfiguration>
32+
<ProjectConfiguration Include="Release|x64">
33+
<Configuration>Release</Configuration>
34+
<Platform>x64</Platform>
35+
</ProjectConfiguration>
36+
</ItemGroup>
37+
<PropertyGroup Label="Globals">
38+
<ProjectGuid>{16BFE6F0-22EF-40B5-B831-7E937119EF10}</ProjectGuid>
39+
<Keyword>Win32Proj</Keyword>
40+
<RootNamespace>_testmultiphase</RootNamespace>
41+
<SupportPGO>false</SupportPGO>
42+
</PropertyGroup>
43+
<Import Project="python.props" />
44+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
45+
<PropertyGroup Label="Configuration">
46+
<ConfigurationType>DynamicLibrary</ConfigurationType>
47+
<CharacterSet>NotSet</CharacterSet>
48+
</PropertyGroup>
49+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
50+
<PropertyGroup>
51+
<TargetExt>.pyd</TargetExt>
52+
</PropertyGroup>
53+
<ImportGroup Label="ExtensionSettings">
54+
</ImportGroup>
55+
<ImportGroup Label="PropertySheets">
56+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
57+
<Import Project="pyproject.props" />
58+
</ImportGroup>
59+
<PropertyGroup Label="UserMacros" />
60+
<ItemDefinitionGroup>
61+
<ClCompile>
62+
<PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
63+
</ClCompile>
64+
<Link>
65+
<SubSystem>Console</SubSystem>
66+
</Link>
67+
</ItemDefinitionGroup>
68+
<ItemGroup>
69+
<ClCompile Include="..\Modules\_testmultiphase.c" />
70+
</ItemGroup>
71+
<ItemGroup>
72+
<ProjectReference Include="pythoncore.vcxproj">
73+
<Project>{cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}</Project>
74+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
75+
</ProjectReference>
76+
</ItemGroup>
77+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
78+
<ImportGroup Label="ExtensionTargets">
79+
</ImportGroup>
80+
</Project>
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<Filter Include="Source Files">
5+
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
6+
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
7+
</Filter>
8+
<Filter Include="Header Files">
9+
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
10+
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
11+
</Filter>
12+
<Filter Include="Resource Files">
13+
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
14+
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
15+
</Filter>
16+
</ItemGroup>
17+
<ItemGroup>
18+
<ClCompile Include="..\Modules\_testmultiphase.c">
19+
<Filter>Source Files</Filter>
20+
</ClCompile>
21+
</ItemGroup>
22+
</Project>

PCbuild/pcbuild.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<ExtensionModules Include="_ssl;_hashlib" Condition="$(IncludeSSL)" />
4747
<Projects Include="@(ExtensionModules->'%(Identity).vcxproj')" Condition="$(IncludeExtensions)" />
4848
<!-- Test modules -->
49-
<TestModules Include="_ctypes_test;_testbuffer;_testcapi;_testembed;_testimportmultiple" />
49+
<TestModules Include="_ctypes_test;_testbuffer;_testcapi;_testembed;_testimportmultiple;_testmultiphase" />
5050
<TestModules Include="xxlimited" Condition="'$(Configuration)' == 'Release'" />
5151
<Projects Include="@(TestModules->'%(Identity).vcxproj')" Condition="$(IncludeTests)">
5252
<!-- Disable parallel build for test modules -->

PCbuild/pcbuild.sln

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_overlapped", "_overlapped.
7272
EndProject
7373
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testembed", "_testembed.vcxproj", "{6DAC66D9-E703-4624-BE03-49112AB5AA62}"
7474
EndProject
75+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testmultiphase", "_testmultiphase.vcxproj", "{16BFE6F0-22EF-40B5-B831-7E937119EF10}"
76+
EndProject
7577
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tcl", "tcl.vcxproj", "{B5FD6F1D-129E-4BFF-9340-03606FAC7283}"
7678
EndProject
7779
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tix", "tix.vcxproj", "{C5A3E7FB-9695-4B2E-960B-1D9F43F1E555}"
@@ -588,6 +590,20 @@ Global
588590
{6DAC66D9-E703-4624-BE03-49112AB5AA62}.Release|Win32.Build.0 = Release|Win32
589591
{6DAC66D9-E703-4624-BE03-49112AB5AA62}.Release|x64.ActiveCfg = Release|x64
590592
{6DAC66D9-E703-4624-BE03-49112AB5AA62}.Release|x64.Build.0 = Release|x64
593+
{16BFE6F0-22EF-40B5-B831-7E937119EF10}.Debug|Win32.ActiveCfg = Debug|Win32
594+
{16BFE6F0-22EF-40B5-B831-7E937119EF10}.Debug|Win32.Build.0 = Debug|Win32
595+
{16BFE6F0-22EF-40B5-B831-7E937119EF10}.Debug|x64.ActiveCfg = Debug|x64
596+
{16BFE6F0-22EF-40B5-B831-7E937119EF10}.Debug|x64.Build.0 = Debug|x64
597+
{16BFE6F0-22EF-40B5-B831-7E937119EF10}.PGInstrument|Win32.ActiveCfg = Release|Win32
598+
{16BFE6F0-22EF-40B5-B831-7E937119EF10}.PGInstrument|x64.ActiveCfg = Release|x64
599+
{16BFE6F0-22EF-40B5-B831-7E937119EF10}.PGUpdate|Win32.ActiveCfg = Release|Win32
600+
{16BFE6F0-22EF-40B5-B831-7E937119EF10}.PGUpdate|Win32.Build.0 = Release|Win32
601+
{16BFE6F0-22EF-40B5-B831-7E937119EF10}.PGUpdate|x64.ActiveCfg = Release|x64
602+
{16BFE6F0-22EF-40B5-B831-7E937119EF10}.PGUpdate|x64.Build.0 = Release|x64
603+
{16BFE6F0-22EF-40B5-B831-7E937119EF10}.Release|Win32.ActiveCfg = Release|Win32
604+
{16BFE6F0-22EF-40B5-B831-7E937119EF10}.Release|Win32.Build.0 = Release|Win32
605+
{16BFE6F0-22EF-40B5-B831-7E937119EF10}.Release|x64.ActiveCfg = Release|x64
606+
{16BFE6F0-22EF-40B5-B831-7E937119EF10}.Release|x64.Build.0 = Release|x64
591607
{B5FD6F1D-129E-4BFF-9340-03606FAC7283}.Debug|Win32.ActiveCfg = Debug|Win32
592608
{B5FD6F1D-129E-4BFF-9340-03606FAC7283}.Debug|Win32.Build.0 = Debug|Win32
593609
{B5FD6F1D-129E-4BFF-9340-03606FAC7283}.Debug|x64.ActiveCfg = Debug|x64

Tools/msi/test/test_files.wxs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
<Component Id="_testimportmultiple.pyd" Directory="DLLs" Guid="*">
1515
<File Id="_testimportmultiple.pyd" Name="_testimportmultiple.pyd" KeyPath="yes" />
1616
</Component>
17+
<Component Id="_testmultiphase.pyd" Directory="DLLs" Guid="*">
18+
<File Id="_testmultiphase.pyd" Name="_testmultiphase.pyd" KeyPath="yes" />
19+
</Component>
1720
</ComponentGroup>
1821
</Fragment>
1922

@@ -31,6 +34,9 @@
3134
<Component Id="_testimportmultiple.pdb" Directory="DLLs" Guid="*">
3235
<File Id="_testimportmultiple.pdb" Name="_testimportmultiple.pdb" />
3336
</Component>
37+
<Component Id="_testmultiphase.pdb" Directory="DLLs" Guid="*">
38+
<File Id="_testmultiphase.pdb" Name="_testmultiphase.pdb" />
39+
</Component>
3440
</ComponentGroup>
3541
</Fragment>
3642

@@ -48,6 +54,9 @@
4854
<Component Id="_testimportmultiple_d.pyd" Directory="DLLs" Guid="*">
4955
<File Id="_testimportmultiple_d.pyd" Name="_testimportmultiple_d.pyd" />
5056
</Component>
57+
<Component Id="_testmultiphase_d.pyd" Directory="DLLs" Guid="*">
58+
<File Id="_testmultiphase_d.pyd" Name="_testmultiphase_d.pyd" />
59+
</Component>
5160
<Component Id="_testcapi_d.pdb" Directory="DLLs" Guid="*">
5261
<File Id="_testcapi_d.pdb" Name="_testcapi_d.pdb" />
5362
</Component>
@@ -60,6 +69,9 @@
6069
<Component Id="_testimportmultiple_d.pdb" Directory="DLLs" Guid="*">
6170
<File Id="_testimportmultiple_d.pdb" Name="_testimportmultiple_d.pdb" />
6271
</Component>
72+
<Component Id="_testmultiphase_d.pdb" Directory="DLLs" Guid="*">
73+
<File Id="_testmultiphase_d.pdb" Name="_testmultiphase_d.pdb" />
74+
</Component>
6375
</ComponentGroup>
6476
</Fragment>
6577
</Wix>

0 commit comments

Comments
 (0)