[openrtm-commit:01572] r2639 - trunk/OpenRTM-aist/win32/OpenRTM-aist

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2015-06-26 15:18:19 +0900 (Fri, 26 Jun 2015)
New Revision: 2639

Modified:
   trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat
Log:
[compat,->RELENG_1_1] Setting of omniORB version number has been changed.

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat	2015-06-25 07:22:46 UTC (rev 2638)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat	2015-06-26 06:18:19 UTC (rev 2639)
@@ -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