Merge remote-tracking branch 'origin/main' into ruby-new

zeroc-ice · Jan 22, 2024 · 3330840 · 3330840
2 parents 6d20a06 + 9af8a37
commit 3330840
Show file tree

Hide file tree

Showing 33 changed files with 90 additions and 69 deletions.
diff --git a/cpp/src/Slice/msbuild/slice.vcxproj b/cpp/src/Slice/msbuild/slice.vcxproj
@@ -95,12 +95,7 @@
     <ClCompile Include="..\FileTracker.cpp" />
     <ClCompile Include="..\Grammar.cpp" />
     <ClCompile Include="..\Parser.cpp" />
-    <ClCompile Include="..\PHPUtil.cpp" />
     <ClCompile Include="..\Preprocessor.cpp" />
-    <ClCompile Include="..\Python.cpp" />
-    <ClCompile Include="..\PythonUtil.cpp" />
-    <ClCompile Include="..\Ruby.cpp" />
-    <ClCompile Include="..\RubyUtil.cpp" />
     <ClCompile Include="..\Scanner.cpp" />
     <ClCompile Include="..\SliceUtil.cpp" />
     <ClCompile Include="..\StringLiteralUtil.cpp" />
@@ -110,10 +105,7 @@
     <ClInclude Include="..\Grammar.h" />
     <ClInclude Include="..\GrammarUtil.h" />
     <ClInclude Include="..\Parser.h" />
-    <ClInclude Include="..\PHPUtil.h" />
     <ClInclude Include="..\Preprocessor.h" />
-    <ClInclude Include="..\PythonUtil.h" />
-    <ClInclude Include="..\RubyUtil.h" />
     <ClInclude Include="..\Util.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/cpp/src/Slice/msbuild/slice.vcxproj.filters b/cpp/src/Slice/msbuild/slice.vcxproj.filters
@@ -18,19 +18,12 @@
     <ClCompile Include="..\FileTracker.cpp" />
     <ClCompile Include="..\Grammar.cpp" />
     <ClCompile Include="..\Parser.cpp" />
-    <ClCompile Include="..\PHPUtil.cpp" />
     <ClCompile Include="..\Preprocessor.cpp" />
-    <ClCompile Include="..\Python.cpp" />
-    <ClCompile Include="..\PythonUtil.cpp" />
-    <ClCompile Include="..\Ruby.cpp" />
-    <ClCompile Include="..\RubyUtil.cpp" />
     <ClCompile Include="..\Scanner.cpp" />
     <ClCompile Include="..\SliceUtil.cpp" />
     <ClCompile Include="..\StringLiteralUtil.cpp" />
-    <ClCompile Include="..\CPlusPlusUtil.cpp" />
     <ClCompile Include="..\FileTracker.cpp" />
     <ClCompile Include="..\Grammar.cpp" />
-    <ClCompile Include="..\JavaUtil.cpp" />
     <ClCompile Include="..\Parser.cpp" />
     <ClCompile Include="..\PHPUtil.cpp" />
     <ClCompile Include="..\Preprocessor.cpp" />
@@ -257,16 +250,11 @@
     <ClInclude Include="..\Grammar.h" />
     <ClInclude Include="..\GrammarUtil.h" />
     <ClInclude Include="..\Parser.h" />
-    <ClInclude Include="..\PHPUtil.h" />
     <ClInclude Include="..\Preprocessor.h" />
-    <ClInclude Include="..\PythonUtil.h" />
-    <ClInclude Include="..\RubyUtil.h" />
     <ClInclude Include="..\Util.h" />
-    <ClInclude Include="..\CPlusPlusUtil.h" />
     <ClInclude Include="..\FileTracker.h" />
     <ClInclude Include="..\Grammar.h" />
     <ClInclude Include="..\GrammarUtil.h" />
-    <ClInclude Include="..\JavaUtil.h" />
     <ClInclude Include="..\Parser.h" />
     <ClInclude Include="..\PHPUtil.h" />
     <ClInclude Include="..\Preprocessor.h" />

diff --git a/cpp/src/slice2php/Main.cpp b/cpp/src/slice2php/Main.cpp
@@ -13,7 +13,7 @@
 #include <IceUtil/ConsoleUtil.h>
 #include <Slice/Preprocessor.h>
 #include <Slice/FileTracker.h>
-#include <Slice/PHPUtil.h>
+#include "PHPUtil.h"
 #include <Slice/Parser.h>
 #include <Slice/Util.h>
 #include <cstring>

diff --git a/cpp/src/Slice/PHPUtil.cpp → cpp/src/slice2php/PHPUtil.cpp b/cpp/src/Slice/PHPUtil.cpp → cpp/src/slice2php/PHPUtil.cpp
@@ -3,7 +3,7 @@
 //
 
 #include <Slice/Util.h>
-#include <Slice/PHPUtil.h>
+#include "PHPUtil.h"
 #include <functional>
 #include <algorithm>
 #include <vector>

diff --git a/cpp/src/Slice/PHPUtil.h → cpp/src/slice2php/PHPUtil.h b/cpp/src/Slice/PHPUtil.h → cpp/src/slice2php/PHPUtil.h
diff --git a/cpp/src/slice2php/msbuild/slice2php.vcxproj b/cpp/src/slice2php/msbuild/slice2php.vcxproj
@@ -105,6 +105,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\Main.cpp" />
+    <ClCompile Include="..\PHPUtil.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\Slice2PHP.rc" />
@@ -120,6 +121,9 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\PHPUtil.h" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\..\..\msbuild\packages\mcpp.v143.2.7.2.17\build\native\mcpp.v143.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v143.2.7.2.17\build\native\mcpp.v143.targets')" />

diff --git a/cpp/src/slice2php/msbuild/slice2php.vcxproj.filters b/cpp/src/slice2php/msbuild/slice2php.vcxproj.filters
@@ -18,6 +18,9 @@
     <ClCompile Include="..\Main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\PHPUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\Slice2PHP.rc">
@@ -27,4 +30,9 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\PHPUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
 </Project>
diff --git a/cpp/src/slice2py/Main.cpp b/cpp/src/slice2py/Main.cpp
@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 
-#include <Slice/PythonUtil.h>
+#include "PythonUtil.h"
 #include <Slice/Util.h>
 #include <IceUtil/ConsoleUtil.h>
 

diff --git a/cpp/src/Slice/Python.cpp → cpp/src/slice2py/Python.cpp b/cpp/src/Slice/Python.cpp → cpp/src/slice2py/Python.cpp
@@ -13,7 +13,7 @@
 #include <IceUtil/FileUtil.h>
 #include <Slice/Preprocessor.h>
 #include <Slice/FileTracker.h>
-#include <Slice/PythonUtil.h>
+#include "PythonUtil.h"
 #include <Slice/Util.h>
 #include <cstring>
 

diff --git a/cpp/src/Slice/PythonUtil.cpp → cpp/src/slice2py/PythonUtil.cpp b/cpp/src/Slice/PythonUtil.cpp → cpp/src/slice2py/PythonUtil.cpp
@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 
-#include <Slice/PythonUtil.h>
+#include "PythonUtil.h"
 #include <Slice/Util.h>
 #include <IceUtil/IceUtil.h>
 #include <IceUtil/StringUtil.h>

diff --git a/cpp/src/Slice/PythonUtil.h → cpp/src/slice2py/PythonUtil.h b/cpp/src/Slice/PythonUtil.h → cpp/src/slice2py/PythonUtil.h
diff --git a/cpp/src/slice2py/msbuild/slice2py.vcxproj b/cpp/src/slice2py/msbuild/slice2py.vcxproj
@@ -105,6 +105,8 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\Main.cpp" />
+    <ClCompile Include="..\Python.cpp" />
+    <ClCompile Include="..\PythonUtil.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\Slice2Py.rc" />
@@ -120,6 +122,9 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\PythonUtil.h" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\..\..\msbuild\packages\mcpp.v143.2.7.2.17\build\native\mcpp.v143.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v143.2.7.2.17\build\native\mcpp.v143.targets')" />

diff --git a/cpp/src/slice2py/msbuild/slice2py.vcxproj.filters b/cpp/src/slice2py/msbuild/slice2py.vcxproj.filters
@@ -18,6 +18,12 @@
     <ClCompile Include="..\Main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\Python.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\PythonUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\Slice2Py.rc">
@@ -27,4 +33,9 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\PythonUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
 </Project>
diff --git a/cpp/src/slice2rb/Main.cpp b/cpp/src/slice2rb/Main.cpp
@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 
-#include <Slice/RubyUtil.h>
+#include "RubyUtil.h"
 #include <Slice/Util.h>
 #include <IceUtil/ConsoleUtil.h>
 

diff --git a/cpp/src/Slice/Ruby.cpp → cpp/src/slice2rb/Ruby.cpp b/cpp/src/Slice/Ruby.cpp → cpp/src/slice2rb/Ruby.cpp
@@ -10,7 +10,7 @@
 #include <IceUtil/ConsoleUtil.h>
 #include <Slice/Preprocessor.h>
 #include <Slice/FileTracker.h>
-#include <Slice/RubyUtil.h>
+#include "RubyUtil.h"
 #include <Slice/Util.h>
 
 #include <string.h>

diff --git a/cpp/src/Slice/RubyUtil.cpp → cpp/src/slice2rb/RubyUtil.cpp b/cpp/src/Slice/RubyUtil.cpp → cpp/src/slice2rb/RubyUtil.cpp
@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 
-#include <Slice/RubyUtil.h>
+#include "RubyUtil.h"
 #include <Slice/Util.h>
 #include <IceUtil/InputUtil.h>
 #include <iterator>

diff --git a/cpp/src/Slice/RubyUtil.h → cpp/src/slice2rb/RubyUtil.h b/cpp/src/Slice/RubyUtil.h → cpp/src/slice2rb/RubyUtil.h
diff --git a/cpp/src/slice2rb/msbuild/slice2rb.vcxproj b/cpp/src/slice2rb/msbuild/slice2rb.vcxproj
@@ -104,6 +104,8 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\Main.cpp" />
+    <ClCompile Include="..\Ruby.cpp" />
+    <ClCompile Include="..\RubyUtil.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\IceUtil\msbuild\iceutil\iceutil.vcxproj">
@@ -119,6 +121,9 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\RubyUtil.h" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\..\..\msbuild\packages\mcpp.v143.2.7.2.17\build\native\mcpp.v143.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v143.2.7.2.17\build\native\mcpp.v143.targets')" />

diff --git a/cpp/src/slice2rb/msbuild/slice2rb.vcxproj.filters b/cpp/src/slice2rb/msbuild/slice2rb.vcxproj.filters
@@ -18,6 +18,12 @@
     <ClCompile Include="..\Main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\Ruby.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\RubyUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\Slice2Rb.rc">
@@ -27,4 +33,9 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\RubyUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
 </Project>
diff --git a/php/src/Makefile.mk b/php/src/Makefile.mk
@@ -8,18 +8,16 @@ IcePHP_target           := php-module
 IcePHP_targetname       := ice
 IcePHP_targetdir        := lib
 IcePHP_installdir       := $(install_phplibdir)
-IcePHP_cppflags         := -I$(project) -I$(top_srcdir)/cpp/src $(ice_cpp_cppflags) $(php_cppflags)
+IcePHP_cppflags         := -I$(project) -I$(top_srcdir)/cpp/src -I$(top_srcdir)/cpp/src/slice2php $(ice_cpp_cppflags) $(php_cppflags)
 IcePHP_ldflags          := $(php_ldflags)
 IcePHP_dependencies     := IceDiscovery++11 IceLocatorDiscovery++11 IceSSL++11 Ice++11
 # TODO temporary ++11 dependencies are not linked
 IcePHP_system_libs      := -L$(top_srcdir)/cpp/lib/x86_64-linux-gnu \
     -L$(top_srcdir)/cpp/lib \
     -lIce++11 -lIceSSL++11 -lIceDiscovery++11 -lIceLocatorDiscovery++11
-IcePHP_extra_sources    := $(filter-out %Util.cpp %Ruby.cpp,\
-                           $(wildcard $(top_srcdir)/cpp/src/Slice/*.cpp)) \
-                           $(top_srcdir)/cpp/src/Slice/SliceUtil.cpp \
-                           $(top_srcdir)/cpp/src/Slice/PHPUtil.cpp \
-                           $(top_srcdir)/cpp/src/Slice/StringLiteralUtil.cpp \
+
+IcePHP_extra_sources    := $(wildcard $(top_srcdir)/cpp/src/Slice/*.cpp) \
+                           $(top_srcdir)/cpp/src/slice2php/PHPUtil.cpp   \
 
 projects += $(project)
 srcs:: $(project)
diff --git a/php/src/Operation.cpp b/php/src/Operation.cpp
@@ -8,7 +8,7 @@
 #include "Types.h"
 #include "Util.h"
 
-#include "Slice/PHPUtil.h"
+#include "PHPUtil.h"
 
 using namespace std;
 using namespace IcePHP;

diff --git a/php/src/Types.cpp b/php/src/Types.cpp
@@ -8,7 +8,7 @@
 
 #include <IceUtil/InputUtil.h>
 #include <IceUtil/OutputUtil.h>
-#include <Slice/PHPUtil.h>
+#include "PHPUtil.h"
 #include <Ice/SlicedData.h>
 
 #include <limits>

diff --git a/php/src/Util.cpp b/php/src/Util.cpp
@@ -5,7 +5,7 @@
 #include "Util.h"
 
 #include <Ice/UUID.h>
-#include <Slice/PHPUtil.h>
+#include "PHPUtil.h"
 
 #include <algorithm>
 #include <ctype.h>

diff --git a/python/modules/IcePy/Makefile.mk b/python/modules/IcePy/Makefile.mk
@@ -8,15 +8,13 @@ IcePy_target            := python-module
 IcePy_targetname        := IcePy
 IcePy_targetdir         := $(lang_srcdir)/python
 IcePy_installdir        := $(install_pythondir)
-IcePy_cppflags          := -I$(project) $(ice_cpp_cppflags) -I$(top_srcdir)/cpp/src $(python_cppflags)
+IcePy_cppflags          := -I$(project) $(ice_cpp_cppflags) -I$(top_srcdir)/cpp/src -I$(top_srcdir)/cpp/src/slice2py $(python_cppflags)
 IcePy_system_libs       := $(python_ldflags)
 IcePy_dependencies      := IceDiscovery IceLocatorDiscovery IceSSL Ice
 IcePy_libs              := mcpp
-IcePy_extra_sources     := $(filter-out %Util.cpp %Ruby.cpp,\
-                           $(wildcard $(top_srcdir)/cpp/src/Slice/*.cpp)) \
-                           $(top_srcdir)/cpp/src/Slice/SliceUtil.cpp \
-                           $(top_srcdir)/cpp/src/Slice/PythonUtil.cpp \
-                           $(top_srcdir)/cpp/src/Slice/StringLiteralUtil.cpp \
+IcePy_extra_sources     := $(wildcard $(top_srcdir)/cpp/src/Slice/*.cpp) \
+                           $(top_srcdir)/cpp/src/slice2py/PythonUtil.cpp \
+                           $(top_srcdir)/cpp/src/slice2py/Python.cpp     \
 
 #
 # On the default platform, always write the module in the python directory.

diff --git a/python/modules/IcePy/Operation.cpp b/python/modules/IcePy/Operation.cpp
@@ -20,7 +20,7 @@
 #include <Ice/Properties.h>
 #include <Ice/Proxy.h>
 #include <IceUtil/Time.h>
-#include <Slice/PythonUtil.h>
+#include "PythonUtil.h"
 
 using namespace std;
 using namespace IcePy;

diff --git a/python/modules/IcePy/Slice.cpp b/python/modules/IcePy/Slice.cpp
@@ -5,7 +5,7 @@
 #include <Slice.h>
 #include <Util.h>
 #include <Slice/Preprocessor.h>
-#include <Slice/PythonUtil.h>
+#include "PythonUtil.h"
 #include <Slice/Util.h>
 #include <IceUtil/Options.h>
 #include <IceUtil/ConsoleUtil.h>

diff --git a/python/modules/IcePy/Util.cpp b/python/modules/IcePy/Util.cpp
@@ -7,7 +7,7 @@
 #include <Ice/LocalException.h>
 #include <Ice/Protocol.h>
 #include <Ice/UUID.h>
-#include <Slice/PythonUtil.h>
+#include "PythonUtil.h"
 #include <compile.h>
 #include <frameobject.h>
 

diff --git a/python/modules/IcePy/msbuild/icepy.vcxproj b/python/modules/IcePy/msbuild/icepy.vcxproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0"
-  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -20,12 +19,12 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\..\cpp\src\slice2py\Python.cpp" />
+    <ClCompile Include="..\..\..\..\cpp\src\slice2py\PythonUtil.cpp" />
     <ClCompile Include="..\..\..\..\cpp\src\Slice\FileTracker.cpp" />
     <ClCompile Include="..\..\..\..\cpp\src\Slice\Grammar.cpp" />
     <ClCompile Include="..\..\..\..\cpp\src\Slice\Parser.cpp" />
     <ClCompile Include="..\..\..\..\cpp\src\Slice\Preprocessor.cpp" />
-    <ClCompile Include="..\..\..\..\cpp\src\Slice\Python.cpp" />
-    <ClCompile Include="..\..\..\..\cpp\src\Slice\PythonUtil.cpp" />
     <ClCompile Include="..\..\..\..\cpp\src\Slice\Scanner.cpp" />
     <ClCompile Include="..\..\..\..\cpp\src\Slice\SliceUtil.cpp" />
     <ClCompile Include="..\..\..\..\cpp\src\Slice\StringLiteralUtil.cpp" />
@@ -52,6 +51,7 @@
     <ClCompile Include="..\ValueFactoryManager.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\..\..\cpp\src\slice2py\PythonUtil.h" />
     <ClInclude Include="..\BatchRequestInterceptor.h" />
     <ClInclude Include="..\Communicator.h" />
     <ClInclude Include="..\Config.h" />
@@ -205,4 +205,4 @@
             CopyDependencies
     </BuildDependsOn>
   </PropertyGroup>
-</Project>
+</Project>