[openrtm-commit:02884] r887 - branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/utils/rtcd

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2017-10-25 17:23:18 +0900 (Wed, 25 Oct 2017)
New Revision: 887

Added:
   branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/utils/rtcd/py2exe/
Modified:
   branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/utils/rtcd/rtcd_python.exe
   branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/utils/rtcd/rtcd_python.py
Log:
[merge] r886 has been merged from trunk.

Modified: branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/utils/rtcd/rtcd_python.exe
===================================================================
(Binary files differ)

Modified: branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/utils/rtcd/rtcd_python.py
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/utils/rtcd/rtcd_python.py	2017-10-25 08:14:10 UTC (rev 886)
+++ branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/utils/rtcd/rtcd_python.py	2017-10-25 08:23:18 UTC (rev 887)
@@ -21,9 +21,6 @@
 import OpenRTM_aist
 
 def main():
-  conf_file=os.path.join(os.path.dirname(__file__),"rtcd.conf")
-  sys.argv.append('-f')
-  sys.argv.append(conf_file)
   manager = OpenRTM_aist.Manager.init(sys.argv)
 
   manager.activateManager()