diff options
Diffstat (limited to 'cpp/src')
27 files changed, 53 insertions, 44 deletions
diff --git a/cpp/src/Glacier2/Makefile.mk b/cpp/src/Glacier2/Makefile.mk index 5b3ef8f7dee..313aa258dad 100644 --- a/cpp/src/Glacier2/Makefile.mk +++ b/cpp/src/Glacier2/Makefile.mk @@ -10,7 +10,7 @@ $(project)_programs := glacier2router $(project)_sliceflags := --include-dir Glacier2 $(project)_generated_includedir := $(project)/generated/Glacier2 -$(project)_dependencies := Glacier2 IceSSL Ice IceUtil +$(project)_dependencies := Glacier2 IceSSL Ice glacier2router_targetdir := $(bindir) diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk b/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk index 203c8322826..97980df7750 100644 --- a/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk +++ b/cpp/src/Glacier2CryptPermissionsVerifier/Makefile.mk @@ -10,7 +10,7 @@ $(project)_libraries += Glacier2CryptPermissionsVerifier Glacier2CryptPermissionsVerifier_targetdir := $(libdir) -Glacier2CryptPermissionsVerifier_dependencies := Glacier2 Ice IceUtil +Glacier2CryptPermissionsVerifier_dependencies := Glacier2 Ice Glacier2CryptPermissionsVerifier_system_libs := $(CRYPT_OS_LIBS) Glacier2CryptPermissionsVerifier_cppflags := -DCRYPT_PERMISSIONS_VERIFIER_API_EXPORTS diff --git a/cpp/src/Glacier2Lib/Makefile.mk b/cpp/src/Glacier2Lib/Makefile.mk index 89e0fdb4add..b2d11113706 100644 --- a/cpp/src/Glacier2Lib/Makefile.mk +++ b/cpp/src/Glacier2Lib/Makefile.mk @@ -10,8 +10,8 @@ $(project)_libraries := Glacier2 Glacier2_targetdir := $(libdir) -Glacier2_dependencies := Ice IceUtil +Glacier2_dependencies := Ice Glacier2_cppflags := -DGLACIER2_API_EXPORTS Glacier2_sliceflags := --include-dir Glacier2 --dll-export GLACIER2_API -projects += $(project)
\ No newline at end of file +projects += $(project) diff --git a/cpp/src/Ice/Makefile.mk b/cpp/src/Ice/Makefile.mk index cc3dbc55b5e..50ace93ca83 100644 --- a/cpp/src/Ice/Makefile.mk +++ b/cpp/src/Ice/Makefile.mk @@ -10,11 +10,20 @@ $(project)_libraries = Ice Ice_targetdir := $(libdir) -Ice_dependencies := IceUtil -Ice_cppflags := -DICE_API_EXPORTS +Ice_cppflags = -DICE_API_EXPORTS -DICE_UTIL_API_EXPORTS + +ifeq ($(DEFAULT_MUTEX_PROTOCOL), PrioInherit) + Ice_cppflags += -DICE_PRIO_INHERIT +endif + +ifeq ($(libbacktrace),yes) + Ice_cppflags += -DICE_LIBBACKTRACE +endif + Ice_sliceflags := --include-dir Ice --dll-export ICE_API Ice_libs := bz2 -Ice_system_libs := $(ICE_OS_LIBS) +Ice_system_libs := $(ICE_OS_LIBS) $(ICEUTIL_OS_LIBS) +Ice_extra_sources := $(wildcard src/IceUtil/*.cpp) Ice_excludes := $(currentdir)/DLLMain.cpp projects += $(project) diff --git a/cpp/src/IceBT/Makefile.mk b/cpp/src/IceBT/Makefile.mk index 294d466aff3..d56d94486a7 100644 --- a/cpp/src/IceBT/Makefile.mk +++ b/cpp/src/IceBT/Makefile.mk @@ -12,8 +12,8 @@ ifneq ($(filter debian ubuntu,$(linux_id)),) $(project)_libraries := IceBT IceBT_targetdir := $(libdir) -IceBT_dependencies := IceXML Ice IceUtil -IceBT_cppflags := -DICEBT_API_EXPORTS `pkg-config --cflags dbus-1` +IceBT_dependencies := IceXML Ice +IceBT_cppflags := -DICEBT_API_EXPORTS `pkg-config --cflags dbus-1` IceBT_system_libs := $(SSL_OS_LIBS) `pkg-config --libs dbus-1` IceBT_sliceflags := --include-dir IceBT --dll-export ICESSL_API diff --git a/cpp/src/IceBox/Makefile.mk b/cpp/src/IceBox/Makefile.mk index f1499a055b0..5bf8618e6b8 100644 --- a/cpp/src/IceBox/Makefile.mk +++ b/cpp/src/IceBox/Makefile.mk @@ -9,7 +9,7 @@ $(project)_libraries := IceBox $(project)_programs := icebox iceboxadmin -$(project)_dependencies := Ice IceUtil +$(project)_dependencies := Ice $(project)_sliceflags := --include-dir IceBox --dll-export ICEBOX_API IceBox_targetdir := $(libdir) diff --git a/cpp/src/IceDB/Makefile.mk b/cpp/src/IceDB/Makefile.mk index aae68b10770..e5d51fdc930 100644 --- a/cpp/src/IceDB/Makefile.mk +++ b/cpp/src/IceDB/Makefile.mk @@ -10,7 +10,7 @@ $(project)_libraries = IceDB IceDB_targetdir := $(libdir) -IceDB_dependencies := Ice IceUtil +IceDB_dependencies := Ice IceDB_libs := lmdb IceDB_cppflags := -DICE_DB_API_EXPORTS diff --git a/cpp/src/IceDiscovery/Makefile.mk b/cpp/src/IceDiscovery/Makefile.mk index 67ee53b1c8f..d20dd7923b3 100644 --- a/cpp/src/IceDiscovery/Makefile.mk +++ b/cpp/src/IceDiscovery/Makefile.mk @@ -10,7 +10,7 @@ $(project)_libraries := IceDiscovery IceDiscovery_targetdir := $(libdir) -IceDiscovery_dependencies := Ice IceUtil +IceDiscovery_dependencies := Ice IceDiscovery_sliceflags := --include-dir IceDiscovery IceDiscovery_generated_includedir := $(project)/generated/IceDiscovery IceDiscovery_cppflags := -DICE_DISCOVERY_API_EXPORTS diff --git a/cpp/src/IceGrid/Makefile.mk b/cpp/src/IceGrid/Makefile.mk index 62ac0cfb951..9df3222c8b5 100644 --- a/cpp/src/IceGrid/Makefile.mk +++ b/cpp/src/IceGrid/Makefile.mk @@ -67,7 +67,7 @@ local_admin_srcs = Internal.ice \ $(project)_programs = icegridnode icegridregistry icegridadmin icegriddb $(project)_sliceflags := -Isrc --include-dir IceGrid $(project)_generated_includedir := $(project)/generated/IceGrid -$(project)_dependencies := IceGrid Glacier2 Ice IceUtil +$(project)_dependencies := IceGrid Glacier2 Ice $(project)_targetdir := $(bindir) icegridnode_sources := $(addprefix $(currentdir)/,$(local_node_srcs) $(local_registry_srcs) IceGridNode.cpp) diff --git a/cpp/src/IceGridLib/Makefile.mk b/cpp/src/IceGridLib/Makefile.mk index 26f2111a5fb..289fdbd90f7 100644 --- a/cpp/src/IceGridLib/Makefile.mk +++ b/cpp/src/IceGridLib/Makefile.mk @@ -10,7 +10,7 @@ $(project)_libraries := IceGrid IceGrid_targetdir := $(libdir) -IceGrid_dependencies := Glacier2 Ice IceUtil +IceGrid_dependencies := Glacier2 Ice IceGrid_sliceflags := --include-dir IceGrid --dll-export ICE_GRID_API projects += $(project) diff --git a/cpp/src/IceLocatorDiscovery/Makefile.mk b/cpp/src/IceLocatorDiscovery/Makefile.mk index 5acb7ad9706..717e477b85c 100644 --- a/cpp/src/IceLocatorDiscovery/Makefile.mk +++ b/cpp/src/IceLocatorDiscovery/Makefile.mk @@ -10,7 +10,7 @@ $(project)_libraries := IceLocatorDiscovery IceLocatorDiscovery_targetdir := $(libdir) -IceLocatorDiscovery_dependencies := Ice IceUtil +IceLocatorDiscovery_dependencies := Ice IceLocatorDiscovery_sliceflags := --include-dir IceLocatorDiscovery IceLocatorDiscovery_generated_includedir := $(project)/generated/IceLocatorDiscovery IceLocatorDiscovery_cppflags := -DICE_LOCATOR_DISCOVERY_API_EXPORTS diff --git a/cpp/src/IcePatch2/Makefile.mk b/cpp/src/IcePatch2/Makefile.mk index eb1cc23045b..d240a492424 100644 --- a/cpp/src/IcePatch2/Makefile.mk +++ b/cpp/src/IcePatch2/Makefile.mk @@ -8,7 +8,7 @@ # ********************************************************************** $(project)_programs := icepatch2server icepatch2client icepatch2calc -$(project)_dependencies := IcePatch2 Ice IceUtil +$(project)_dependencies := IcePatch2 Ice $(project)_targetdir := $(bindir) icepatch2server_sources := $(addprefix $(currentdir)/,FileServerI.cpp Server.cpp) diff --git a/cpp/src/IcePatch2Lib/Makefile.mk b/cpp/src/IcePatch2Lib/Makefile.mk index e63a56ab3c8..f55856ccd2b 100644 --- a/cpp/src/IcePatch2Lib/Makefile.mk +++ b/cpp/src/IcePatch2Lib/Makefile.mk @@ -10,7 +10,7 @@ $(project)_libraries := IcePatch2 IcePatch2_targetdir := $(libdir) -IcePatch2_dependencies := Ice IceUtil +IcePatch2_dependencies := Ice IcePatch2_libs := bz2 IcePatch2_sliceflags := --include-dir IcePatch2 --dll-export ICE_PATCH2_API IcePatch2_cppflags := -Wno-deprecated-declarations diff --git a/cpp/src/IceSSL/Makefile.mk b/cpp/src/IceSSL/Makefile.mk index 1655ce978df..d9616562624 100644 --- a/cpp/src/IceSSL/Makefile.mk +++ b/cpp/src/IceSSL/Makefile.mk @@ -10,8 +10,8 @@ $(project)_libraries := IceSSL IceSSL_targetdir := $(libdir) -IceSSL_dependencies := Ice IceUtil -IceSSL_cppflags := -DICESSL_API_EXPORTS +IceSSL_dependencies := Ice +IceSSL_cppflags := -DICESSL_API_EXPORTS IceSSL_system_libs := $(SSL_OS_LIBS) IceSSL_sliceflags := --include-dir IceSSL --dll-export ICESSL_API diff --git a/cpp/src/IceStorm/Makefile.mk b/cpp/src/IceStorm/Makefile.mk index 7390a46b291..31c3e0ffebb 100644 --- a/cpp/src/IceStorm/Makefile.mk +++ b/cpp/src/IceStorm/Makefile.mk @@ -11,7 +11,7 @@ $(project)_libraries := IceStormService $(project)_programs := icestormadmin icestormdb $(project)_sliceflags := -Isrc --include-dir IceStorm $(project)_generated_includedir := $(project)/generated/IceStorm -$(project)_dependencies := IceStorm Ice IceUtil +$(project)_dependencies := IceStorm Ice IceStormService_targetdir := $(libdir) IceStormService_dependencies := IceGrid Glacier2 IceBox IceDB diff --git a/cpp/src/IceStormLib/Makefile.mk b/cpp/src/IceStormLib/Makefile.mk index 0a04d593b0f..3e12c553418 100644 --- a/cpp/src/IceStormLib/Makefile.mk +++ b/cpp/src/IceStormLib/Makefile.mk @@ -10,7 +10,7 @@ $(project)_libraries := IceStorm IceStorm_targetdir := $(libdir) -IceStorm_dependencies := Ice IceUtil +IceStorm_dependencies := Ice IceStorm_sliceflags := --include-dir IceStorm --dll-export ICE_STORM_LIB_API projects += $(project) diff --git a/cpp/src/IceUtil/Exception.cpp b/cpp/src/IceUtil/UtilException.cpp index b0c25c75324..b0c25c75324 100644 --- a/cpp/src/IceUtil/Exception.cpp +++ b/cpp/src/IceUtil/UtilException.cpp diff --git a/cpp/src/IceUtil/msbuild/iceutil++11/iceutil++11.vcxproj b/cpp/src/IceUtil/msbuild/iceutil++11/iceutil++11.vcxproj index f944daa86bf..f22527e8f3f 100644 --- a/cpp/src/IceUtil/msbuild/iceutil++11/iceutil++11.vcxproj +++ b/cpp/src/IceUtil/msbuild/iceutil++11/iceutil++11.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -101,7 +101,7 @@ <ClCompile Include="..\..\ConvertUTF.cpp" /> <ClCompile Include="..\..\CountDownLatch.cpp" /> <ClCompile Include="..\..\CtrlCHandler.cpp" /> - <ClCompile Include="..\..\Exception.cpp" /> + <ClCompile Include="..\..\UtilException.cpp" /> <ClCompile Include="..\..\FileUtil.cpp" /> <ClCompile Include="..\..\InputUtil.cpp" /> <ClCompile Include="..\..\MutexProtocol.cpp" /> diff --git a/cpp/src/IceUtil/msbuild/iceutil++11/iceutil++11.vcxproj.filters b/cpp/src/IceUtil/msbuild/iceutil++11/iceutil++11.vcxproj.filters index 73a009d9230..c097d85db0f 100644 --- a/cpp/src/IceUtil/msbuild/iceutil++11/iceutil++11.vcxproj.filters +++ b/cpp/src/IceUtil/msbuild/iceutil++11/iceutil++11.vcxproj.filters @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Source Files"> @@ -30,7 +30,7 @@ <ClCompile Include="..\..\CtrlCHandler.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\Exception.cpp"> + <ClCompile Include="..\..\UtilException.cpp"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="..\..\FileUtil.cpp"> @@ -224,4 +224,4 @@ <Filter>Resource Files</Filter> </ResourceCompile> </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj index 75ee6bc1647..4a824edef45 100644 --- a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj +++ b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -100,7 +100,7 @@ <ClCompile Include="..\..\ConvertUTF.cpp" /> <ClCompile Include="..\..\CountDownLatch.cpp" /> <ClCompile Include="..\..\CtrlCHandler.cpp" /> - <ClCompile Include="..\..\Exception.cpp" /> + <ClCompile Include="..\..\UtilException.cpp" /> <ClCompile Include="..\..\FileUtil.cpp" /> <ClCompile Include="..\..\InputUtil.cpp" /> <ClCompile Include="..\..\MutexProtocol.cpp" /> diff --git a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters index 7fdbf281f23..f008d4bf690 100644 --- a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters +++ b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Source Files"> @@ -30,7 +30,7 @@ <ClCompile Include="..\..\CtrlCHandler.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\Exception.cpp"> + <ClCompile Include="..\..\UtilException.cpp"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="..\..\FileUtil.cpp"> @@ -224,4 +224,4 @@ <Filter>Resource Files</Filter> </ResourceCompile> </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/src/IceUtil/msbuild/iceutiluwp++11/iceutiluwp++11.vcxproj b/cpp/src/IceUtil/msbuild/iceutiluwp++11/iceutiluwp++11.vcxproj index abd4f073d95..f1812c98174 100644 --- a/cpp/src/IceUtil/msbuild/iceutiluwp++11/iceutiluwp++11.vcxproj +++ b/cpp/src/IceUtil/msbuild/iceutiluwp++11/iceutiluwp++11.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|ARM"> @@ -132,7 +132,7 @@ <ClCompile Include="..\..\Cond.cpp" /> <ClCompile Include="..\..\ConvertUTF.cpp" /> <ClCompile Include="..\..\CountDownLatch.cpp" /> - <ClCompile Include="..\..\Exception.cpp" /> + <ClCompile Include="..\..\UtilException.cpp" /> <ClCompile Include="..\..\FileUtil.cpp" /> <ClCompile Include="..\..\InputUtil.cpp" /> <ClCompile Include="..\..\MutexProtocol.cpp" /> @@ -200,4 +200,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/src/IceUtil/msbuild/iceutiluwp++11/iceutiluwp++11.vcxproj.filters b/cpp/src/IceUtil/msbuild/iceutiluwp++11/iceutiluwp++11.vcxproj.filters index 0923c6f6835..1c5653d5a4e 100644 --- a/cpp/src/IceUtil/msbuild/iceutiluwp++11/iceutiluwp++11.vcxproj.filters +++ b/cpp/src/IceUtil/msbuild/iceutiluwp++11/iceutiluwp++11.vcxproj.filters @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <ClCompile Include="..\..\ArgVector.cpp"> @@ -13,7 +13,7 @@ <ClCompile Include="..\..\CountDownLatch.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\Exception.cpp"> + <ClCompile Include="..\..\UtilException.cpp"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="..\..\FileUtil.cpp"> @@ -213,4 +213,4 @@ <UniqueIdentifier>{4a95b250-fe90-4762-9440-47baf982c6c4}</UniqueIdentifier> </Filter> </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/cpp/src/IceXML/Makefile.mk b/cpp/src/IceXML/Makefile.mk index 753f8fac685..488555e76ce 100644 --- a/cpp/src/IceXML/Makefile.mk +++ b/cpp/src/IceXML/Makefile.mk @@ -10,8 +10,8 @@ $(project)_libraries := IceXML IceXML_targetdir := $(libdir) -IceXML_dependencies := IceUtil -IceXML_cppflags := -DICE_XML_API_EXPORTS +IceXML_dependencies := Ice +IceXML_cppflags := -DICE_XML_API_EXPORTS IceXML_libs := expat projects += $(project) diff --git a/cpp/src/Slice/Util.cpp b/cpp/src/Slice/SliceUtil.cpp index e0c490fa937..e0c490fa937 100644 --- a/cpp/src/Slice/Util.cpp +++ b/cpp/src/Slice/SliceUtil.cpp diff --git a/cpp/src/Slice/msbuild/slice.vcxproj b/cpp/src/Slice/msbuild/slice.vcxproj index 6ad0a588a50..fb9d0403baa 100644 --- a/cpp/src/Slice/msbuild/slice.vcxproj +++ b/cpp/src/Slice/msbuild/slice.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -105,7 +105,7 @@ <ClCompile Include="..\Ruby.cpp" /> <ClCompile Include="..\RubyUtil.cpp" /> <ClCompile Include="..\Scanner.cpp" /> - <ClCompile Include="..\Util.cpp" /> + <ClCompile Include="..\SliceUtil.cpp" /> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\include\Slice\Checksum.h" /> diff --git a/cpp/src/Slice/msbuild/slice.vcxproj.filters b/cpp/src/Slice/msbuild/slice.vcxproj.filters index 1757a2aa8b9..9f612ab2529 100644 --- a/cpp/src/Slice/msbuild/slice.vcxproj.filters +++ b/cpp/src/Slice/msbuild/slice.vcxproj.filters @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Source Files"> @@ -74,7 +74,7 @@ <ClCompile Include="..\Scanner.cpp"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\Util.cpp"> + <ClCompile Include="..\SliceUtil.cpp"> <Filter>Source Files</Filter> </ClCompile> </ItemGroup> @@ -134,4 +134,4 @@ <ItemGroup> <None Include="packages.config" /> </ItemGroup> -</Project>
\ No newline at end of file +</Project> |