diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2015-02-18 10:29:49 -0330 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2015-02-18 10:29:49 -0330 |
| commit | b55ce15878456e3d2f0656bcd6abd5a55c6774b1 (patch) | |
| tree | e7e771a3d90ae7295f20bf0622b72c72cc3a85e0 /py/modules/IcePy/Init.cpp | |
| parent | Fixed ObjC build (diff) | |
| download | ice-b55ce15878456e3d2f0656bcd6abd5a55c6774b1.tar.bz2 ice-b55ce15878456e3d2f0656bcd6abd5a55c6774b1.tar.xz ice-b55ce15878456e3d2f0656bcd6abd5a55c6774b1.zip | |
Changes for brew, python PyPI packaging and ruby gem packaging.
Diffstat (limited to 'py/modules/IcePy/Init.cpp')
| -rw-r--r-- | py/modules/IcePy/Init.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/py/modules/IcePy/Init.cpp b/py/modules/IcePy/Init.cpp index 96425f593e8..5d1541af69a 100644 --- a/py/modules/IcePy/Init.cpp +++ b/py/modules/IcePy/Init.cpp @@ -25,6 +25,7 @@ #include <Proxy.h> #include <Slice.h> #include <Types.h> +#include <Ice/Initialize.h> using namespace std; using namespace IcePy; @@ -87,6 +88,8 @@ static PyMethodDef methods[] = PyDoc_STR(STRCAST("loadSlice(cmd) -> None")) }, { STRCAST("cleanup"), reinterpret_cast<PyCFunction>(IcePy_cleanup), METH_NOARGS, PyDoc_STR(STRCAST("internal function")) }, + { STRCAST("compile"), reinterpret_cast<PyCFunction>(IcePy_compile), METH_VARARGS, + PyDoc_STR(STRCAST("internal function")) }, { 0, 0 } /* sentinel */ }; @@ -115,6 +118,12 @@ PyDoc_STRVAR(moduleDoc, "The Internet Communications Engine."); #endif +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&); +} + PyMODINIT_FUNC #ifndef _WIN32 // On Windows, PyMODINIT_FUNC already defines dllexport ICE_DECLSPEC_EXPORT @@ -127,6 +136,9 @@ initIcePy(void) { PyObject* module; + Ice::registerPluginFactory("IceSSL", createIceSSL, false); + Ice::registerPluginFactory("IceDiscovery", createIceDiscovery, false); + // // Notify Python that we are a multi-threaded extension. // |