From fe2a48c605d98ac02ab2b9593cb87ce364aeae2d Mon Sep 17 00:00:00 2001 From: Nikita Nemkin Date: Tue, 23 Jun 2020 23:41:49 +0500 Subject: [PATCH] bpo-41089: Filters and other issues in Visual Studio projects (GH-21070) * Add missing header files to pythoncore. * Add missing file filters ("Resource Files" in particular) to all projects. * Add new sub-filters for private headers in pythoncore and for 3rd party source files. * Add missing _zoneinfo configurations in pcbuild.sln. * Update bdist_wininst with the new zlib location. --- PC/bdist_wininst/bdist_wininst.vcxproj | 15 +- .../bdist_wininst.vcxproj.filters | 36 +- PCbuild/_asyncio.vcxproj.filters | 11 +- PCbuild/_bz2.vcxproj.filters | 39 +- PCbuild/_ctypes.vcxproj.filters | 7 +- PCbuild/_ctypes_test.vcxproj.filters | 8 + PCbuild/_decimal.vcxproj.filters | 100 ++-- PCbuild/_elementtree.vcxproj.filters | 52 ++- PCbuild/_freeze_importlib.vcxproj.filters | 17 +- PCbuild/_hashlib.vcxproj.filters | 8 + PCbuild/_lzma.vcxproj.filters | 8 + PCbuild/_msi.vcxproj.filters | 8 + PCbuild/_multiprocessing.vcxproj.filters | 8 + PCbuild/_overlapped.vcxproj.filters | 8 + PCbuild/_queue.vcxproj.filters | 11 +- PCbuild/_socket.vcxproj.filters | 8 + PCbuild/_sqlite3.vcxproj.filters | 8 + PCbuild/_ssl.vcxproj.filters | 7 +- PCbuild/_testbuffer.vcxproj.filters | 8 + PCbuild/_testcapi.vcxproj.filters | 8 + PCbuild/_testconsole.vcxproj.filters | 11 +- PCbuild/_testembed.vcxproj.filters | 9 +- PCbuild/_testimportmultiple.vcxproj.filters | 10 +- PCbuild/_testinternalcapi.vcxproj.filters | 10 +- PCbuild/_testmultiphase.vcxproj.filters | 9 +- PCbuild/_tkinter.vcxproj.filters | 8 + PCbuild/_uuid.vcxproj.filters | 8 + PCbuild/_zoneinfo.vcxproj.filters | 13 +- PCbuild/liblzma.vcxproj.filters | 435 ++++++++++++++++++ PCbuild/pcbuild.sln | 32 ++ PCbuild/pyexpat.vcxproj.filters | 10 +- PCbuild/pylauncher.vcxproj.filters | 4 - PCbuild/pyshellext.vcxproj.filters | 4 - PCbuild/python3dll.vcxproj.filters | 4 - PCbuild/python_uwp.vcxproj.filters | 26 ++ PCbuild/pythoncore.vcxproj | 3 + PCbuild/pythoncore.vcxproj.filters | 407 ++++++++-------- PCbuild/pythonw.vcxproj.filters | 10 +- PCbuild/pythonw_uwp.vcxproj.filters | 26 ++ PCbuild/pywlauncher.vcxproj.filters | 4 - PCbuild/select.vcxproj.filters | 8 + PCbuild/sqlite3.vcxproj.filters | 8 + PCbuild/unicodedata.vcxproj.filters | 8 + PCbuild/venvlauncher.vcxproj.filters | 26 ++ PCbuild/venvwlauncher.vcxproj.filters | 26 ++ PCbuild/winsound.vcxproj.filters | 8 + 46 files changed, 1154 insertions(+), 348 deletions(-) create mode 100644 PCbuild/liblzma.vcxproj.filters create mode 100644 PCbuild/python_uwp.vcxproj.filters create mode 100644 PCbuild/pythonw_uwp.vcxproj.filters create mode 100644 PCbuild/venvlauncher.vcxproj.filters create mode 100644 PCbuild/venvwlauncher.vcxproj.filters diff --git a/PC/bdist_wininst/bdist_wininst.vcxproj b/PC/bdist_wininst/bdist_wininst.vcxproj index d2f1bb75e30..390bf4e6272 100644 --- a/PC/bdist_wininst/bdist_wininst.vcxproj +++ b/PC/bdist_wininst/bdist_wininst.vcxproj @@ -87,7 +87,7 @@ MinSpace - $(PySourcePath)Modules\zlib;%(AdditionalIncludeDirectories) + $(zlibDir);%(AdditionalIncludeDirectories) _CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDebug MultiThreaded @@ -102,15 +102,16 @@ - - - - - - + + + + + + + diff --git a/PC/bdist_wininst/bdist_wininst.vcxproj.filters b/PC/bdist_wininst/bdist_wininst.vcxproj.filters index b4b6a4d514d..c97742e7239 100644 --- a/PC/bdist_wininst/bdist_wininst.vcxproj.filters +++ b/PC/bdist_wininst/bdist_wininst.vcxproj.filters @@ -16,45 +16,51 @@ {0c77c1cf-3f87-4f87-bd86-b425211c2181} ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + {d10220c7-69e3-47c5-8d82-c8e0d4d2ac88} + - + Source Files - + Source Files - + Source Files\zlib - + Source Files\zlib - + Source Files\zlib - + Source Files\zlib - + Source Files\zlib - + Source Files\zlib - - Header Files - - - - + Resource Files - + + Header Files + + + Header Files\zlib + + + + Resource Files diff --git a/PCbuild/_asyncio.vcxproj.filters b/PCbuild/_asyncio.vcxproj.filters index 10a186cdad1..a09ae928a9b 100644 --- a/PCbuild/_asyncio.vcxproj.filters +++ b/PCbuild/_asyncio.vcxproj.filters @@ -1,16 +1,21 @@  - - - {2422278e-eeeb-4241-8182-433e2bc5a7fc} + + {41f1cd52-b682-46aa-a7fd-7bdf81a18010} + Source Files + + + Resource Files + + \ No newline at end of file diff --git a/PCbuild/_bz2.vcxproj.filters b/PCbuild/_bz2.vcxproj.filters index eac64dd29d6..7c0b5162537 100644 --- a/PCbuild/_bz2.vcxproj.filters +++ b/PCbuild/_bz2.vcxproj.filters @@ -4,10 +4,16 @@ {f53a859d-dad2-4d5b-ae41-f28d8b571f5a} - + + {b90c3cee-7700-4e87-bf85-0801866e8d0d} + + {7e0bed05-ae33-43b7-8797-656455bbb7f3} - + + {b53f67d8-fdf0-4e10-a987-e44475ff434a} + + {ed574b89-6983-4cdf-9f98-fe7048d9e89c} @@ -16,33 +22,38 @@ Source Files - bzip2 1.0.6 Source Files + Source Files\bzip2 - bzip2 1.0.6 Source Files + Source Files\bzip2 - bzip2 1.0.6 Source Files + Source Files\bzip2 - bzip2 1.0.6 Source Files + Source Files\bzip2 - bzip2 1.0.6 Source Files + Source Files\bzip2 - bzip2 1.0.6 Source Files + Source Files\bzip2 - bzip2 1.0.6 Source Files + Source Files\bzip2 - - bzip2 1.0.6 Header Files - - bzip2 1.0.6 Header Files + Header Files\bzip2 + + + Header Files\bzip2 - + + + Resource Files + + + \ No newline at end of file diff --git a/PCbuild/_ctypes.vcxproj.filters b/PCbuild/_ctypes.vcxproj.filters index 3123286347a..118c4f0698c 100644 --- a/PCbuild/_ctypes.vcxproj.filters +++ b/PCbuild/_ctypes.vcxproj.filters @@ -7,6 +7,9 @@ {dbdea1f2-ad8b-44ca-b782-fcf65d91559b} + + {31a37bb4-c384-41ff-9ec1-8ad98d482e22} + @@ -37,6 +40,8 @@ - + + Resource Files + \ No newline at end of file diff --git a/PCbuild/_ctypes_test.vcxproj.filters b/PCbuild/_ctypes_test.vcxproj.filters index c1e94ce1faa..5174196c52e 100644 --- a/PCbuild/_ctypes_test.vcxproj.filters +++ b/PCbuild/_ctypes_test.vcxproj.filters @@ -7,6 +7,9 @@ {38abc486-e143-49dc-8cf0-8aefab0e0d3d} + + {5030ff8f-daf5-4bc8-b1dd-e8b59d34c511} + @@ -18,4 +21,9 @@ Source Files + + + Resource Files + + \ No newline at end of file diff --git a/PCbuild/_decimal.vcxproj.filters b/PCbuild/_decimal.vcxproj.filters index 5f7de3d8538..0cbd3d0736c 100644 --- a/PCbuild/_decimal.vcxproj.filters +++ b/PCbuild/_decimal.vcxproj.filters @@ -7,55 +7,64 @@ {138089f8-faba-494f-b6ed-051f31fbaf2d} + + {632b24a3-0844-4e57-ad34-b0e4cef886dd} + + + {322d127c-1105-4a31-aed2-e29cdececc77} + + + {780c3b7a-7817-4e89-a2f2-fc522f2c5966} + - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - Header Files + + Header Files\libmpdec + + + Header Files\libmpdec + + + Header Files\libmpdec + + + Header Files\libmpdec + + + Header Files\libmpdec + + + Header Files\libmpdec + - Header Files + Header Files\libmpdec - Header Files + Header Files\libmpdec - Header Files + Header Files\libmpdec - Header Files + Header Files\libmpdec - Header Files + Header Files\libmpdec - Header Files + Header Files\libmpdec - Header Files + Header Files\libmpdec - Header Files + Header Files\libmpdec - Header Files + Header Files\libmpdec @@ -63,51 +72,56 @@ Source Files - Source Files + Source Files\libmpdec - Source Files + Source Files\libmpdec - Source Files + Source Files\libmpdec - Source Files + Source Files\libmpdec - Source Files + Source Files\libmpdec - Source Files + Source Files\libmpdec - Source Files + Source Files\libmpdec - Source Files + Source Files\libmpdec - Source Files + Source Files\libmpdec - Source Files + Source Files\libmpdec - Source Files + Source Files\libmpdec - Source Files + Source Files\libmpdec - Source Files + Source Files\libmpdec - Source Files + Source Files\libmpdec + + + Resource Files + + - Source Files + Source Files\libmpdec - + \ No newline at end of file diff --git a/PCbuild/_elementtree.vcxproj.filters b/PCbuild/_elementtree.vcxproj.filters index 6acdf35846a..bc14e31f32b 100644 --- a/PCbuild/_elementtree.vcxproj.filters +++ b/PCbuild/_elementtree.vcxproj.filters @@ -7,52 +7,61 @@ {7b5335ad-059f-486f-85e4-f4757e26a9bf} + + {37d3ef0a-1ea6-492d-bba7-b83865198caa} + + + {6099ed72-6668-4779-adb2-a2362e5da3b9} + + + {f99990ba-cd06-40cc-8f28-d2d424ec13be} + - Header Files + Header Files\expat - Header Files + Header Files\expat - Header Files + Header Files\expat - Header Files + Header Files\expat - Header Files + Header Files\expat - Header Files + Header Files\expat - Header Files + Header Files\expat - Header Files + Header Files\expat - Header Files + Header Files\expat - Header Files + Header Files\expat - Header Files + Header Files\expat - Header Files + Header Files\expat - Header Files + Header Files\expat - Header Files + Header Files\expat - Header Files + Header Files\expat @@ -60,13 +69,18 @@ Source Files - Source Files + Source Files\expat - Source Files + Source Files\expat - Source Files + Source Files\expat - + + + Resource Files + + + \ No newline at end of file diff --git a/PCbuild/_freeze_importlib.vcxproj.filters b/PCbuild/_freeze_importlib.vcxproj.filters index ccad053a9f5..3ee9eb750d6 100644 --- a/PCbuild/_freeze_importlib.vcxproj.filters +++ b/PCbuild/_freeze_importlib.vcxproj.filters @@ -5,13 +5,8 @@ {4FC737F1-C7A5-4376-A066-2A32D752A2FF} cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + {eb238244-ace1-48fc-97a4-16ff886f8642} @@ -23,5 +18,11 @@ Source Files + + Python Files + + + Python Files + - + \ No newline at end of file diff --git a/PCbuild/_hashlib.vcxproj.filters b/PCbuild/_hashlib.vcxproj.filters index a9d993eb3ed..7a0700c007f 100644 --- a/PCbuild/_hashlib.vcxproj.filters +++ b/PCbuild/_hashlib.vcxproj.filters @@ -4,10 +4,18 @@ {cc45963d-bd25-4eb8-bdba-a5507090bca4} + + {67630fa4-76e4-4035-bced-043a6df1e2e0} + Source Files + + + Resource Files + + \ No newline at end of file diff --git a/PCbuild/_lzma.vcxproj.filters b/PCbuild/_lzma.vcxproj.filters index 0c5ed74608e..e23e5399df4 100644 --- a/PCbuild/_lzma.vcxproj.filters +++ b/PCbuild/_lzma.vcxproj.filters @@ -4,10 +4,18 @@ {53e68eda-39fc-4336-a658-dc5f5d598760} + + {9e5ecf81-2940-4dd5-af98-58e98810d030} + Source Files + + + Resource Files + + \ No newline at end of file diff --git a/PCbuild/_msi.vcxproj.filters b/PCbuild/_msi.vcxproj.filters index 7dec52de0b3..a94fb18e61e 100644 --- a/PCbuild/_msi.vcxproj.filters +++ b/PCbuild/_msi.vcxproj.filters @@ -4,10 +4,18 @@ {bdef7710-e433-4ac0-84e0-14f34454bd3e} + + {8513f324-7c13-4657-b463-5d686a8a5371} + Source Files + + + Resource Files + + \ No newline at end of file diff --git a/PCbuild/_multiprocessing.vcxproj.filters b/PCbuild/_multiprocessing.vcxproj.filters index 78133ec0ec8..85caddb10db 100644 --- a/PCbuild/_multiprocessing.vcxproj.filters +++ b/PCbuild/_multiprocessing.vcxproj.filters @@ -7,6 +7,9 @@ {34615a62-f999-4659-83f5-19d17a644530} + + {1dcf6347-2248-42e1-ab3c-1b19f4f6f647} + @@ -21,4 +24,9 @@ Source Files + + + Resource Files + + \ No newline at end of file diff --git a/PCbuild/_overlapped.vcxproj.filters b/PCbuild/_overlapped.vcxproj.filters index 78de8950559..29a9b77740b 100644 --- a/PCbuild/_overlapped.vcxproj.filters +++ b/PCbuild/_overlapped.vcxproj.filters @@ -4,10 +4,18 @@ {6f67c8db-7de7-4714-a967-2b0d4bc71f2e} + + {83fe502d-eca2-4505-b626-eddec9b6ea9f} + Source Files + + + Resource Files + + \ No newline at end of file diff --git a/PCbuild/_queue.vcxproj.filters b/PCbuild/_queue.vcxproj.filters index 88b80826adf..ec48e9d3aed 100644 --- a/PCbuild/_queue.vcxproj.filters +++ b/PCbuild/_queue.vcxproj.filters @@ -1,16 +1,21 @@  - - - {c56a5dd3-7838-48e9-a781-855d8be7370f} + + {bc5dc97e-11b8-435a-82e7-2ef3c9b44f5e} + Source Files + + + Resource Files + + \ No newline at end of file diff --git a/PCbuild/_socket.vcxproj.filters b/PCbuild/_socket.vcxproj.filters index 790ffa80dd4..453175c6a43 100644 --- a/PCbuild/_socket.vcxproj.filters +++ b/PCbuild/_socket.vcxproj.filters @@ -7,6 +7,9 @@ {1edfe0d0-7b9d-4dc8-a335-b21fef7cc77a} + + {f8efff18-28ed-4c6b-8e8d-fa816d9a81a8} + @@ -18,4 +21,9 @@ Source Files + + + Resource Files + + \ No newline at end of file diff --git a/PCbuild/_sqlite3.vcxproj.filters b/PCbuild/_sqlite3.vcxproj.filters index dce77c96a80..51830f6a445 100644 --- a/PCbuild/_sqlite3.vcxproj.filters +++ b/PCbuild/_sqlite3.vcxproj.filters @@ -7,6 +7,9 @@ {814b187d-44ad-4f2b-baa7-18ca8a8a6a77} + + {225f58de-2bad-4e4d-bc0b-fe74ed6bf5f1} + @@ -66,4 +69,9 @@ Source Files + + + Resource Files + + \ No newline at end of file diff --git a/PCbuild/_ssl.vcxproj.filters b/PCbuild/_ssl.vcxproj.filters index bd46b609840..716a69a41af 100644 --- a/PCbuild/_ssl.vcxproj.filters +++ b/PCbuild/_ssl.vcxproj.filters @@ -4,6 +4,9 @@ {695348f7-e9f6-4fe1-bc03-5f08ffc8095b} + + {1b18a2e6-040d-46c7-a9ac-ac2ec64fb5d6} + @@ -14,6 +17,8 @@ - + + Resource Files + \ No newline at end of file diff --git a/PCbuild/_testbuffer.vcxproj.filters b/PCbuild/_testbuffer.vcxproj.filters index eadf282750b..bea4260b9f7 100644 --- a/PCbuild/_testbuffer.vcxproj.filters +++ b/PCbuild/_testbuffer.vcxproj.filters @@ -4,10 +4,18 @@ {8d232240-921a-4bc2-87c3-93ffd3462f0a} + + {1e73201a-cca4-4b45-9484-262709cafee7} + Source Files + + + Resource Files + + \ No newline at end of file diff --git a/PCbuild/_testcapi.vcxproj.filters b/PCbuild/_testcapi.vcxproj.filters index 7a6ad1a864e..53f64b7aa1e 100644 --- a/PCbuild/_testcapi.vcxproj.filters +++ b/PCbuild/_testcapi.vcxproj.filters @@ -4,10 +4,18 @@ {a76a90d8-8e8b-4c36-8f58-8bd46abe9f5e} + + {071b2ff4-e5a1-4e79-b0c5-cf46b0094a80} + Source Files + + + Resource Files + + \ No newline at end of file diff --git a/PCbuild/_testconsole.vcxproj.filters b/PCbuild/_testconsole.vcxproj.filters index 0c25101e1b4..321e17785fd 100644 --- a/PCbuild/_testconsole.vcxproj.filters +++ b/PCbuild/_testconsole.vcxproj.filters @@ -5,18 +5,19 @@ {4FC737F1-C7A5-4376-A066-2A32D752A2FF} cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - + Source Files + + + Resource Files + + \ No newline at end of file diff --git a/PCbuild/_testembed.vcxproj.filters b/PCbuild/_testembed.vcxproj.filters index f7f9abeb1df..b90fd85f794 100644 --- a/PCbuild/_testembed.vcxproj.filters +++ b/PCbuild/_testembed.vcxproj.filters @@ -5,10 +5,6 @@ {4FC737F1-C7A5-4376-A066-2A32D752A2FF} cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms @@ -19,4 +15,9 @@ Source Files + + + Resource Files + + \ No newline at end of file diff --git a/PCbuild/_testimportmultiple.vcxproj.filters b/PCbuild/_testimportmultiple.vcxproj.filters index db0d0a65e12..8f63d134825 100644 --- a/PCbuild/_testimportmultiple.vcxproj.filters +++ b/PCbuild/_testimportmultiple.vcxproj.filters @@ -4,10 +4,18 @@ {1ec38ad9-1abf-4b80-8628-ac43ccba324b} + + {0ff128a6-7814-4f8e-826e-860a858104ee} + Source Files - + + + Resource Files + + + \ No newline at end of file diff --git a/PCbuild/_testinternalcapi.vcxproj.filters b/PCbuild/_testinternalcapi.vcxproj.filters index 4644f230be1..7734da0b7b4 100644 --- a/PCbuild/_testinternalcapi.vcxproj.filters +++ b/PCbuild/_testinternalcapi.vcxproj.filters @@ -4,10 +4,18 @@ {136fc5eb-7fe4-4486-8c6d-b49f37a00199} + + {acecc890-f8dd-4942-b6d2-1fd8f73a5d6c} + Source Files - + + + Resource Files + + + \ No newline at end of file diff --git a/PCbuild/_testmultiphase.vcxproj.filters b/PCbuild/_testmultiphase.vcxproj.filters index 0c25101e1b4..8df0a42e9f3 100644 --- a/PCbuild/_testmultiphase.vcxproj.filters +++ b/PCbuild/_testmultiphase.vcxproj.filters @@ -5,10 +5,6 @@ {4FC737F1-C7A5-4376-A066-2A32D752A2FF} cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms @@ -19,4 +15,9 @@ Source Files + + + Resource Files + + \ No newline at end of file diff --git a/PCbuild/_tkinter.vcxproj.filters b/PCbuild/_tkinter.vcxproj.filters index 4e5cd479e30..0d919439a76 100644 --- a/PCbuild/_tkinter.vcxproj.filters +++ b/PCbuild/_tkinter.vcxproj.filters @@ -4,6 +4,9 @@ {b9ce64dd-cb95-472d-bbe8-5583b2cd375b} + + {2bd3a90c-5b2e-45fb-9b2a-fbf1a4faf5f9} + @@ -13,4 +16,9 @@ Source Files + + + Resource Files + + \ No newline at end of file diff --git a/PCbuild/_uuid.vcxproj.filters b/PCbuild/_uuid.vcxproj.filters index 17949292314..705902ff50c 100644 --- a/PCbuild/_uuid.vcxproj.filters +++ b/PCbuild/_uuid.vcxproj.filters @@ -5,10 +5,18 @@ {4FC737F1-C7A5-4376-A066-2A32D752A2FF} cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + {4fa4dbfa-e069-4ab4-86a6-ad389b2ec407} + Source Files + + + Resource Files + + \ No newline at end of file diff --git a/PCbuild/_zoneinfo.vcxproj.filters b/PCbuild/_zoneinfo.vcxproj.filters index e3c3ef4c72a..57f31e05d56 100644 --- a/PCbuild/_zoneinfo.vcxproj.filters +++ b/PCbuild/_zoneinfo.vcxproj.filters @@ -1,16 +1,21 @@  - - - {2422278e-eeeb-4241-8182-433e2bc5a7fc} + + {0616fb85-7891-4790-83c2-005f906cf555} + Source Files - + + + Resource Files + + + \ No newline at end of file diff --git a/PCbuild/liblzma.vcxproj.filters b/PCbuild/liblzma.vcxproj.filters new file mode 100644 index 00000000000..3f58351fa9e --- /dev/null +++ b/PCbuild/liblzma.vcxproj.filters @@ -0,0 +1,435 @@ + + + + + {cb1870af-3c7e-48ba-bd7f-3e87468f8ed7} + + + {58761ffe-2af0-42a8-9f93-4e57e1954c36} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln index 61db4e02ad3..4b6dc1e6771 100644 --- a/PCbuild/pcbuild.sln +++ b/PCbuild/pcbuild.sln @@ -1267,6 +1267,38 @@ Global {384C224A-7474-476E-A01B-750EA7DE918C}.Release|Win32.Build.0 = Release|Win32 {384C224A-7474-476E-A01B-750EA7DE918C}.Release|x64.ActiveCfg = Release|x64 {384C224A-7474-476E-A01B-750EA7DE918C}.Release|x64.Build.0 = Release|x64 + {FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.Debug|ARM.ActiveCfg = Debug|ARM + {FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.Debug|ARM.Build.0 = Debug|ARM + {FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.Debug|ARM64.Build.0 = Debug|ARM64 + {FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.Debug|Win32.ActiveCfg = Debug|Win32 + {FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.Debug|Win32.Build.0 = Debug|Win32 + {FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.Debug|x64.ActiveCfg = Debug|x64 + {FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.Debug|x64.Build.0 = Debug|x64 + {FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.PGInstrument|ARM.ActiveCfg = PGInstrument|ARM + {FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.PGInstrument|ARM.Build.0 = PGInstrument|ARM + {FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.PGInstrument|ARM64.ActiveCfg = PGInstrument|ARM64 + {FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.PGInstrument|ARM64.Build.0 = PGInstrument|ARM64 + {FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32 + {FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.PGInstrument|Win32.Build.0 = PGInstrument|Win32 + {FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.PGInstrument|x64.ActiveCfg = PGInstrument|x64 + {FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.PGInstrument|x64.Build.0 = PGInstrument|x64 + {FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.PGUpdate|ARM.ActiveCfg = PGUpdate|ARM + {FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.PGUpdate|ARM.Build.0 = PGUpdate|ARM + {FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.PGUpdate|ARM64.ActiveCfg = PGUpdate|ARM64 + {FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.PGUpdate|ARM64.Build.0 = PGUpdate|ARM64 + {FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32 + {FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.PGUpdate|Win32.Build.0 = PGUpdate|Win32 + {FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.PGUpdate|x64.ActiveCfg = PGUpdate|x64 + {FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.PGUpdate|x64.Build.0 = PGUpdate|x64 + {FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.Release|ARM.ActiveCfg = Release|ARM + {FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.Release|ARM.Build.0 = Release|ARM + {FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.Release|ARM64.ActiveCfg = Release|ARM64 + {FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.Release|ARM64.Build.0 = Release|ARM64 + {FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.Release|Win32.ActiveCfg = Release|Win32 + {FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.Release|Win32.Build.0 = Release|Win32 + {FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.Release|x64.ActiveCfg = Release|x64 + {FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.Release|x64.Build.0 = Release|x64 {78D80A15-BD8C-44E2-B49E-1F05B0A0A687}.Debug|ARM.ActiveCfg = Debug|ARM {78D80A15-BD8C-44E2-B49E-1F05B0A0A687}.Debug|ARM.Build.0 = Debug|ARM {78D80A15-BD8C-44E2-B49E-1F05B0A0A687}.Debug|ARM64.ActiveCfg = Debug|ARM64 diff --git a/PCbuild/pyexpat.vcxproj.filters b/PCbuild/pyexpat.vcxproj.filters index f8d46026c9c..fd22fc8c477 100644 --- a/PCbuild/pyexpat.vcxproj.filters +++ b/PCbuild/pyexpat.vcxproj.filters @@ -7,6 +7,9 @@ {5af9d40c-fc46-4640-ad84-3d1dd34a71d7} + + {f1dbbdb5-41e5-4a88-bf8e-13da010c0ce4} + @@ -30,4 +33,9 @@ Source Files - + + + Resource Files + + + \ No newline at end of file diff --git a/PCbuild/pylauncher.vcxproj.filters b/PCbuild/pylauncher.vcxproj.filters index e4b23d2af83..17d0389ca50 100644 --- a/PCbuild/pylauncher.vcxproj.filters +++ b/PCbuild/pylauncher.vcxproj.filters @@ -5,10 +5,6 @@ {4FC737F1-C7A5-4376-A066-2A32D752A2FF} cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms diff --git a/PCbuild/pyshellext.vcxproj.filters b/PCbuild/pyshellext.vcxproj.filters index 648e499f6f4..36d1d1655f5 100644 --- a/PCbuild/pyshellext.vcxproj.filters +++ b/PCbuild/pyshellext.vcxproj.filters @@ -5,10 +5,6 @@ {4FC737F1-C7A5-4376-A066-2A32D752A2FF} cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms diff --git a/PCbuild/python3dll.vcxproj.filters b/PCbuild/python3dll.vcxproj.filters index d250c45254e..a7566052e12 100644 --- a/PCbuild/python3dll.vcxproj.filters +++ b/PCbuild/python3dll.vcxproj.filters @@ -5,10 +5,6 @@ {4FC737F1-C7A5-4376-A066-2A32D752A2FF} cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav diff --git a/PCbuild/python_uwp.vcxproj.filters b/PCbuild/python_uwp.vcxproj.filters new file mode 100644 index 00000000000..79e87461eb1 --- /dev/null +++ b/PCbuild/python_uwp.vcxproj.filters @@ -0,0 +1,26 @@ + + + + + {fd8bf000-0bbe-4fd4-ac49-29036e5a5c5a} + + + {a0d4ce0b-a7b5-4a77-b6c2-d2ddb9bd49b8} + + + + + Resource Files + + + + + Resource Files + + + + + Source Files + + + \ No newline at end of file diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj index 54e23c2c2b5..db26e38911b 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -134,8 +134,10 @@ + + @@ -174,6 +176,7 @@ + diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters index 4ba0bc2ac3b..1f3883768c9 100644 --- a/PCbuild/pythoncore.vcxproj.filters +++ b/PCbuild/pythoncore.vcxproj.filters @@ -31,6 +31,12 @@ {c3e03a5c-56c7-45fd-8543-e5d2326b907d} + + {86ffb5eb-c423-43aa-b736-a8850d3277df} + + + {875bf4f2-ac42-46bd-b703-8371a824ec32} + @@ -75,72 +81,6 @@ Include - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - Include @@ -183,105 +123,6 @@ Include - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - - - Include - Include @@ -549,6 +390,189 @@ Include + + Parser + + + Parser + + + Include + + + Include\cpython + + + Include\cpython + + + Include\cpython + + + Include\cpython + + + Include\cpython + + + Include\cpython + + + Include\cpython + + + Include\cpython + + + Include\cpython + + + Include\cpython + + + Include\cpython + + + Include\cpython + + + Include\cpython + + + Include\cpython + + + Include\cpython + + + Include\cpython + + + Include\cpython + + + Include\cpython + + + Include\cpython + + + Include\cpython + + + Include\cpython + + + Include\cpython + + + Include\cpython + + + Include\cpython + + + Include + + + Include\internal + + + Include\internal + + + Include\internal + + + Include\internal + + + Include\internal + + + Include\internal + + + Include\internal + + + Include\internal + + + Include\internal + + + Include\internal + + + Include\internal + + + Include\internal + + + Include\internal + + + Include\internal + + + Include\internal + + + Include\internal + + + Include\internal + + + Include\internal + + + Include\internal + + + Include\internal + + + Include\internal + + + Include\internal + + + Include\internal + + + Include\internal + + + Include\internal + + + Include\internal + + + Include\internal + + + Include\internal + + + Include\internal + + + Include\internal + + + Include\internal + + + Include\internal + + + Include\internal + Modules\zlib @@ -629,9 +653,6 @@ Modules - - Modules - Modules @@ -695,9 +716,6 @@ Modules - - Modules - Modules @@ -893,18 +911,6 @@ Objects - - Parser - - - Parser - - - Parser - - - Parser - Parser @@ -956,9 +962,6 @@ Python - - Python - Python @@ -998,9 +1001,6 @@ Python - - Python - Modules @@ -1118,9 +1118,6 @@ Objects - - PC - Modules @@ -1157,10 +1154,34 @@ Modules\zlib + + Python + + + Parser + + + Parser + + + Parser + + + Modules + + + Parser + + + Python + + + Objects + Resource Files - + \ No newline at end of file diff --git a/PCbuild/pythonw.vcxproj.filters b/PCbuild/pythonw.vcxproj.filters index 259866fbcc2..20d87051e25 100644 --- a/PCbuild/pythonw.vcxproj.filters +++ b/PCbuild/pythonw.vcxproj.filters @@ -8,14 +8,14 @@ {e1d8ea6b-c65d-42f4-9eed-6010846ed378} - - - Resource Files - - Source Files + + + Resource Files + + \ No newline at end of file diff --git a/PCbuild/pythonw_uwp.vcxproj.filters b/PCbuild/pythonw_uwp.vcxproj.filters new file mode 100644 index 00000000000..2f39bdea9e9 --- /dev/null +++ b/PCbuild/pythonw_uwp.vcxproj.filters @@ -0,0 +1,26 @@ + + + + + {de05f656-4dcb-4fe7-9946-5c325ea2d842} + + + {4102e199-3e5c-42d0-b37b-d42394b20d9e} + + + + + Resource Files + + + + + Resource Files + + + + + Source Files + + + \ No newline at end of file diff --git a/PCbuild/pywlauncher.vcxproj.filters b/PCbuild/pywlauncher.vcxproj.filters index e4b23d2af83..17d0389ca50 100644 --- a/PCbuild/pywlauncher.vcxproj.filters +++ b/PCbuild/pywlauncher.vcxproj.filters @@ -5,10 +5,6 @@ {4FC737F1-C7A5-4376-A066-2A32D752A2FF} cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms diff --git a/PCbuild/select.vcxproj.filters b/PCbuild/select.vcxproj.filters index 55a2fc834a3..5354820dd49 100644 --- a/PCbuild/select.vcxproj.filters +++ b/PCbuild/select.vcxproj.filters @@ -4,10 +4,18 @@ {98346077-900c-4c7a-852f-a23470e37b40} + + {b47a8e6c-47c0-4490-aa91-1a3624a0905c} + Source Files + + + Resource Files + + \ No newline at end of file diff --git a/PCbuild/sqlite3.vcxproj.filters b/PCbuild/sqlite3.vcxproj.filters index 86680c1c383..76662ed68d0 100644 --- a/PCbuild/sqlite3.vcxproj.filters +++ b/PCbuild/sqlite3.vcxproj.filters @@ -7,6 +7,9 @@ {0e842fe2-176b-4e83-9d1f-0ad13a859efd} + + {0248795a-00c9-4090-ad61-55ae23438598} + @@ -21,4 +24,9 @@ Source Files + + + Resource Files + + \ No newline at end of file diff --git a/PCbuild/unicodedata.vcxproj.filters b/PCbuild/unicodedata.vcxproj.filters index 20e640ee11e..7ff97835c96 100644 --- a/PCbuild/unicodedata.vcxproj.filters +++ b/PCbuild/unicodedata.vcxproj.filters @@ -7,6 +7,9 @@ {e2c055bb-ec62-4bbc-aa1c-d88da4d4ad1c} + + {d04f3447-67b0-42aa-b84f-9fc0029d5af7} + @@ -21,4 +24,9 @@ Source Files + + + Resource Files + + \ No newline at end of file diff --git a/PCbuild/venvlauncher.vcxproj.filters b/PCbuild/venvlauncher.vcxproj.filters new file mode 100644 index 00000000000..ec13936bf6c --- /dev/null +++ b/PCbuild/venvlauncher.vcxproj.filters @@ -0,0 +1,26 @@ + + + + + {8f3ab79e-3cba-4e6d-82b2-559ce946de58} + + + {4a2423af-e5d1-4c88-b308-d71b768977df} + + + + + Resource Files + + + + + Resource Files + + + + + Source Files + + + \ No newline at end of file diff --git a/PCbuild/venvwlauncher.vcxproj.filters b/PCbuild/venvwlauncher.vcxproj.filters new file mode 100644 index 00000000000..8addc13e977 --- /dev/null +++ b/PCbuild/venvwlauncher.vcxproj.filters @@ -0,0 +1,26 @@ + + + + + {7683f248-9c32-4e72-a329-5bd84993f63a} + + + {61b34b26-ce53-405d-a743-b370ff505887} + + + + + Source Files + + + + + Resource Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/PCbuild/winsound.vcxproj.filters b/PCbuild/winsound.vcxproj.filters index 7d08931b186..67758026382 100644 --- a/PCbuild/winsound.vcxproj.filters +++ b/PCbuild/winsound.vcxproj.filters @@ -5,10 +5,18 @@ {4FC737F1-C7A5-4376-A066-2A32D752A2FF} cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + {6be42502-398f-4bec-8677-8809a2da0eef} + Source Files + + + Resource Files + + \ No newline at end of file