From 6492277e39dbe7dd77d32fdc9ae4b989213ef3c6 Mon Sep 17 00:00:00 2001 From: Adam Johnson <AdamJohnso@gmail.com> Date: Wed, 9 Sep 2020 20:15:58 -0400 Subject: [PATCH 5/6] only build required projects strips out tests and unsupported externals (eg tkinter). --- PCbuild/_ssl.vcxproj | 2 +- PCbuild/pcbuild.proj | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj index 4dffa202b7..e661cb6fb6 100644 --- a/PCbuild/_ssl.vcxproj +++ b/PCbuild/_ssl.vcxproj @@ -111,7 +111,7 @@ <Project>{cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}</Project> <ReferenceOutputAssembly>false</ReferenceOutputAssembly> </ProjectReference> - <ProjectReference Include="_socket.vcxproj"> + <ProjectReference Condition="false" Include="_socket.vcxproj"> <Project>{86937f53-c189-40ef-8ce8-8759d8e7d480}</Project> <ReferenceOutputAssembly>false</ReferenceOutputAssembly> </ProjectReference> diff --git a/PCbuild/pcbuild.proj b/PCbuild/pcbuild.proj index 4d416c589e..ede9868a8f 100644 --- a/PCbuild/pcbuild.proj +++ b/PCbuild/pcbuild.proj @@ -45,21 +45,21 @@ <BuildInParallel>false</BuildInParallel> </Projects> <!-- python3.dll --> - <Projects Include="python3dll.vcxproj" /> + <Projects Include="python3dll.vcxproj" Condition="false" /> <!-- py[w].exe --> - <Projects Include="pylauncher.vcxproj;pywlauncher.vcxproj" /> + <Projects Include="pylauncher.vcxproj;pywlauncher.vcxproj" Condition="false" /> <!-- pyshellext.dll --> - <Projects Include="pyshellext.vcxproj" /> + <Projects Include="pyshellext.vcxproj" Condition="false" /> <!-- Extension modules --> <ExtensionModules Include="_asyncio;_zoneinfo;_decimal;_elementtree;_msi;_multiprocessing;_overlapped;pyexpat;_queue;select;unicodedata;winsound;_uuid" /> <ExtensionModules Include="_ctypes" Condition="$(IncludeCTypes)" /> <!-- Extension modules that require external sources --> <ExternalModules Include="_bz2;_lzma;_sqlite3" /> <!-- venv launchers --> - <Projects Include="venvlauncher.vcxproj;venvwlauncher.vcxproj" /> - <!-- _ssl will build _socket as well, which may cause conflicts in parallel builds --> - <ExtensionModules Include="_socket" Condition="!$(IncludeSSL) or !$(IncludeExternals)" /> - <ExternalModules Include="_ssl;_hashlib" Condition="$(IncludeSSL)" /> + <Projects Include="venvlauncher.vcxproj;venvwlauncher.vcxproj" Condition="false" /> + <!-- _ssl will NOT build _socket as well --> + <ExtensionModules Include="_socket" Condition="true" /> + <ExternalModules Include="_ssl;_hashlib" Condition="true" /> <ExternalModules Include="_tkinter" Condition="$(IncludeTkinter) and $(Platform) != 'ARM' and $(Platform) != 'ARM64'" /> <ExtensionModules Include="@(ExternalModules->'%(Identity)')" Condition="$(IncludeExternals)" /> <Projects Include="@(ExtensionModules->'%(Identity).vcxproj')" Condition="$(IncludeExtensions)" /> -- 2.28.0.windows.1