[openrtm-commit:01716] r2705 - in branches/RELENG_1_1/OpenRTM-aist: . utils/rtm-naming win32/OpenRTM-aist/bin

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2016-02-17 18:08:00 +0900 (Wed, 17 Feb 2016)
New Revision: 2705

Modified:
   branches/RELENG_1_1/OpenRTM-aist/
   branches/RELENG_1_1/OpenRTM-aist/utils/rtm-naming/rtm-naming.in
   branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/bin/rtm-naming.bat
Log:
[merge] r2703 have been merged from trunk.


Property changes on: branches/RELENG_1_1/OpenRTM-aist
___________________________________________________________________
Modified: svn:mergeinfo
   - /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568-2574,2592,2605,2610,2623,2626,2644,2648,2652-2653,2670,2677-2678,2681-2682,2684-2687,2689-2692,2696-2697,2700
   + /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568-2574,2592,2605,2610,2623,2626,2644,2648,2652-2653,2670,2677-2678,2681-2682,2684-2687,2689-2692,2696-2697,2700,2703

Modified: branches/RELENG_1_1/OpenRTM-aist/utils/rtm-naming/rtm-naming.in
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/utils/rtm-naming/rtm-naming.in	2016-02-17 09:01:25 UTC (rev 2704)
+++ branches/RELENG_1_1/OpenRTM-aist/utils/rtm-naming/rtm-naming.in	2016-02-17 09:08:00 UTC (rev 2705)
@@ -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: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/bin/rtm-naming.bat
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/bin/rtm-naming.bat	2016-02-17 09:01:25 UTC (rev 2704)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/bin/rtm-naming.bat	2016-02-17 09:08:00 UTC (rev 2705)
@@ -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