[openrtm-commit:01879] r703 - in branches/RELENG_1_1/OpenRTM-aist-Python: . OpenRTM_aist/utils/rtcd

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2016-04-06 17:55:08 +0900 (Wed, 06 Apr 2016)
New Revision: 703

Modified:
   branches/RELENG_1_1/OpenRTM-aist-Python/
   branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/utils/rtcd/rtc.conf
   branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/utils/rtcd/rtcd_python.bat
   branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/utils/rtcd/rtcd_python.exe
Log:
[merge] r702 has been merged from trunk.


Property changes on: branches/RELENG_1_1/OpenRTM-aist-Python
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/RELENG_1_0/OpenRTM-aist-Python:345-404
/branches/RELENG_1_1/OpenRTM-aist-Python:396-478,488-497
/branches/work/OpenRTM-aist-Python:504-542
/trunk/OpenRTM-aist-Python:662
   + /branches/RELENG_1_0/OpenRTM-aist-Python:345-404
/branches/RELENG_1_1/OpenRTM-aist-Python:396-478,488-497
/branches/work/OpenRTM-aist-Python:504-542
/trunk/OpenRTM-aist-Python:662,702

Modified: branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/utils/rtcd/rtc.conf
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/utils/rtcd/rtc.conf	2016-04-06 08:35:50 UTC (rev 702)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/utils/rtcd/rtc.conf	2016-04-06 08:55:08 UTC (rev 703)
@@ -2,17 +2,5 @@
 naming.formats: %h.host_cxt/%n.rtc
 logger.enable: NO
 logger.log_level: PARANOID
-manager.modules.load_path: ../examples/Python/Composite, \
-													 ../examples/Python/ConfigSample, \
-													 ../examples/Python/MobileRobotCanvas, \
-													 ../examples/Python/NXTRTC, \
-													 ../examples/Python/SeqIO, \
-													 ../examples/Python/SimpleIO, \
-													 ../examples/Python/SimpleService, \
-													 ../examples/Python/TkJoyStick, \
-													 ../components/
 manager.is_master: YES
 manager.shutdown_on_nortcs: NO
-
-#manager.modules.preload: ConfigSample, ConsoleInl, ConsoleOut
-#manager.components.precreate: ConfigSample, ConsoleIn, ConsoleOut

Modified: branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/utils/rtcd/rtcd_python.bat
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/utils/rtcd/rtcd_python.bat	2016-04-06 08:35:50 UTC (rev 702)
+++ branches/RELENG_1_1/OpenRTM-aist-Python/OpenRTM_aist/utils/rtcd/rtcd_python.bat	2016-04-06 08:55:08 UTC (rev 703)
@@ -6,4 +6,4 @@
 rem     National Institute of
 rem         Advanced Industrial Science and Technology (AIST), Japan
 rem     All rights reserved.
-rtcd.py %*
+%CD%\python.exe rtcd.py %*

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