[openrtm-commit:01714] r2703 - in trunk/OpenRTM-aist: utils/rtm-naming win32/OpenRTM-aist/bin

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2016-02-17 16:15:56 +0900 (Wed, 17 Feb 2016)
New Revision: 2703

Modified:
   trunk/OpenRTM-aist/utils/rtm-naming/rtm-naming.in
   trunk/OpenRTM-aist/win32/OpenRTM-aist/bin/rtm-naming.bat
Log:
[compat,->RELENG_1_1] rtm-naming has been supported omniORB4.2. refs #3442

Modified: trunk/OpenRTM-aist/utils/rtm-naming/rtm-naming.in
===================================================================
--- trunk/OpenRTM-aist/utils/rtm-naming/rtm-naming.in	2016-02-17 02:47:09 UTC (rev 2702)
+++ trunk/OpenRTM-aist/utils/rtm-naming/rtm-naming.in	2016-02-17 07:15:56 UTC (rev 2703)
@@ -234,6 +234,7 @@
     echo 'Starting omniORB omniNames: '$hostname':'$port
     rm -f ./omninames-$hostname.log
     rm -f ./omninames-$hostname.bak
+    rm -f ./omninames-$hostname.dat
     $cosnames -start $port -logdir $currdir &
     ret=$!
     sleep 1

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/bin/rtm-naming.bat
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/bin/rtm-naming.bat	2016-02-17 02:47:09 UTC (rev 2702)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/bin/rtm-naming.bat	2016-02-17 07:15:56 UTC (rev 2703)
@@ -19,8 +19,9 @@
 rem if exist %cosnames%  echo "ok"
 if EXIST %TEMP%\omninames-%hosts%.log del /f %TEMP%\omninames-%hosts%.log
 if EXIST %TEMP%\omninames-%hosts%.bak del /f %TEMP%\omninames-%hosts%.bak
+if EXIST %TEMP%\omninames-%hosts%.dat del /f %TEMP%\omninames-%hosts%.dat
 echo Starting omniORB omniNames: %hosts%:%port%
-%cosnames% -start %port% -logdir %TEMP%\
+%cosnames% -start %port% -datadir %TEMP%\
 
 goto:EOF