diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-11-25 13:13:22 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-11-25 13:13:22 +0100 |
| commit | dcdc32af1fced49d80a8ccd93230e15d91ab45d8 (patch) | |
| tree | eb69e2555fbd54496fce8a33f4dd610e1473ff51 /python/modules | |
| parent | C# IceSSL/configuration log expired certificate exceptions. (diff) | |
| download | ice-dcdc32af1fced49d80a8ccd93230e15d91ab45d8.tar.bz2 ice-dcdc32af1fced49d80a8ccd93230e15d91ab45d8.tar.xz ice-dcdc32af1fced49d80a8ccd93230e15d91ab45d8.zip | |
Refactored test scripts
Diffstat (limited to 'python/modules')
| -rw-r--r-- | python/modules/IcePy/Init.cpp | 19 | ||||
| -rw-r--r-- | python/modules/IcePy/Makefile.mk | 2 |
2 files changed, 5 insertions, 16 deletions
diff --git a/python/modules/IcePy/Init.cpp b/python/modules/IcePy/Init.cpp index 581e4f649c5..5c026c27321 100644 --- a/python/modules/IcePy/Init.cpp +++ b/python/modules/IcePy/Init.cpp @@ -28,6 +28,7 @@ #include <Types.h> #include <ValueFactoryManager.h> #include <Ice/Initialize.h> +#include <Ice/RegisterPlugins.h> using namespace std; using namespace IcePy; @@ -124,15 +125,6 @@ PyDoc_STRVAR(moduleDoc, "The Internet Communications Engine."); #endif -#ifdef ICE_STATIC_LIBS -extern "C" -{ -Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const std::string&, const Ice::StringSeq&); -Ice::Plugin* createIceDiscovery(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); -Ice::Plugin* createIceLocatorDiscovery(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&); -} -#endif - #if defined(__GNUC__) && PY_VERSION_HEX >= 0x03000000 extern "C" __attribute__((visibility ("default"))) PyObject * #elif defined(_WIN32) // On Windows, PyMoDINIT_FUNC already defines dllexport @@ -148,12 +140,9 @@ initIcePy(void) { PyObject* module; -#ifdef ICE_STATIC_LIBS - // Register the plugins manually if we're building with static libraries. - Ice::registerPluginFactory("IceSSL", createIceSSL, false); - Ice::registerPluginFactory("IceDiscovery", createIceDiscovery, false); - Ice::registerPluginFactory("IceLocatorDiscovery", createIceLocatorDiscovery, false); -#endif + Ice::registerIceSSL(false); + Ice::registerIceDiscovery(false); + Ice::registerIceLocatorDiscovery(false); // // Notify Python that we are a multi-threaded extension. diff --git a/python/modules/IcePy/Makefile.mk b/python/modules/IcePy/Makefile.mk index 63a549589da..a5115f92838 100644 --- a/python/modules/IcePy/Makefile.mk +++ b/python/modules/IcePy/Makefile.mk @@ -16,7 +16,7 @@ IcePy_installdir := $(install_pythondir) IcePy_cppflags := -I$(project) -I$(top_srcdir)/cpp/include -I$(top_srcdir)/cpp/include/generated \ -I$(top_srcdir)/cpp/src $(python_cppflags) IcePy_ldflags := $(python_ldflags) -IcePy_dependencies := IceSSL Ice +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)) \ |