Re: Reduce the number of special cases to build contrib modules on windows

David Rowley Mon, 19 Apr 2021 04:48:30 -0700

On Wed, 3 Mar 2021 at 22:37, David Rowley <dgrowle...@gmail.com> wrote:
> I've attached a rebased patch.


I've rebased this again.

I also moved away from using hash tables for storing references and
libraries.  I was having some problems getting psql to compile due to
the order of the dependencies being reversed due to the order being at
the mercy of Perl's hash function. There's mention of this in
Makefile.global.in:

# libpq_pgport is for use by client executables (not libraries) that use libpq.
# We force clients to pull symbols from the non-shared libraries libpgport
# and libpgcommon rather than pulling some libpgport symbols from libpq just
# because libpq uses those functions too.  This makes applications less
# dependent on changes in libpq's usage of pgport (on platforms where we
# don't have symbol export control for libpq).  To do this we link to
# pgport before libpq.  This does cause duplicate -lpgport's to appear
# on client link lines, since that also appears in $(LIBS).
# libpq_pgport_shlib is the same idea, but for use in client shared libraries.

I switched these back to arrays but added an additional check to only
add new items to the array if we don't already have an element with
the same value.

I've attached the diffs in the *.vcxproj files between patched and unpatched.

David

diff -u "L:\\proj_std/autoinc.vcxproj" "L:\\proj_mod/autoinc.vcxproj"
--- "L:\\proj_std/autoinc.vcxproj"      2021-04-19 23:05:12.549209700 +1200
+++ "L:\\proj_mod/autoinc.vcxproj"      2021-04-19 23:02:23.365767000 +1200
@@ -52,7 +52,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       
<AdditionalIncludeDirectories>src/include;src/include/port/win32;src/include/port/win32_msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      
<PreprocessorDefinitions>WIN32;_WINDOWS;__WINDOWS__;__WIN32__;WIN32_STACK_RLIMIT=4194304;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DEBUG=1%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>WIN32;_WINDOWS;__WINDOWS__;__WIN32__;WIN32_STACK_RLIMIT=4194304;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;REFINT_VERBOSE;_DEBUG;DEBUG=1%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       
<DisableSpecificWarnings>4018;4244;4273;4102;4090;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
@@ -100,7 +100,7 @@
     <ClCompile>
       <Optimization>Full</Optimization>
       
<AdditionalIncludeDirectories>src/include;src/include/port/win32;src/include/port/win32_msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      
<PreprocessorDefinitions>WIN32;_WINDOWS;__WINDOWS__;__WIN32__;WIN32_STACK_RLIMIT=4194304;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>WIN32;_WINDOWS;__WINDOWS__;__WIN32__;WIN32_STACK_RLIMIT=4194304;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;REFINT_VERBOSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       
<DisableSpecificWarnings>4018;4244;4273;4102;4090;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
diff -u "L:\\proj_std/dblink.vcxproj" "L:\\proj_mod/dblink.vcxproj"
--- "L:\\proj_std/dblink.vcxproj"       2021-04-19 23:05:12.757441500 +1200
+++ "L:\\proj_mod/dblink.vcxproj"       2021-04-19 23:02:23.571066000 +1200
@@ -51,7 +51,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      
<AdditionalIncludeDirectories>src/include;src/include/port/win32;src/include/port/win32_msvc;src\interfaces\libpq;src/backend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      
<AdditionalIncludeDirectories>src/include;src/include/port/win32;src/include/port/win32_msvc;src/backend;src\interfaces\libpq;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       
<PreprocessorDefinitions>WIN32;_WINDOWS;__WINDOWS__;__WIN32__;WIN32_STACK_RLIMIT=4194304;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DEBUG=1%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -99,7 +99,7 @@
   <ItemDefinitionGroup 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <Optimization>Full</Optimization>
-      
<AdditionalIncludeDirectories>src/include;src/include/port/win32;src/include/port/win32_msvc;src\interfaces\libpq;src/backend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      
<AdditionalIncludeDirectories>src/include;src/include/port/win32;src/include/port/win32_msvc;src/backend;src\interfaces\libpq;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       
<PreprocessorDefinitions>WIN32;_WINDOWS;__WINDOWS__;__WIN32__;WIN32_STACK_RLIMIT=4194304;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
diff -u "L:\\proj_std/hstore_plpython3.vcxproj" 
"L:\\proj_mod/hstore_plpython3.vcxproj"
--- "L:\\proj_std/hstore_plpython3.vcxproj"     2021-04-19 23:05:12.944178400 
+1200
+++ "L:\\proj_mod/hstore_plpython3.vcxproj"     2021-04-19 23:02:23.750051600 
+1200
@@ -51,7 +51,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      
<AdditionalIncludeDirectories>src/include;src/include/port/win32;src/include/port/win32_msvc;src/pl/plpython;C:\python-3.9.1-embed/include;contrib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      
<AdditionalIncludeDirectories>src/include;src/include/port/win32;src/include/port/win32_msvc;C:\python-3.9.1-embed/include;contrib;src/pl/plpython;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       
<PreprocessorDefinitions>WIN32;_WINDOWS;__WINDOWS__;__WIN32__;WIN32_STACK_RLIMIT=4194304;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PLPYTHON_LIBNAME="plpython3";_DEBUG;DEBUG=1%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -70,7 +70,7 @@
     </ClCompile>
     <Link>
       <OutputFile>.\Debug\hstore_plpython3\hstore_plpython3.dll</OutputFile>
-      
<AdditionalDependencies>Debug/postgres/postgres.lib;Debug/plpython3/plpython3.lib;C:\python-3.9.1-embed/Libs/python39.lib;Debug/postgres/postgres.lib;Debug/postgres/postgres.lib;Debug/hstore/hstore.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      
<AdditionalDependencies>Debug/plpython3/plpython3.lib;Debug/postgres/postgres.lib;C:\python-3.9.1-embed/Libs/python39.lib;Debug/hstore/hstore.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -99,7 +99,7 @@
   <ItemDefinitionGroup 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <Optimization>Full</Optimization>
-      
<AdditionalIncludeDirectories>src/include;src/include/port/win32;src/include/port/win32_msvc;src/pl/plpython;C:\python-3.9.1-embed/include;contrib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      
<AdditionalIncludeDirectories>src/include;src/include/port/win32;src/include/port/win32_msvc;C:\python-3.9.1-embed/include;contrib;src/pl/plpython;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       
<PreprocessorDefinitions>WIN32;_WINDOWS;__WINDOWS__;__WIN32__;WIN32_STACK_RLIMIT=4194304;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PLPYTHON_LIBNAME="plpython3";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -118,7 +118,7 @@
     </ClCompile>
     <Link>
       <OutputFile>.\Release\hstore_plpython3\hstore_plpython3.dll</OutputFile>
-      
<AdditionalDependencies>Release/postgres/postgres.lib;Release/plpython3/plpython3.lib;C:\python-3.9.1-embed/Libs/python39.lib;Release/postgres/postgres.lib;Release/postgres/postgres.lib;Release/hstore/hstore.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      
<AdditionalDependencies>Release/plpython3/plpython3.lib;Release/postgres/postgres.lib;C:\python-3.9.1-embed/Libs/python39.lib;Release/hstore/hstore.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -151,15 +151,15 @@
     <ResourceCompile Include="contrib/hstore_plpython/win32ver.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="postgres.vcxproj">
-      <Project>{00000000-0000-0000-0000-000000000000}</Project>
-    </ProjectReference>
     <ProjectReference Include="plpython3.vcxproj">
       <Project>{00000000-0000-0000-0000-000000000000}</Project>
     </ProjectReference>
     <ProjectReference Include="hstore.vcxproj">
       <Project>{00000000-0000-0000-0000-000000000000}</Project>
     </ProjectReference>
+    <ProjectReference Include="postgres.vcxproj">
+      <Project>{00000000-0000-0000-0000-000000000000}</Project>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff -u "L:\\proj_std/insert_username.vcxproj" 
"L:\\proj_mod/insert_username.vcxproj"
--- "L:\\proj_std/insert_username.vcxproj"      2021-04-19 23:05:12.957866100 
+1200
+++ "L:\\proj_mod/insert_username.vcxproj"      2021-04-19 23:02:23.763737600 
+1200
@@ -52,7 +52,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       
<AdditionalIncludeDirectories>src/include;src/include/port/win32;src/include/port/win32_msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      
<PreprocessorDefinitions>WIN32;_WINDOWS;__WINDOWS__;__WIN32__;WIN32_STACK_RLIMIT=4194304;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DEBUG=1%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>WIN32;_WINDOWS;__WINDOWS__;__WIN32__;WIN32_STACK_RLIMIT=4194304;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;REFINT_VERBOSE;_DEBUG;DEBUG=1%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       
<DisableSpecificWarnings>4018;4244;4273;4102;4090;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
@@ -100,7 +100,7 @@
     <ClCompile>
       <Optimization>Full</Optimization>
       
<AdditionalIncludeDirectories>src/include;src/include/port/win32;src/include/port/win32_msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      
<PreprocessorDefinitions>WIN32;_WINDOWS;__WINDOWS__;__WIN32__;WIN32_STACK_RLIMIT=4194304;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>WIN32;_WINDOWS;__WINDOWS__;__WIN32__;WIN32_STACK_RLIMIT=4194304;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;REFINT_VERBOSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       
<DisableSpecificWarnings>4018;4244;4273;4102;4090;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
diff -u "L:\\proj_std/jsonb_plpython3.vcxproj" 
"L:\\proj_mod/jsonb_plpython3.vcxproj"
--- "L:\\proj_std/jsonb_plpython3.vcxproj"      2021-04-19 23:05:12.979373800 
+1200
+++ "L:\\proj_mod/jsonb_plpython3.vcxproj"      2021-04-19 23:02:23.783290300 
+1200
@@ -70,7 +70,7 @@
     </ClCompile>
     <Link>
       <OutputFile>.\Debug\jsonb_plpython3\jsonb_plpython3.dll</OutputFile>
-      
<AdditionalDependencies>Debug/postgres/postgres.lib;Debug/plpython3/plpython3.lib;C:\python-3.9.1-embed/Libs/python39.lib;Debug/postgres/postgres.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      
<AdditionalDependencies>C:\python-3.9.1-embed/Libs/python39.lib;Debug/postgres/postgres.lib;Debug/plpython3/plpython3.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -118,7 +118,7 @@
     </ClCompile>
     <Link>
       <OutputFile>.\Release\jsonb_plpython3\jsonb_plpython3.dll</OutputFile>
-      
<AdditionalDependencies>Release/postgres/postgres.lib;Release/plpython3/plpython3.lib;C:\python-3.9.1-embed/Libs/python39.lib;Release/postgres/postgres.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      
<AdditionalDependencies>C:\python-3.9.1-embed/Libs/python39.lib;Release/postgres/postgres.lib;Release/plpython3/plpython3.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
diff -u "L:\\proj_std/libpq_pipeline.vcxproj" 
"L:\\proj_mod/libpq_pipeline.vcxproj"
--- "L:\\proj_std/libpq_pipeline.vcxproj"       2021-04-19 23:05:13.048784200 
+1200
+++ "L:\\proj_mod/libpq_pipeline.vcxproj"       2021-04-19 23:02:23.850745200 
+1200
@@ -70,7 +70,7 @@
     </ClCompile>
     <Link>
       <OutputFile>.\Debug\libpq_pipeline\libpq_pipeline.exe</OutputFile>
-      
<AdditionalDependencies>Debug/libpq/libpq.lib;Debug/libpgport/libpgport.lib;Debug/libpgcommon/libpgcommon.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      
<AdditionalDependencies>Debug/libpgport/libpgport.lib;Debug/libpgcommon/libpgcommon.lib;ws2_32.lib;Debug/libpq/libpq.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -112,7 +112,7 @@
     </ClCompile>
     <Link>
       <OutputFile>.\Release\libpq_pipeline\libpq_pipeline.exe</OutputFile>
-      
<AdditionalDependencies>Release/libpq/libpq.lib;Release/libpgport/libpgport.lib;Release/libpgcommon/libpgcommon.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      
<AdditionalDependencies>Release/libpgport/libpgport.lib;Release/libpgcommon/libpgcommon.lib;ws2_32.lib;Release/libpq/libpq.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -136,15 +136,15 @@
     <ClCompile Include="src/test/modules/libpq_pipeline/libpq_pipeline.c" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="libpq.vcxproj">
-      <Project>{00000000-0000-0000-0000-000000000000}</Project>
-    </ProjectReference>
     <ProjectReference Include="libpgport.vcxproj">
       <Project>{00000000-0000-0000-0000-000000000000}</Project>
     </ProjectReference>
     <ProjectReference Include="libpgcommon.vcxproj">
       <Project>{00000000-0000-0000-0000-000000000000}</Project>
     </ProjectReference>
+    <ProjectReference Include="libpq.vcxproj">
+      <Project>{00000000-0000-0000-0000-000000000000}</Project>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff -u "L:\\proj_std/ltree.vcxproj" "L:\\proj_mod/ltree.vcxproj"
--- "L:\\proj_std/ltree.vcxproj"        2021-04-19 23:05:13.071269700 +1200
+++ "L:\\proj_mod/ltree.vcxproj"        2021-04-19 23:02:23.873230700 +1200
@@ -52,7 +52,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       
<AdditionalIncludeDirectories>src/include;src/include/port/win32;src/include/port/win32_msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      
<PreprocessorDefinitions>WIN32;_WINDOWS;__WINDOWS__;__WIN32__;WIN32_STACK_RLIMIT=4194304;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DEBUG=1%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>WIN32;_WINDOWS;__WINDOWS__;__WIN32__;WIN32_STACK_RLIMIT=4194304;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;LOWER_NODE;_DEBUG;DEBUG=1%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       
<DisableSpecificWarnings>4018;4244;4273;4102;4090;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
@@ -100,7 +100,7 @@
     <ClCompile>
       <Optimization>Full</Optimization>
       
<AdditionalIncludeDirectories>src/include;src/include/port/win32;src/include/port/win32_msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      
<PreprocessorDefinitions>WIN32;_WINDOWS;__WINDOWS__;__WIN32__;WIN32_STACK_RLIMIT=4194304;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>WIN32;_WINDOWS;__WINDOWS__;__WIN32__;WIN32_STACK_RLIMIT=4194304;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;LOWER_NODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       
<DisableSpecificWarnings>4018;4244;4273;4102;4090;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
diff -u "L:\\proj_std/ltree_plpython3.vcxproj" 
"L:\\proj_mod/ltree_plpython3.vcxproj"
--- "L:\\proj_std/ltree_plpython3.vcxproj"      2021-04-19 23:05:13.079090100 
+1200
+++ "L:\\proj_mod/ltree_plpython3.vcxproj"      2021-04-19 23:02:23.881051600 
+1200
@@ -51,7 +51,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      
<AdditionalIncludeDirectories>src/include;src/include/port/win32;src/include/port/win32_msvc;src/pl/plpython;C:\python-3.9.1-embed/include;contrib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      
<AdditionalIncludeDirectories>src/include;src/include/port/win32;src/include/port/win32_msvc;C:\python-3.9.1-embed/include;src/pl/plpython;contrib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       
<PreprocessorDefinitions>WIN32;_WINDOWS;__WINDOWS__;__WIN32__;WIN32_STACK_RLIMIT=4194304;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PLPYTHON_LIBNAME="plpython3";_DEBUG;DEBUG=1%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -70,7 +70,7 @@
     </ClCompile>
     <Link>
       <OutputFile>.\Debug\ltree_plpython3\ltree_plpython3.dll</OutputFile>
-      
<AdditionalDependencies>Debug/postgres/postgres.lib;Debug/plpython3/plpython3.lib;C:\python-3.9.1-embed/Libs/python39.lib;Debug/postgres/postgres.lib;Debug/postgres/postgres.lib;Debug/ltree/ltree.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      
<AdditionalDependencies>C:\python-3.9.1-embed/Libs/python39.lib;Debug/ltree/ltree.lib;Debug/postgres/postgres.lib;Debug/plpython3/plpython3.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -99,7 +99,7 @@
   <ItemDefinitionGroup 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <Optimization>Full</Optimization>
-      
<AdditionalIncludeDirectories>src/include;src/include/port/win32;src/include/port/win32_msvc;src/pl/plpython;C:\python-3.9.1-embed/include;contrib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      
<AdditionalIncludeDirectories>src/include;src/include/port/win32;src/include/port/win32_msvc;C:\python-3.9.1-embed/include;src/pl/plpython;contrib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       
<PreprocessorDefinitions>WIN32;_WINDOWS;__WINDOWS__;__WIN32__;WIN32_STACK_RLIMIT=4194304;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;PLPYTHON_LIBNAME="plpython3";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -118,7 +118,7 @@
     </ClCompile>
     <Link>
       <OutputFile>.\Release\ltree_plpython3\ltree_plpython3.dll</OutputFile>
-      
<AdditionalDependencies>Release/postgres/postgres.lib;Release/plpython3/plpython3.lib;C:\python-3.9.1-embed/Libs/python39.lib;Release/postgres/postgres.lib;Release/postgres/postgres.lib;Release/ltree/ltree.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      
<AdditionalDependencies>C:\python-3.9.1-embed/Libs/python39.lib;Release/ltree/ltree.lib;Release/postgres/postgres.lib;Release/plpython3/plpython3.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -151,13 +151,13 @@
     <ResourceCompile Include="contrib/ltree_plpython/win32ver.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="postgres.vcxproj">
+    <ProjectReference Include="ltree.vcxproj">
       <Project>{00000000-0000-0000-0000-000000000000}</Project>
     </ProjectReference>
-    <ProjectReference Include="plpython3.vcxproj">
+    <ProjectReference Include="postgres.vcxproj">
       <Project>{00000000-0000-0000-0000-000000000000}</Project>
     </ProjectReference>
-    <ProjectReference Include="ltree.vcxproj">
+    <ProjectReference Include="plpython3.vcxproj">
       <Project>{00000000-0000-0000-0000-000000000000}</Project>
     </ProjectReference>
   </ItemGroup>
diff -u "L:\\proj_std/moddatetime.vcxproj" "L:\\proj_mod/moddatetime.vcxproj"
--- "L:\\proj_std/moddatetime.vcxproj"  2021-04-19 23:05:13.085933300 +1200
+++ "L:\\proj_mod/moddatetime.vcxproj"  2021-04-19 23:02:23.888872900 +1200
@@ -52,7 +52,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       
<AdditionalIncludeDirectories>src/include;src/include/port/win32;src/include/port/win32_msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      
<PreprocessorDefinitions>WIN32;_WINDOWS;__WINDOWS__;__WIN32__;WIN32_STACK_RLIMIT=4194304;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_DEBUG;DEBUG=1%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>WIN32;_WINDOWS;__WINDOWS__;__WIN32__;WIN32_STACK_RLIMIT=4194304;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;REFINT_VERBOSE;_DEBUG;DEBUG=1%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>false</StringPooling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       
<DisableSpecificWarnings>4018;4244;4273;4102;4090;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
@@ -100,7 +100,7 @@
     <ClCompile>
       <Optimization>Full</Optimization>
       
<AdditionalIncludeDirectories>src/include;src/include/port/win32;src/include/port/win32_msvc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      
<PreprocessorDefinitions>WIN32;_WINDOWS;__WINDOWS__;__WIN32__;WIN32_STACK_RLIMIT=4194304;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      
<PreprocessorDefinitions>WIN32;_WINDOWS;__WINDOWS__;__WIN32__;WIN32_STACK_RLIMIT=4194304;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;REFINT_VERBOSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       
<DisableSpecificWarnings>4018;4244;4273;4102;4090;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
diff -u "L:\\proj_std/pg_amcheck.vcxproj" "L:\\proj_mod/pg_amcheck.vcxproj"
--- "L:\\proj_std/pg_amcheck.vcxproj"   2021-04-19 23:05:13.121127400 +1200
+++ "L:\\proj_mod/pg_amcheck.vcxproj"   2021-04-19 23:02:23.924066600 +1200
@@ -70,7 +70,7 @@
     </ClCompile>
     <Link>
       <OutputFile>.\Debug\pg_amcheck\pg_amcheck.exe</OutputFile>
-      
<AdditionalDependencies>Debug/libpgfeutils/libpgfeutils.lib;Debug/libpgcommon/libpgcommon.lib;Debug/libpgport/libpgport.lib;Debug/libpq/libpq.lib;Debug/libpgport/libpgport.lib;Debug/libpgcommon/libpgcommon.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      
<AdditionalDependencies>Debug/libpgfeutils/libpgfeutils.lib;Debug/libpgcommon/libpgcommon.lib;Debug/libpgport/libpgport.lib;Debug/libpq/libpq.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -112,7 +112,7 @@
     </ClCompile>
     <Link>
       <OutputFile>.\Release\pg_amcheck\pg_amcheck.exe</OutputFile>
-      
<AdditionalDependencies>Release/libpgfeutils/libpgfeutils.lib;Release/libpgcommon/libpgcommon.lib;Release/libpgport/libpgport.lib;Release/libpq/libpq.lib;Release/libpgport/libpgport.lib;Release/libpgcommon/libpgcommon.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      
<AdditionalDependencies>Release/libpgfeutils/libpgfeutils.lib;Release/libpgcommon/libpgcommon.lib;Release/libpgport/libpgport.lib;Release/libpq/libpq.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -151,12 +151,6 @@
     <ProjectReference Include="libpq.vcxproj">
       <Project>{00000000-0000-0000-0000-000000000000}</Project>
     </ProjectReference>
-    <ProjectReference Include="libpgport.vcxproj">
-      <Project>{00000000-0000-0000-0000-000000000000}</Project>
-    </ProjectReference>
-    <ProjectReference Include="libpgcommon.vcxproj">
-      <Project>{00000000-0000-0000-0000-000000000000}</Project>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff -u "L:\\proj_std/pg_archivecleanup.vcxproj" 
"L:\\proj_mod/pg_archivecleanup.vcxproj"
--- "L:\\proj_std/pg_archivecleanup.vcxproj"    2021-04-19 23:05:13.127971500 
+1200
+++ "L:\\proj_mod/pg_archivecleanup.vcxproj"    2021-04-19 23:02:23.930909700 
+1200
@@ -70,7 +70,7 @@
     </ClCompile>
     <Link>
       <OutputFile>.\Debug\pg_archivecleanup\pg_archivecleanup.exe</OutputFile>
-      
<AdditionalDependencies>Debug/libpgfeutils/libpgfeutils.lib;Debug/libpgcommon/libpgcommon.lib;Debug/libpgport/libpgport.lib;Debug/libpgport/libpgport.lib;Debug/libpgcommon/libpgcommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      
<AdditionalDependencies>Debug/libpgfeutils/libpgfeutils.lib;Debug/libpgcommon/libpgcommon.lib;Debug/libpgport/libpgport.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -112,7 +112,7 @@
     </ClCompile>
     <Link>
       
<OutputFile>.\Release\pg_archivecleanup\pg_archivecleanup.exe</OutputFile>
-      
<AdditionalDependencies>Release/libpgfeutils/libpgfeutils.lib;Release/libpgcommon/libpgcommon.lib;Release/libpgport/libpgport.lib;Release/libpgport/libpgport.lib;Release/libpgcommon/libpgcommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      
<AdditionalDependencies>Release/libpgfeutils/libpgfeutils.lib;Release/libpgcommon/libpgcommon.lib;Release/libpgport/libpgport.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -148,12 +148,6 @@
     <ProjectReference Include="libpgport.vcxproj">
       <Project>{00000000-0000-0000-0000-000000000000}</Project>
     </ProjectReference>
-    <ProjectReference Include="libpgport.vcxproj">
-      <Project>{00000000-0000-0000-0000-000000000000}</Project>
-    </ProjectReference>
-    <ProjectReference Include="libpgcommon.vcxproj">
-      <Project>{00000000-0000-0000-0000-000000000000}</Project>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff -u "L:\\proj_std/pg_test_fsync.vcxproj" 
"L:\\proj_mod/pg_test_fsync.vcxproj"
--- "L:\\proj_std/pg_test_fsync.vcxproj"        2021-04-19 23:05:13.285274000 
+1200
+++ "L:\\proj_mod/pg_test_fsync.vcxproj"        2021-04-19 23:02:24.084557600 
+1200
@@ -70,7 +70,7 @@
     </ClCompile>
     <Link>
       <OutputFile>.\Debug\pg_test_fsync\pg_test_fsync.exe</OutputFile>
-      
<AdditionalDependencies>Debug/libpgfeutils/libpgfeutils.lib;Debug/libpgcommon/libpgcommon.lib;Debug/libpgport/libpgport.lib;Debug/libpgport/libpgport.lib;Debug/libpgcommon/libpgcommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      
<AdditionalDependencies>Debug/libpgfeutils/libpgfeutils.lib;Debug/libpgcommon/libpgcommon.lib;Debug/libpgport/libpgport.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -112,7 +112,7 @@
     </ClCompile>
     <Link>
       <OutputFile>.\Release\pg_test_fsync\pg_test_fsync.exe</OutputFile>
-      
<AdditionalDependencies>Release/libpgfeutils/libpgfeutils.lib;Release/libpgcommon/libpgcommon.lib;Release/libpgport/libpgport.lib;Release/libpgport/libpgport.lib;Release/libpgcommon/libpgcommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      
<AdditionalDependencies>Release/libpgfeutils/libpgfeutils.lib;Release/libpgcommon/libpgcommon.lib;Release/libpgport/libpgport.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -148,12 +148,6 @@
     <ProjectReference Include="libpgport.vcxproj">
       <Project>{00000000-0000-0000-0000-000000000000}</Project>
     </ProjectReference>
-    <ProjectReference Include="libpgport.vcxproj">
-      <Project>{00000000-0000-0000-0000-000000000000}</Project>
-    </ProjectReference>
-    <ProjectReference Include="libpgcommon.vcxproj">
-      <Project>{00000000-0000-0000-0000-000000000000}</Project>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff -u "L:\\proj_std/pg_test_timing.vcxproj" 
"L:\\proj_mod/pg_test_timing.vcxproj"
--- "L:\\proj_std/pg_test_timing.vcxproj"       2021-04-19 23:05:13.292123000 
+1200
+++ "L:\\proj_mod/pg_test_timing.vcxproj"       2021-04-19 23:02:24.091401200 
+1200
@@ -70,7 +70,7 @@
     </ClCompile>
     <Link>
       <OutputFile>.\Debug\pg_test_timing\pg_test_timing.exe</OutputFile>
-      
<AdditionalDependencies>Debug/libpgfeutils/libpgfeutils.lib;Debug/libpgcommon/libpgcommon.lib;Debug/libpgport/libpgport.lib;Debug/libpgport/libpgport.lib;Debug/libpgcommon/libpgcommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      
<AdditionalDependencies>Debug/libpgfeutils/libpgfeutils.lib;Debug/libpgcommon/libpgcommon.lib;Debug/libpgport/libpgport.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -112,7 +112,7 @@
     </ClCompile>
     <Link>
       <OutputFile>.\Release\pg_test_timing\pg_test_timing.exe</OutputFile>
-      
<AdditionalDependencies>Release/libpgfeutils/libpgfeutils.lib;Release/libpgcommon/libpgcommon.lib;Release/libpgport/libpgport.lib;Release/libpgport/libpgport.lib;Release/libpgcommon/libpgcommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      
<AdditionalDependencies>Release/libpgfeutils/libpgfeutils.lib;Release/libpgcommon/libpgcommon.lib;Release/libpgport/libpgport.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -148,12 +148,6 @@
     <ProjectReference Include="libpgport.vcxproj">
       <Project>{00000000-0000-0000-0000-000000000000}</Project>
     </ProjectReference>
-    <ProjectReference Include="libpgport.vcxproj">
-      <Project>{00000000-0000-0000-0000-000000000000}</Project>
-    </ProjectReference>
-    <ProjectReference Include="libpgcommon.vcxproj">
-      <Project>{00000000-0000-0000-0000-000000000000}</Project>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff -u "L:\\proj_std/pg_upgrade.vcxproj" "L:\\proj_mod/pg_upgrade.vcxproj"
--- "L:\\proj_std/pg_upgrade.vcxproj"   2021-04-19 23:05:13.305385900 +1200
+++ "L:\\proj_mod/pg_upgrade.vcxproj"   2021-04-19 23:02:24.104752000 +1200
@@ -70,7 +70,7 @@
     </ClCompile>
     <Link>
       <OutputFile>.\Debug\pg_upgrade\pg_upgrade.exe</OutputFile>
-      
<AdditionalDependencies>Debug/libpgfeutils/libpgfeutils.lib;Debug/libpgcommon/libpgcommon.lib;Debug/libpgport/libpgport.lib;Debug/libpq/libpq.lib;Debug/libpgport/libpgport.lib;Debug/libpgcommon/libpgcommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      
<AdditionalDependencies>Debug/libpgfeutils/libpgfeutils.lib;Debug/libpgcommon/libpgcommon.lib;Debug/libpgport/libpgport.lib;Debug/libpq/libpq.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -112,7 +112,7 @@
     </ClCompile>
     <Link>
       <OutputFile>.\Release\pg_upgrade\pg_upgrade.exe</OutputFile>
-      
<AdditionalDependencies>Release/libpgfeutils/libpgfeutils.lib;Release/libpgcommon/libpgcommon.lib;Release/libpgport/libpgport.lib;Release/libpq/libpq.lib;Release/libpgport/libpgport.lib;Release/libpgcommon/libpgcommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      
<AdditionalDependencies>Release/libpgfeutils/libpgfeutils.lib;Release/libpgcommon/libpgcommon.lib;Release/libpgport/libpgport.lib;Release/libpq/libpq.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -165,12 +165,6 @@
     <ProjectReference Include="libpq.vcxproj">
       <Project>{00000000-0000-0000-0000-000000000000}</Project>
     </ProjectReference>
-    <ProjectReference Include="libpgport.vcxproj">
-      <Project>{00000000-0000-0000-0000-000000000000}</Project>
-    </ProjectReference>
-    <ProjectReference Include="libpgcommon.vcxproj">
-      <Project>{00000000-0000-0000-0000-000000000000}</Project>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff -u "L:\\proj_std/pg_waldump.vcxproj" "L:\\proj_mod/pg_waldump.vcxproj"
--- "L:\\proj_std/pg_waldump.vcxproj"   2021-04-19 23:05:13.325915900 +1200
+++ "L:\\proj_mod/pg_waldump.vcxproj"   2021-04-19 23:02:24.124304700 +1200
@@ -70,7 +70,7 @@
     </ClCompile>
     <Link>
       <OutputFile>.\Debug\pg_waldump\pg_waldump.exe</OutputFile>
-      
<AdditionalDependencies>Debug/libpgfeutils/libpgfeutils.lib;Debug/libpgcommon/libpgcommon.lib;Debug/libpgport/libpgport.lib;Debug/libpgport/libpgport.lib;Debug/libpgcommon/libpgcommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      
<AdditionalDependencies>Debug/libpgfeutils/libpgfeutils.lib;Debug/libpgcommon/libpgcommon.lib;Debug/libpgport/libpgport.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -112,7 +112,7 @@
     </ClCompile>
     <Link>
       <OutputFile>.\Release\pg_waldump\pg_waldump.exe</OutputFile>
-      
<AdditionalDependencies>Release/libpgfeutils/libpgfeutils.lib;Release/libpgcommon/libpgcommon.lib;Release/libpgport/libpgport.lib;Release/libpgport/libpgport.lib;Release/libpgcommon/libpgcommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      
<AdditionalDependencies>Release/libpgfeutils/libpgfeutils.lib;Release/libpgcommon/libpgcommon.lib;Release/libpgport/libpgport.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -172,12 +172,6 @@
     <ProjectReference Include="libpgport.vcxproj">
       <Project>{00000000-0000-0000-0000-000000000000}</Project>
     </ProjectReference>
-    <ProjectReference Include="libpgport.vcxproj">
-      <Project>{00000000-0000-0000-0000-000000000000}</Project>
-    </ProjectReference>
-    <ProjectReference Include="libpgcommon.vcxproj">
-      <Project>{00000000-0000-0000-0000-000000000000}</Project>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff -u "L:\\proj_std/pgbench.vcxproj" "L:\\proj_mod/pgbench.vcxproj"
--- "L:\\proj_std/pgbench.vcxproj"      2021-04-19 23:05:13.332759100 +1200
+++ "L:\\proj_mod/pgbench.vcxproj"      2021-04-19 23:02:24.131134000 +1200
@@ -70,7 +70,7 @@
     </ClCompile>
     <Link>
       <OutputFile>.\Debug\pgbench\pgbench.exe</OutputFile>
-      
<AdditionalDependencies>Debug/libpgfeutils/libpgfeutils.lib;Debug/libpgcommon/libpgcommon.lib;Debug/libpgport/libpgport.lib;Debug/libpq/libpq.lib;Debug/libpgport/libpgport.lib;Debug/libpgcommon/libpgcommon.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      
<AdditionalDependencies>Debug/libpgfeutils/libpgfeutils.lib;Debug/libpgcommon/libpgcommon.lib;Debug/libpgport/libpgport.lib;Debug/libpq/libpq.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -112,7 +112,7 @@
     </ClCompile>
     <Link>
       <OutputFile>.\Release\pgbench\pgbench.exe</OutputFile>
-      
<AdditionalDependencies>Release/libpgfeutils/libpgfeutils.lib;Release/libpgcommon/libpgcommon.lib;Release/libpgport/libpgport.lib;Release/libpq/libpq.lib;Release/libpgport/libpgport.lib;Release/libpgcommon/libpgcommon.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      
<AdditionalDependencies>Release/libpgfeutils/libpgfeutils.lib;Release/libpgcommon/libpgcommon.lib;Release/libpgport/libpgport.lib;Release/libpq/libpq.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -174,12 +174,6 @@
     <ProjectReference Include="libpq.vcxproj">
       <Project>{00000000-0000-0000-0000-000000000000}</Project>
     </ProjectReference>
-    <ProjectReference Include="libpgport.vcxproj">
-      <Project>{00000000-0000-0000-0000-000000000000}</Project>
-    </ProjectReference>
-    <ProjectReference Include="libpgcommon.vcxproj">
-      <Project>{00000000-0000-0000-0000-000000000000}</Project>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff -u "L:\\proj_std/plpython3.vcxproj" "L:\\proj_mod/plpython3.vcxproj"
--- "L:\\proj_std/plpython3.vcxproj"    2021-04-19 23:05:13.379490400 +1200
+++ "L:\\proj_mod/plpython3.vcxproj"    2021-04-19 23:02:24.179051000 +1200
@@ -70,7 +70,7 @@
     </ClCompile>
     <Link>
       <OutputFile>.\Debug\plpython3\plpython3.dll</OutputFile>
-      
<AdditionalDependencies>C:\python-3.9.1-embed/Libs/python39.lib;Debug/postgres/postgres.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      
<AdditionalDependencies>Debug/postgres/postgres.lib;C:\python-3.9.1-embed/Libs/python39.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@@ -118,7 +118,7 @@
     </ClCompile>
     <Link>
       <OutputFile>.\Release\plpython3\plpython3.dll</OutputFile>
-      
<AdditionalDependencies>C:\python-3.9.1-embed/Libs/python39.lib;Release/postgres/postgres.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      
<AdditionalDependencies>Release/postgres/postgres.lib;C:\python-3.9.1-embed/Libs/python39.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       
<IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

reduce_contrib_build_special_cases_on_windows_v8.patch
Description: Binary data

Re: Reduce the number of special cases to build contrib modules on windows

Reply via email to