[openrtm-commit:00754] r2343 - trunk/OpenRTM-aist/win32/OpenRTM-aist

[openrtm ＠ openrtm.org]

Author: kurihara
Date: 2012-03-08 23:31:38 +0900 (Thu, 08 Mar 2012)
New Revision: 2343

Modified:
   trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat
   trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc8.bat
   trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc9.bat
Log:
OpenCV-RTC came to be built by autobuild_vcX.bat. refs #2379

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat	2012-03-08 14:25:50 UTC (rev 2342)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat	2012-03-08 14:31:38 UTC (rev 2343)
@@ -21,18 +21,19 @@
 @rem ------------------------------------------------------------
 @set RTM_ROOT=%~dp0
 @set PATH="C:\Program Files\Microsoft Visual Studio 10.0\Common7\IDE\";"C:\Program Files\Microsoft Visual Studio 10.0\VC\BIN";"c:\WINDOWS\Microsoft.NET\Framework\v4.0.30319";"C:\Program Files\Microsoft Visual Studio 10.0\VC\vcpackages";%PATH%
- at set OMNI_ROOT=C:\distribution\omniORB-4.1.4_vc10
+ at set OMNI_ROOT=C:\distribution\omniORB-4.1.5_vc10
 @set RTSE_ROOT=C:\distribution\OpenRTP\RTSystemEditor
 @set VC_VERSION=Visual C++ 2010
- at set OPENCV_ROOT=C:\distribution\OpenCV2.2
+ at set OPENCV_ROOT=C:\distribution\OpenCV2.3
 @set OPENCV_RTC_ROOT=C:\distribution\ImageProcessing\opencv
+ at set BOOST_ROOT=C:\Program Files\boost\boost_1_47
 
 @rem ============================================================
 @rem copy property sheet
 @rem ============================================================
-copy   etc\rtm_config_omni414.vsprops rtm_config.vsprops
-copy   etc\rtm_config_omni414.props rtm_config.props
-copy   etc\rtm_config_omni414.props examples\USBCamera\rtm_config.props
+copy   etc\rtm_config_omni415.vsprops rtm_config.vsprops
+copy   etc\rtm_config_omni415.props rtm_config.props
+copy   etc\rtm_config_omni415.props examples\USBCamera\rtm_config.props
 copy   coil_config.props examples\USBCamera\coil_config.props
 
 @rem ============================================================
@@ -59,12 +60,14 @@
 msbuild /M:2 /t:rebuild /p:configuration=release OpenRTM-aist_vc10.sln
 
 @rem ============================================================
- at rem build USBCamera examples
+ at rem build OpenCV-RTC
 @rem ============================================================
-msbuild /M:2 /t:rebuild /p:configuration=debug examples\USBCamera\USBCamera_vc10.sln
-msbuild /M:2 /t:rebuild /p:configuration=release examples\USBCamera\USBCamera_vc10.sln
 
+cd %OPENCV_RTC_ROOT%
+call build_vc10.bat
+cd %RTM_ROOT%
+
 cd installer
-call autowix.cmd
+call autowix_vc10.cmd
 cd ..
 

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc8.bat
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc8.bat	2012-03-08 14:25:50 UTC (rev 2342)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc8.bat	2012-03-08 14:31:38 UTC (rev 2343)
@@ -26,6 +26,7 @@
 @set VC_VERSION=Visual C++ 2005
 @set OPENCV_ROOT=C:\distribution\OpenCV2.1
 @set OPENCV_RTC_ROOT=C:\distribution\ImageProcessing\opencv
+ at set BOOST_ROOT=C:\Program Files\boost\boost_1_47
 
 @rem ============================================================
 @rem copy property sheet
@@ -54,6 +55,15 @@
 
 vcbuild /M2 /rebuild OpenRTM-aist_vc8.sln
 
+ at rem ============================================================
+ at rem build OpenCV-RTC
+ at rem ============================================================
+
+cd %OPENCV_RTC_ROOT%
+call copyprops.bat
+vcbuild /M2 /rebuild OpenCV-RTC_vc8.sln
+cd %RTM_ROOT%
+
 cd installer
 call autowix.cmd
 cd ..

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc9.bat
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc9.bat	2012-03-08 14:25:50 UTC (rev 2342)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc9.bat	2012-03-08 14:31:38 UTC (rev 2343)
@@ -26,6 +26,7 @@
 @set VC_VERSION=Visual C++ 2008
 @set OPENCV_ROOT=C:\distribution\OpenCV2.1
 @set OPENCV_RTC_ROOT=C:\distribution\ImageProcessing\opencv
+ at set BOOST_ROOT=C:\Program Files\boost\boost_1_47
 
 @rem ============================================================
 @rem copy property sheet
@@ -54,6 +55,15 @@
 
 vcbuild /M2 /rebuild OpenRTM-aist_vc9.sln
 
+ at rem ============================================================
+ at rem build OpenCV-RTC
+ at rem ============================================================
+
+cd %OPENCV_RTC_ROOT%
+call copyprops.bat
+vcbuild /M2 /rebuild OpenCV-RTC_vc9.sln
+cd %RTM_ROOT%
+
 cd installer
 call autowix.cmd
 cd ..