diff options
author | Benoit Foucher <benoit@zeroc.com> | 2016-12-13 17:40:25 +0100 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2016-12-13 17:40:25 +0100 |
commit | be3f1d1fc29f0b13c26149a5e654e335eda75450 (patch) | |
tree | 3a41e2a92b3dfd6606ee212e1a2e476db4c321d3 /scripts/Controller.py | |
parent | Another fix for Windows bin PATH (diff) | |
download | ice-be3f1d1fc29f0b13c26149a5e654e335eda75450.tar.bz2 ice-be3f1d1fc29f0b13c26149a5e654e335eda75450.tar.xz ice-be3f1d1fc29f0b13c26149a5e654e335eda75450.zip |
Support for C++ iOS Simulator controller
Diffstat (limited to 'scripts/Controller.py')
-rwxr-xr-x | scripts/Controller.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/scripts/Controller.py b/scripts/Controller.py index 6d919666918..54ad45ade09 100755 --- a/scripts/Controller.py +++ b/scripts/Controller.py @@ -27,22 +27,18 @@ class ControllerDriver(Driver): @classmethod def getOptions(self): - return ("", ["clean", "id=", "endpoints=", "interface="]) + return ("", ["clean", "id=", "endpoints="]) @classmethod def usage(self): print("") print("Controller driver options:") print("--id=<identity> The identify of the controller object.") - print("--endpoints=<endpts> The endpoints to listen on.") - print("--interface=<IP> The interface to use to discover the controller.") print("--clean Remove trust settings (OS X).") def __init__(self, options, *args, **kargs): Driver.__init__(self, options, *args, **kargs) self.id = "controller" - self.endpoints = "tcp" - self.interface = "" self.clean = False parseOptions(self, options, { "clean" : "clean" }) @@ -163,7 +159,8 @@ class ControllerDriver(Driver): self.initCommunicator() - self.communicator.getProperties().setProperty("ControllerAdapter.Endpoints", self.endpoints) + self.communicator.getProperties().setProperty("ControllerAdapter.Endpoints", + "tcp -h {0}".format(self.interface or "127.0.0.1")) self.communicator.getProperties().setProperty("ControllerAdapter.AdapterId", Ice.generateUUID()) adapter = self.communicator.createObjectAdapter("ControllerAdapter") adapter.add(ControllerI(self), self.communicator.stringToIdentity(self.id)) |