[openrtm-commit:01601] r2667 - tags/RELEASE_1_1_2/OpenRTM-aist/win32/OpenRTM-aist

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2015-09-18 09:14:33 +0900 (Fri, 18 Sep 2015)
New Revision: 2667

Modified:
   tags/RELEASE_1_1_2/OpenRTM-aist/win32/OpenRTM-aist/build.bat
Log:
[compat, ->RELEASE_1_1_2] build.bat updated.

Modified: tags/RELEASE_1_1_2/OpenRTM-aist/win32/OpenRTM-aist/build.bat
===================================================================
--- tags/RELEASE_1_1_2/OpenRTM-aist/win32/OpenRTM-aist/build.bat	2015-09-17 07:29:21 UTC (rev 2666)
+++ tags/RELEASE_1_1_2/OpenRTM-aist/win32/OpenRTM-aist/build.bat	2015-09-18 00:14:33 UTC (rev 2667)
@@ -39,6 +39,9 @@
 if not DEFINED ARCH       set ARCH=x86_64
 if not DEFINED VC_VERSION set VC_VERSION=10
 if not DEFINED PYTHON_DIR set PYTHON_DIR=c:\python27
+if not DEFINED RTM_VERSION set RTM_VERSION=1.1.2
+if not DEFINED OMNI_VERSION  set OMNI_VERSION=4.2.0
+if not DEFINED OMNITHREAD_VERSION set OMNITHREAD_VERSION=4.0
 
 @rem ------------------------------------------------------------
 @rem Printing env variables
@@ -47,6 +50,9 @@
 echo ARCH       : %ARCH%
 echo VC_VERSION : %VC_VERSION%
 echo PYTHON_DIR : %PYTHON_DIR%
+echo RTM_VERSION        : %RTM_VERSION%
+echo OMNI_VERSION       : %OMNI_VERSION%
+echo OMNITHREAD_VERSION : %OMNITHREAD_VERSION%
 
 set PATH_ORG=%PATH%
 set PATH=%PATH%;C:\cygwin\bin;C:\cygwin64\bin
@@ -55,18 +61,15 @@
 if %ARCH% == x86       set DLL_ARCH=
 if %ARCH% == x86_64    set DLL_ARCH=_x64
 
-set COIL_DLLVER=111_vc%VC_VERSION%%DLL_ARCH%
-set COIL_VERSION=1.1.1
-set COIL_SHORTVER=1.1
+set RTM_DLLVER=%RTM_VERSION:.=%_vc%VC_VERSION%%DLL_ARCH%
+set RTM_SHORTVER=%RTM_VERSION:~0,3%
 
-set RTM_DLLVER=111_vc%VC_VERSION%%DLL_ARCH%
-set RTM_VERSION=1.1.1
-set RTM_SHORTVER=1.1
+set COIL_VERSION=%RTM_VERSION%
+set COIL_DLLVER=%RTM_DLLVER%
+set COIL_SHORTVER=%RTM_SHORTVER%
 
-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 OMNI_SHORTVER=%OMNI_VERSION:~0,3%
 set OMNITHREAD_DLLVER=%OMNITHREAD_VERSION:.=%
 
 @rem ------------------------------------------------------------