equal
deleted
inserted
replaced
35 from builtins import str as text |
35 from builtins import str as text |
36 from past.builtins import execfile |
36 from past.builtins import execfile |
37 from six.moves import builtins |
37 from six.moves import builtins |
38 |
38 |
39 import runtime |
39 import runtime |
40 from runtime.PyroServer import Server |
40 from runtime.PyroServer import PyroServer |
41 from runtime.xenomai import TryPreloadXenomai |
41 from runtime.xenomai import TryPreloadXenomai |
42 from runtime import LogMessageAndException |
42 from runtime import LogMessageAndException |
43 from runtime import PlcStatus |
43 from runtime import PlcStatus |
44 import util.paths as paths |
44 import util.paths as paths |
45 |
45 |
502 ensurePSK(servicename, PSKpath) |
502 ensurePSK(servicename, PSKpath) |
503 |
503 |
504 runtime.CreatePLCObjectSingleton( |
504 runtime.CreatePLCObjectSingleton( |
505 WorkingDir, argv, statuschange, evaluator, pyruntimevars) |
505 WorkingDir, argv, statuschange, evaluator, pyruntimevars) |
506 |
506 |
507 pyroserver = Server(servicename, interface, port) |
507 pyroserver = PyroServer(servicename, interface, port) |
508 |
508 |
509 if havewx: |
509 if havewx: |
510 taskbar_instance = BeremizTaskBarIcon(pyroserver) |
510 taskbar_instance = BeremizTaskBarIcon(pyroserver) |
511 |
511 |
512 if havetwisted: |
512 if havetwisted: |