Skip to content

Commit 89fc3ca

Browse files
zoobazooba
committed
Make bdist_wininst build only on demand
1 parent 1f6c29a commit 89fc3ca

File tree

11 files changed

+37
-745
lines changed

11 files changed

+37
-745
lines changed

PCbuild/bdist_wininst.vcxproj renamed to PC/bdist_wininst/bdist_wininst.vcxproj

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<MakeVersionInfoBeforeTarget>ClCompile</MakeVersionInfoBeforeTarget>
4141
<SupportPGO>false</SupportPGO>
4242
</PropertyGroup>
43-
<Import Project="python.props" />
43+
<Import Project="..\..\PCBuild\python.props" />
4444
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
4545
<PropertyGroup Label="Configuration">
4646
<ConfigurationType>Application</ConfigurationType>
@@ -52,7 +52,7 @@
5252
</ImportGroup>
5353
<ImportGroup Label="PropertySheets">
5454
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
55-
<Import Project="pyproject.props" />
55+
<Import Project="..\..\PCBuild\pyproject.props" />
5656
</ImportGroup>
5757
<PropertyGroup>
5858
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
@@ -68,7 +68,7 @@
6868
</Midl>
6969
<ClCompile>
7070
<Optimization>MinSpace</Optimization>
71-
<AdditionalIncludeDirectories>$(PySourcePath)PC\bdist_wininst;$(PySourcePath)Modules\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
71+
<AdditionalIncludeDirectories>$(PySourcePath)Modules\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
7272
<PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7373
</ClCompile>
7474
<ResourceCompile>
@@ -79,23 +79,23 @@
7979
</Link>
8080
</ItemDefinitionGroup>
8181
<ItemGroup>
82-
<ClCompile Include="..\PC\bdist_wininst\extract.c" />
83-
<ClCompile Include="..\PC\bdist_wininst\install.c" />
84-
<ClCompile Include="..\Modules\zlib\adler32.c" />
85-
<ClCompile Include="..\Modules\zlib\crc32.c" />
86-
<ClCompile Include="..\Modules\zlib\inffast.c" />
87-
<ClCompile Include="..\Modules\zlib\inflate.c" />
88-
<ClCompile Include="..\Modules\zlib\inftrees.c" />
89-
<ClCompile Include="..\Modules\zlib\zutil.c" />
82+
<ClCompile Include="extract.c" />
83+
<ClCompile Include="install.c" />
84+
<ClCompile Include="..\..\Modules\zlib\adler32.c" />
85+
<ClCompile Include="..\..\Modules\zlib\crc32.c" />
86+
<ClCompile Include="..\..\Modules\zlib\inffast.c" />
87+
<ClCompile Include="..\..\Modules\zlib\inflate.c" />
88+
<ClCompile Include="..\..\Modules\zlib\inftrees.c" />
89+
<ClCompile Include="..\..\Modules\zlib\zutil.c" />
9090
</ItemGroup>
9191
<ItemGroup>
92-
<ClInclude Include="..\PC\bdist_wininst\archive.h" />
92+
<ClInclude Include="archive.h" />
9393
</ItemGroup>
9494
<ItemGroup>
95-
<ResourceCompile Include="..\PC\bdist_wininst\install.rc" />
95+
<ResourceCompile Include="install.rc" />
9696
</ItemGroup>
9797
<ItemGroup>
98-
<None Include="..\PC\bdist_wininst\PythonPowered.bmp" />
98+
<None Include="PythonPowered.bmp" />
9999
</ItemGroup>
100100
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
101101
<ImportGroup Label="ExtensionTargets">

PCbuild/bdist_wininst.vcxproj.filters renamed to PC/bdist_wininst/bdist_wininst.vcxproj.filters

File renamed without changes.

‎PC/bdist_wininst/build.bat‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
@echo off
2+
setlocal
3+
4+
set D=%~dp0
5+
set PCBUILD=%~dp0..\..\PCBuild\
6+
7+
8+
echo Building Lib\distutils\command\wininst-xx.0.exe
9+
10+
call "%PCBUILD%env.bat" x86
11+
if errorlevel 1 goto :eof
12+
13+
msbuild "%D%bdist_wininst.vcxproj" "/p:SolutionDir=%PCBUILD%\" /p:Configuration=Release /p:Platform=Win32
14+
if errorlevel 1 goto :eof
15+
16+
17+
echo Building Lib\distutils\command\wininst-xx.0-amd64.exe
18+
19+
call "%PCBUILD%env.bat" x86_amd64
20+
if errorlevel 1 goto :eof
21+
22+
msbuild "%D%bdist_wininst.vcxproj" "/p:SolutionDir=%PCBUILD%\" /p:Configuration=Release /p:Platform=x64

‎PC/bdist_wininst/wininst-7.1.sln‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎PC/bdist_wininst/wininst-7.1.vcproj‎

Lines changed: 0 additions & 214 deletions
This file was deleted.

‎PC/bdist_wininst/wininst-8.sln‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)