[openrtm-commit:01584] r2651 - in tags/RELEASE_1_1_1/OpenRTM-aist: . win32/OpenRTM-aist

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2015-07-22 17:20:39 +0900 (Wed, 22 Jul 2015)
New Revision: 2651

Modified:
   tags/RELEASE_1_1_1/OpenRTM-aist/
   tags/RELEASE_1_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat
Log:
r2639 has been merged from trunk. about omniORB version number.


Property changes on: tags/RELEASE_1_1_1/OpenRTM-aist
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/RELENG_1_1/OpenRTM-aist:2601,2603
/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,2573-2574,2592,2605
   + /branches/RELENG_1_1/OpenRTM-aist:2601,2603
/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,2573-2574,2592,2605,2639

Modified: tags/RELEASE_1_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat
===================================================================
--- tags/RELEASE_1_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat	2015-07-16 02:42:12 UTC (rev 2650)
+++ tags/RELEASE_1_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat	2015-07-22 08:20:39 UTC (rev 2651)
@@ -63,11 +63,11 @@
 set RTM_VERSION=1.1.1
 set RTM_SHORTVER=1.1
 
-set OMNI_DLLVER=417
-set OMNI_VERSION=4.1.7
-set OMNI_SHORTVER=4.1
-set OMNITHREAD_DLLVER=34
-set OMNITHREAD_VERSION=3.4
+if not DEFINED OMNI_VERSION  set OMNI_VERSION=4.2.0
+set OMNI_DLLVER=%OMNI_VERSION:.=%
+if not DEFINED OMNI_SHORTVER set OMNI_SHORTVER=4.2
+if not DEFINED OMNITHREAD_VERSION set OMNITHREAD_VERSION=4.0
+set OMNITHREAD_DLLVER=%OMNITHREAD_VERSION:.=%
 
 @rem ------------------------------------------------------------
 @rem Copying Config.cmake