[openrtm-commit:01596] r2662 - branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2015-09-17 11:22:51 +0900 (Thu, 17 Sep 2015)
New Revision: 2662

Modified:
   branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat
Log:
[merge] r2639 has been merged from trunk. about omniORB version number.

Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat	2015-09-16 06:18:43 UTC (rev 2661)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/build.bat	2015-09-17 02:22:51 UTC (rev 2662)
@@ -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