From eba0856c489d516f8920aafd00455443d9f72cf0 Mon Sep 17 00:00:00 2001
From: Jose <jose@zeroc.com>
Date: Fri, 2 Feb 2024 13:59:21 +0100
Subject: [PATCH] MATLAB and Python build fixes

---
 cpp/msbuild/ice.cpp.props                  |  2 +-
 matlab/msbuild/ice.proj                    |  6 +++---
 matlab/src/msbuild/ice/ice.vcxproj         | 18 +++++++++---------
 python/modules/IcePy/Communicator.cpp      |  1 -
 python/modules/IcePy/Connection.cpp        |  1 -
 python/modules/IcePy/Operation.h           |  1 -
 python/modules/IcePy/msbuild/icepy.vcxproj |  8 ++++----
 python/msbuild/ice.proj                    |  6 +++---
 python/msbuild/ice.props                   |  2 +-
 9 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/cpp/msbuild/ice.cpp.props b/cpp/msbuild/ice.cpp.props
index 01849266da8..b5612063a25 100644
--- a/cpp/msbuild/ice.cpp.props
+++ b/cpp/msbuild/ice.cpp.props
@@ -162,7 +162,7 @@
     </Link>
   </ItemDefinitionGroup>
 
-  <ItemDefinitionGroup Condition="'$(ConfigurationType)|$(IceBuildingSrc)' == 'DynamicLibrary|yes'">
+  <ItemDefinitionGroup Condition="'$(ConfigurationType)|$(IceBuildingSrc)|$(IceLanguageMapping)' == 'DynamicLibrary|yes|cpp'">
     <Link>
       <ImportLibrary>$(IceHome)\cpp\lib\$(Platform)\$(Configuration)\$(TargetName).lib</ImportLibrary>
     </Link>
diff --git a/matlab/msbuild/ice.proj b/matlab/msbuild/ice.proj
index 77e6ba35cba..076da5267cb 100644
--- a/matlab/msbuild/ice.proj
+++ b/matlab/msbuild/ice.proj
@@ -39,13 +39,13 @@
     <Target Name="NuGetRestore" DependsOnTargets="GetNuGet">
         <Exec Command="$(NuGetExe) install zeroc.ice.v143 -OutputDirectory $(MSBuildThisFileDirectory)packages -Version $(IceJSONVersion)"
               Condition="'$(ICE_BIN_DIST)' == 'cpp'"/>
-        <Exec Command="$(NuGetExe) restore $(MSBuildThisFileDirectory)..\..\cpp\msbuild\ice.$(DefaultPlatformToolset).sln"
+        <Exec Command="$(NuGetExe) restore $(MSBuildThisFileDirectory)..\..\cpp\msbuild\ice.sln"
               Condition="'$(ICE_BIN_DIST)' == ''"/>
     </Target>
 
     <Target Name="BuildCppDist" Condition="'$(ICE_BIN_DIST)' == ''" DependsOnTargets="NuGetRestore">
-        <MSBuild Projects="$(MSBuildThisFileDirectory)..\..\cpp\msbuild\ice.$(DefaultPlatformToolset).sln"
-                 Targets="c++98\slice2matlab;c++11\ice++11;c++11\icessl++11;c++11\icediscovery++11;c++11\icelocatordiscovery++11"
+        <MSBuild Projects="$(MSBuildThisFileDirectory)..\..\cpp\msbuild\ice.sln"
+                 Targets="slice2matlab;ice;icessl;icediscovery;icelocatordiscovery"
                  BuildInParallel="true"
                  Properties="Platform=$(Platform);Configuration=$(Configuration)" />
     </Target>
diff --git a/matlab/src/msbuild/ice/ice.vcxproj b/matlab/src/msbuild/ice/ice.vcxproj
index 8c075f9e3e4..a719ec8094e 100644
--- a/matlab/src/msbuild/ice/ice.vcxproj
+++ b/matlab/src/msbuild/ice/ice.vcxproj
@@ -97,17 +97,17 @@
   </PropertyGroup>
   <Target Name="AfterClean">
     <Delete Files="$(OutDir)\bzip2$(DebugExtension).dll" />
-    <Delete Files="$(OutDir)\ice37++11$(DebugExtension).dll" />
-    <Delete Files="$(OutDir)\icediscovery37++11$(DebugExtension).dll" />
-    <Delete Files="$(OutDir)\icelocatordiscovery37++11$(DebugExtension).dll" />
-    <Delete Files="$(OutDir)\icessl37++11$(DebugExtension).dll" />
+    <Delete Files="$(OutDir)\ice$(IceSoVersion)$(DebugExtension).dll" />
+    <Delete Files="$(OutDir)\icediscovery$(IceSoVersion)$(DebugExtension).dll" />
+    <Delete Files="$(OutDir)\icelocatordiscovery$(IceSoVersion)$(DebugExtension).dll" />
+    <Delete Files="$(OutDir)\icessl$(IceSoVersion)$(DebugExtension).dll" />
   </Target>
   <Target Name="AfterBuild">
     <Copy SourceFiles="$(IceBinPath)\bzip2$(DebugExtension).dll" DestinationFolder="$(OutDir)" SkipUnchangedFiles="true" />
-    <Copy SourceFiles="$(IceBinPath)\ice37++11$(DebugExtension).dll" DestinationFolder="$(OutDir)" SkipUnchangedFiles="true" />
-    <Copy SourceFiles="$(IceBinPath)\icediscovery37++11$(DebugExtension).dll" DestinationFolder="$(OutDir)" SkipUnchangedFiles="true" />
-    <Copy SourceFiles="$(IceBinPath)\icelocatordiscovery37++11$(DebugExtension).dll" DestinationFolder="$(OutDir)" SkipUnchangedFiles="true" />
-    <Copy SourceFiles="$(IceBinPath)\icessl37++11$(DebugExtension).dll" DestinationFolder="$(OutDir)" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(IceBinPath)\ice$(IceSoVersion)$(DebugExtension).dll" DestinationFolder="$(OutDir)" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(IceBinPath)\icediscovery$(IceSoVersion)$(DebugExtension).dll" DestinationFolder="$(OutDir)" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(IceBinPath)\icelocatordiscovery$(IceSoVersion)$(DebugExtension).dll" DestinationFolder="$(OutDir)" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(IceBinPath)\icessl$(IceSoVersion)$(DebugExtension).dll" DestinationFolder="$(OutDir)" SkipUnchangedFiles="true" />
   </Target>
   <Target Name="MatlabHome" BeforeTargets="PrepareForBuild">
     <Error Text="Cannot detect a valid MATLAB installation" Condition="!Exists('$(MatlabHome)')" />
@@ -119,4 +119,4 @@
     <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v143.3.8.0-alpha0\build\native\zeroc.ice.v143.props') And '$(ICE_BIN_DIST)' == 'cpp'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v143.3.8.0-alpha0\build\native\zeroc.ice.v143.props'))" />
     <Error Condition="!Exists('..\..\..\msbuild\packages\zeroc.ice.v143.3.8.0-alpha0\build\native\zeroc.ice.v143.targets') And '$(ICE_BIN_DIST)' == 'cpp'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\zeroc.ice.v143.3.8.0-alpha0\build\native\zeroc.ice.v143.targets'))" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/python/modules/IcePy/Communicator.cpp b/python/modules/IcePy/Communicator.cpp
index 1b4cf678ce7..d1005430c89 100644
--- a/python/modules/IcePy/Communicator.cpp
+++ b/python/modules/IcePy/Communicator.cpp
@@ -19,7 +19,6 @@
 #include <ValueFactoryManager.h>
 #include <Ice/ValueFactory.h>
 #include <Ice/Initialize.h>
-#include <Ice/CommunicatorAsync.h>
 #include <Ice/LocalException.h>
 #include <Ice/Locator.h>
 #include <Ice/ObjectAdapter.h>
diff --git a/python/modules/IcePy/Connection.cpp b/python/modules/IcePy/Connection.cpp
index 36ed6ac9040..e7f8146c65d 100644
--- a/python/modules/IcePy/Connection.cpp
+++ b/python/modules/IcePy/Connection.cpp
@@ -12,7 +12,6 @@
 #include <Thread.h>
 #include <Types.h>
 #include <Util.h>
-#include <Ice/ConnectionAsync.h>
 
 using namespace std;
 using namespace IcePy;
diff --git a/python/modules/IcePy/Operation.h b/python/modules/IcePy/Operation.h
index f01d52dbc21..87524ab0995 100644
--- a/python/modules/IcePy/Operation.h
+++ b/python/modules/IcePy/Operation.h
@@ -8,7 +8,6 @@
 #include <Config.h>
 #include <Ice/Current.h>
 #include <Ice/Object.h>
-#include <Ice/AsyncResultF.h>
 #include <Ice/CommunicatorF.h>
 #include <Util.h>
 
diff --git a/python/modules/IcePy/msbuild/icepy.vcxproj b/python/modules/IcePy/msbuild/icepy.vcxproj
index 125100af350..63a4f0a4f53 100644
--- a/python/modules/IcePy/msbuild/icepy.vcxproj
+++ b/python/modules/IcePy/msbuild/icepy.vcxproj
@@ -194,10 +194,10 @@
   </PropertyGroup>
   <Target Name="CopyDependencies">
     <Copy SourceFiles="..\..\..\..\cpp\bin\$(Platform)\$(Configuration)\bzip2$(TargetSuffix).dll" DestinationFolder="$(OutDir)" SkipUnchangedFiles="True" />
-    <Copy SourceFiles="..\..\..\..\cpp\bin\$(Platform)\$(Configuration)\ice$(IceSoVersion)++11$(TargetSuffix).dll" DestinationFolder="$(OutDir)" SkipUnchangedFiles="True" />
-    <Copy SourceFiles="..\..\..\..\cpp\bin\$(Platform)\$(Configuration)\icessl$(IceSoVersion)++11$(TargetSuffix).dll" DestinationFolder="$(OutDir)" SkipUnchangedFiles="True" />
-    <Copy SourceFiles="..\..\..\..\cpp\bin\$(Platform)\$(Configuration)\icediscovery$(IceSoVersion)++11$(TargetSuffix).dll" DestinationFolder="$(OutDir)" SkipUnchangedFiles="True" />
-    <Copy SourceFiles="..\..\..\..\cpp\bin\$(Platform)\$(Configuration)\icelocatordiscovery$(IceSoVersion)++11$(TargetSuffix).dll" DestinationFolder="$(OutDir)" SkipUnchangedFiles="True" />
+    <Copy SourceFiles="..\..\..\..\cpp\bin\$(Platform)\$(Configuration)\ice$(IceSoVersion)$(TargetSuffix).dll" DestinationFolder="$(OutDir)" SkipUnchangedFiles="True" />
+    <Copy SourceFiles="..\..\..\..\cpp\bin\$(Platform)\$(Configuration)\icessl$(IceSoVersion)$(TargetSuffix).dll" DestinationFolder="$(OutDir)" SkipUnchangedFiles="True" />
+    <Copy SourceFiles="..\..\..\..\cpp\bin\$(Platform)\$(Configuration)\icediscovery$(IceSoVersion)$(TargetSuffix).dll" DestinationFolder="$(OutDir)" SkipUnchangedFiles="True" />
+    <Copy SourceFiles="..\..\..\..\cpp\bin\$(Platform)\$(Configuration)\icelocatordiscovery$(IceSoVersion)$(TargetSuffix).dll" DestinationFolder="$(OutDir)" SkipUnchangedFiles="True" />
   </Target>
   <PropertyGroup>
     <BuildDependsOn>
diff --git a/python/msbuild/ice.proj b/python/msbuild/ice.proj
index 1dd566b810b..6090b5c385a 100644
--- a/python/msbuild/ice.proj
+++ b/python/msbuild/ice.proj
@@ -15,7 +15,7 @@
 
     <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
     <PropertyGroup>
-        <CppDistTargets>c++98\slice2py;c++11\icessl++11;c++11\icediscovery++11;c++11\icelocatordiscovery++11;c++11\glacier2router++11;c++11\glacier2cryptpermissionsverifier++11</CppDistTargets>
+        <CppDistTargets>slice2py;icessl;icediscovery;icelocatordiscovery;glacier2router;glacier2cryptpermissionsverifier</CppDistTargets>
     </PropertyGroup>
 
     <Import Project="$(MSBuildThisFileDirectory)\..\..\config\ice.common.targets" />
@@ -48,8 +48,8 @@
     </ItemGroup>
 
     <Target Name="BuildCppDist" DependsOnTargets="NuGetRestore">
-        <Exec Command="$(NuGetExe) restore $(MSBuildThisFileDirectory)..\..\cpp\msbuild\ice.$(DefaultPlatformToolset).sln"/>
-        <MSBuild Projects="$(MSBuildThisFileDirectory)..\..\cpp\msbuild\ice.$(DefaultPlatformToolset).sln"
+        <Exec Command="$(NuGetExe) restore $(MSBuildThisFileDirectory)..\..\cpp\msbuild\ice.sln"/>
+        <MSBuild Projects="$(MSBuildThisFileDirectory)..\..\cpp\msbuild\ice.sln"
                  Targets="$(CppDistTargets)"
                  BuildInParallel="true"
                  Properties="Platform=$(Platform);Configuration=$(Configuration)" />
diff --git a/python/msbuild/ice.props b/python/msbuild/ice.props
index 66a3f39e09d..730126bc3ed 100644
--- a/python/msbuild/ice.props
+++ b/python/msbuild/ice.props
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <IceLanguageMapping>python</IceLanguageMapping>
   </PropertyGroup>
-  <Import Project="..\..\cpp\msbuild\Ice.Cpp98.props" />
+  <Import Project="..\..\cpp\msbuild\Ice.Cpp.props" />
   <PropertyGroup Label="UserMacros" Condition="'$(Platform)'=='Win32'">
     <PythonHome Condition="'$(PythonHome)' == ''">C:\Program Files (x86)\Python312-32</PythonHome>
   </PropertyGroup>