Skip to content

Commit d490586

Browse files
pgansslepganssle
committed
fixup! Add Windows build support
1 parent 44b3135 commit d490586

File tree

8 files changed

+130
-6
lines changed

8 files changed

+130
-6
lines changed

‎PCbuild/_czoneinfo.vcxproj

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
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|ARM">
5+
<Configuration>Debug</Configuration>
6+
<Platform>ARM</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|ARM64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>ARM64</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Debug|Win32">
13+
<Configuration>Debug</Configuration>
14+
<Platform>Win32</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Debug|x64">
17+
<Configuration>Debug</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
20+
<ProjectConfiguration Include="PGInstrument|ARM">
21+
<Configuration>PGInstrument</Configuration>
22+
<Platform>ARM</Platform>
23+
</ProjectConfiguration>
24+
<ProjectConfiguration Include="PGInstrument|ARM64">
25+
<Configuration>PGInstrument</Configuration>
26+
<Platform>ARM64</Platform>
27+
</ProjectConfiguration>
28+
<ProjectConfiguration Include="PGInstrument|Win32">
29+
<Configuration>PGInstrument</Configuration>
30+
<Platform>Win32</Platform>
31+
</ProjectConfiguration>
32+
<ProjectConfiguration Include="PGInstrument|x64">
33+
<Configuration>PGInstrument</Configuration>
34+
<Platform>x64</Platform>
35+
</ProjectConfiguration>
36+
<ProjectConfiguration Include="PGUpdate|ARM">
37+
<Configuration>PGUpdate</Configuration>
38+
<Platform>ARM</Platform>
39+
</ProjectConfiguration>
40+
<ProjectConfiguration Include="PGUpdate|ARM64">
41+
<Configuration>PGUpdate</Configuration>
42+
<Platform>ARM64</Platform>
43+
</ProjectConfiguration>
44+
<ProjectConfiguration Include="PGUpdate|Win32">
45+
<Configuration>PGUpdate</Configuration>
46+
<Platform>Win32</Platform>
47+
</ProjectConfiguration>
48+
<ProjectConfiguration Include="PGUpdate|x64">
49+
<Configuration>PGUpdate</Configuration>
50+
<Platform>x64</Platform>
51+
</ProjectConfiguration>
52+
<ProjectConfiguration Include="Release|ARM">
53+
<Configuration>Release</Configuration>
54+
<Platform>ARM</Platform>
55+
</ProjectConfiguration>
56+
<ProjectConfiguration Include="Release|ARM64">
57+
<Configuration>Release</Configuration>
58+
<Platform>ARM64</Platform>
59+
</ProjectConfiguration>
60+
<ProjectConfiguration Include="Release|Win32">
61+
<Configuration>Release</Configuration>
62+
<Platform>Win32</Platform>
63+
</ProjectConfiguration>
64+
<ProjectConfiguration Include="Release|x64">
65+
<Configuration>Release</Configuration>
66+
<Platform>x64</Platform>
67+
</ProjectConfiguration>
68+
</ItemGroup>
69+
<PropertyGroup Label="Globals">
70+
<ProjectGuid>{384C224A-7474-476E-A01B-750EA7DE918C}</ProjectGuid>
71+
<RootNamespace>_czoneinfo</RootNamespace>
72+
<Keyword>Win32Proj</Keyword>
73+
</PropertyGroup>
74+
<Import Project="python.props" />
75+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
76+
<PropertyGroup Label="Configuration">
77+
<ConfigurationType>DynamicLibrary</ConfigurationType>
78+
<CharacterSet>NotSet</CharacterSet>
79+
</PropertyGroup>
80+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
81+
<PropertyGroup>
82+
<TargetExt>.pyd</TargetExt>
83+
</PropertyGroup>
84+
<ImportGroup Label="ExtensionSettings">
85+
</ImportGroup>
86+
<ImportGroup Label="PropertySheets">
87+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
88+
<Import Project="pyproject.props" />
89+
</ImportGroup>
90+
<PropertyGroup Label="UserMacros" />
91+
<PropertyGroup>
92+
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
93+
</PropertyGroup>
94+
<ItemGroup>
95+
<ClCompile Include="..\Modules\zoneinfomodule.c" />
96+
</ItemGroup>
97+
<ItemGroup>
98+
<ResourceCompile Include="..\PC\python_nt.rc" />
99+
</ItemGroup>
100+
<ItemGroup>
101+
<ProjectReference Include="pythoncore.vcxproj">
102+
<Project>{cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}</Project>
103+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
104+
</ProjectReference>
105+
</ItemGroup>
106+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
107+
<ImportGroup Label="ExtensionTargets">
108+
</ImportGroup>
109+
</Project>

‎PCbuild/_czoneinfo.vcxproj.filters

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<ResourceCompile Include="..\PC\python_nt.rc" />
5+
</ItemGroup>
6+
<ItemGroup>
7+
<Filter Include="Source Files">
8+
<UniqueIdentifier>{2422278e-eeeb-4241-8182-433e2bc5a7fc}</UniqueIdentifier>
9+
</Filter>
10+
</ItemGroup>
11+
<ItemGroup>
12+
<ClCompile Include="..\Modules\zoneinfomodule.c">
13+
<Filter>Source Files</Filter>
14+
</ClCompile>
15+
</ItemGroup>
16+
</Project>

‎PCbuild/pcbuild.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<!-- pyshellext.dll -->
5252
<Projects Include="pyshellext.vcxproj" />
5353
<!-- Extension modules -->
54-
<ExtensionModules Include="_asyncio;_decimal;_elementtree;_msi;_multiprocessing;_overlapped;pyexpat;_queue;select;unicodedata;winsound" />
54+
<ExtensionModules Include="_asyncio;_czoneinfo;_decimal;_elementtree;_msi;_multiprocessing;_overlapped;pyexpat;_queue;select;unicodedata;winsound" />
5555
<ExtensionModules Include="_ctypes" Condition="$(IncludeCTypes)" />
5656
<!-- Extension modules that require external sources -->
5757
<ExternalModules Include="_bz2;_lzma;_sqlite3" />

‎PCbuild/pcbuild.sln

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testconsole", "_testconsol
9191
EndProject
9292
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_asyncio", "_asyncio.vcxproj", "{384C224A-7474-476E-A01B-750EA7DE918C}"
9393
EndProject
94+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_czoneinfo", "_czoneinfo.vcxproj", "{384C224A-7474-476E-A01B-750EA7DE918C}"
95+
EndProject
9496
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_queue", "_queue.vcxproj", "{78D80A15-BD8C-44E2-B49E-1F05B0A0A687}"
9597
EndProject
9698
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblzma", "liblzma.vcxproj", "{12728250-16EC-4DC6-94D7-E21DD88947F8}"

‎PCbuild/pythoncore.vcxproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,6 @@
357357
<ClCompile Include="..\Modules\_tracemalloc.c" />
358358
<ClCompile Include="..\Modules\timemodule.c" />
359359
<ClCompile Include="..\Modules\xxsubtype.c" />
360-
<ClCompile Include="..\Modules\zoneinfomodule.c" />
361360
<ClCompile Include="..\Modules\_xxsubinterpretersmodule.c" />
362361
<ClCompile Include="..\Modules\_io\fileio.c" />
363362
<ClCompile Include="..\Modules\_io\bytesio.c" />

‎PCbuild/pythoncore.vcxproj.filters

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -743,9 +743,6 @@
743743
<ClCompile Include="..\Modules\zlibmodule.c">
744744
<Filter>Modules</Filter>
745745
</ClCompile>
746-
<ClCompile Include="..\Modules\zoneinfomodule.c">
747-
<Filter>Modules</Filter>
748-
</ClCompile>
749746
<ClCompile Include="..\Modules\_io\fileio.c">
750747
<Filter>Modules\_io</Filter>
751748
</ClCompile>

‎PCbuild/readme.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ library which are implemented in C; each one builds a DLL (renamed to
132132
_asyncio
133133
_ctypes
134134
_ctypes_test
135+
_czoneinfo
135136
_decimal
136137
_elementtree
137138
_hashlib

‎Tools/msi/lib/lib_files.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
3-
<?define exts=pyexpat;select;unicodedata;winsound;_bz2;_elementtree;_socket;_ssl;_msi;_ctypes;_hashlib;_multiprocessing;_lzma;_decimal;_overlapped;_sqlite3;_asyncio;_queue ?>
3+
<?define exts=pyexpat;select;unicodedata;winsound;_bz2;_elementtree;_socket;_ssl;_msi;_ctypes;_hashlib;_multiprocessing;_lzma;_decimal;_overlapped;_sqlite3;_asyncio;_queue;_czoneinfo ?>
44
<Fragment>
55
<DirectoryRef Id="Lib_venv_scripts_nt" />
66

0 commit comments

Comments
 (0)