Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move PythonUtil, RubyUtil etc. out of src/Slice #1702

Merged
merged 5 commits into from
Jan 20, 2024
Merged

Move PythonUtil, RubyUtil etc. out of src/Slice #1702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ec86545
Move PHPUtil, PythonUtil etc. out of Slice
bernardnormier Jan 19, 2024
7353bea
Fix Windows build
bernardnormier Jan 19, 2024
bdf842d
Fix Windows build
bernardnormier Jan 19, 2024
dea1290
Merge remote-tracking branch 'origin/main' into move-util
bernardnormier Jan 19, 2024
1ba55ca
Merge remote-tracking branch 'origin/main' into move-util
bernardnormier Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions cpp/src/Slice/msbuild/slice.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -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" />
Expand Down
12 changes: 0 additions & 12 deletions cpp/src/Slice/msbuild/slice.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down Expand Up @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/slice2php/Main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/Slice/PHPUtil.cpp → cpp/src/slice2php/PHPUtil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//

#include <Slice/Util.h>
#include <Slice/PHPUtil.h>
#include "PHPUtil.h"
#include <functional>
#include <algorithm>
#include <vector>
Expand Down
0 cpp/src/Slice/PHPUtil.h → cpp/src/slice2php/PHPUtil.h
View file
Open in desktop
File renamed without changes.
4 changes: 4 additions & 0 deletions cpp/src/slice2php/msbuild/slice2php.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\Main.cpp" />
<ClCompile Include="..\PHPUtil.cpp" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\Slice2PHP.rc" />
Expand All @@ -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')" />
Expand Down
8 changes: 8 additions & 0 deletions cpp/src/slice2php/msbuild/slice2php.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -27,4 +30,9 @@
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\PHPUtil.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion cpp/src/slice2py/Main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion cpp/src/Slice/Python.cpp → cpp/src/slice2py/Python.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion cpp/src/Slice/PythonUtil.cpp → cpp/src/slice2py/PythonUtil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
0 cpp/src/Slice/PythonUtil.h → cpp/src/slice2py/PythonUtil.h
View file
Open in desktop
File renamed without changes.
5 changes: 5 additions & 0 deletions cpp/src/slice2py/msbuild/slice2py.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\Main.cpp" />
<ClCompile Include="..\Python.cpp" />
<ClCompile Include="..\PythonUtil.cpp" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\Slice2Py.rc" />
Expand All @@ -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')" />
Expand Down
11 changes: 11 additions & 0 deletions cpp/src/slice2py/msbuild/slice2py.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -27,4 +33,9 @@
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\PythonUtil.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion cpp/src/slice2rb/Main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion cpp/src/Slice/Ruby.cpp → cpp/src/slice2rb/Ruby.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/Slice/RubyUtil.cpp → cpp/src/slice2rb/RubyUtil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
0 cpp/src/Slice/RubyUtil.h → cpp/src/slice2rb/RubyUtil.h
View file
Open in desktop
File renamed without changes.
5 changes: 5 additions & 0 deletions cpp/src/slice2rb/msbuild/slice2rb.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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')" />
Expand Down
11 changes: 11 additions & 0 deletions cpp/src/slice2rb/msbuild/slice2rb.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -27,4 +33,9 @@
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\RubyUtil.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>
10 changes: 4 additions & 6 deletions php/src/Makefile.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion php/src/Operation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "Types.h"
#include "Util.h"

#include "Slice/PHPUtil.h"
#include "PHPUtil.h"

using namespace std;
using namespace IcePHP;
Expand Down
2 changes: 1 addition & 1 deletion php/src/Types.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion php/src/Util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "Util.h"

#include <Ice/UUID.h>
#include <Slice/PHPUtil.h>
#include "PHPUtil.h"

#include <algorithm>
#include <ctype.h>
Expand Down
10 changes: 4 additions & 6 deletions python/modules/IcePy/Makefile.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion python/modules/IcePy/Operation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion python/modules/IcePy/Slice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion python/modules/IcePy/Util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
10 changes: 5 additions & 5 deletions python/modules/IcePy/msbuild/icepy.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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" />
Expand All @@ -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" />
Expand Down Expand Up @@ -205,4 +205,4 @@
CopyDependencies
</BuildDependsOn>
</PropertyGroup>
</Project>
</Project>
Loading