equal
deleted
inserted
replaced
48 -p - port number default:3000 |
48 -p - port number default:3000 |
49 -h - print this help text and quit |
49 -h - print this help text and quit |
50 -a - autostart PLC (0:disable 1:enable) (default:0) |
50 -a - autostart PLC (0:disable 1:enable) (default:0) |
51 -x - enable/disable wxTaskbarIcon (0:disable 1:enable) (default:1) |
51 -x - enable/disable wxTaskbarIcon (0:disable 1:enable) (default:1) |
52 -t - enable/disable Twisted web interface (0:disable 1:enable) (default:1) |
52 -t - enable/disable Twisted web interface (0:disable 1:enable) (default:1) |
53 -w - web server port or "off" (default:8009) |
53 -w - web server port or "off" to disable web server (default:8009) |
54 -c - WAMP client config file or "off" (default:wampconf.json) |
54 -c - WAMP client default config file (default:wampconf.json) |
55 -s - WAMP client secret, given as a file or "off" |
55 -s - WAMP client secret, given as a file |
56 -e - python extension (absolute path .py) |
56 -e - python extension (absolute path .py) |
57 |
57 |
58 working_dir - directory where are stored PLC files |
58 working_dir - directory where are stored PLC files |
59 """ % sys.argv[0]) |
59 """ % sys.argv[0]) |
60 |
60 |
585 except Exception, e: |
585 except Exception, e: |
586 print(_("Nevow/Athena import failed :"), e) |
586 print(_("Nevow/Athena import failed :"), e) |
587 webport = None |
587 webport = None |
588 NS.WorkingDir = WorkingDir |
588 NS.WorkingDir = WorkingDir |
589 |
589 |
590 if wampconf is None: |
590 # Find pre-existing project WAMP config file |
591 _wampconf = os.path.join(WorkingDir, "wampconf.json") |
591 _wampconf = os.path.join(WorkingDir, "wampconf.json") |
592 if os.path.exists(_wampconf): |
592 |
593 wampconf = _wampconf |
593 # If project's WAMP config file exits, override default (-c) |
|
594 if os.path.exists(_wampconf): |
|
595 wampconf = _wampconf |
594 |
596 |
595 if wampconf is not None: |
597 if wampconf is not None: |
596 try: |
598 try: |
597 import runtime.WampClient as WC # pylint: disable=ungrouped-imports |
599 import runtime.WampClient as WC # pylint: disable=ungrouped-imports |
598 except Exception, e: |
600 except Exception, e: |