[openrtm-commit:00649] r2294 - in branches/test/OpenRTM-aist/win32/OpenRTM-aist: . installer

[openrtm ＠ openrtm.org]

Author: kurihara
Date: 2012-02-03 17:32:49 +0900 (Fri, 03 Feb 2012)
New Revision: 2294

Modified:
   branches/test/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat
   branches/test/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc8.bat
   branches/test/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc9.bat
   branches/test/OpenRTM-aist/win32/OpenRTM-aist/installer/autowix.cmd.in
Log:
Moved to the installer/autowix.cmd the build process of OpenCV-RTC.

Modified: branches/test/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat
===================================================================
--- branches/test/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat	2012-02-03 07:58:31 UTC (rev 2293)
+++ branches/test/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat	2012-02-03 08:32:49 UTC (rev 2294)
@@ -64,15 +64,6 @@
 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
 
- at rem ============================================================
- at rem build OpenCV-RTC
- at rem ============================================================
-
-cd %OPENCV_RTC_ROOT%
-call copyprops.bat
-msbuild /M:2 /t:rebuild ImageProcessing_opencv.sln
-cd %RTM_ROOT%
-
 cd installer
 call autowix.cmd
 cd ..

Modified: branches/test/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc8.bat
===================================================================
--- branches/test/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc8.bat	2012-02-03 07:58:31 UTC (rev 2293)
+++ branches/test/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc8.bat	2012-02-03 08:32:49 UTC (rev 2294)
@@ -54,15 +54,6 @@
 
 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: branches/test/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc9.bat
===================================================================
--- branches/test/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc9.bat	2012-02-03 07:58:31 UTC (rev 2293)
+++ branches/test/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc9.bat	2012-02-03 08:32:49 UTC (rev 2294)
@@ -54,15 +54,6 @@
 
 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 ..

Modified: branches/test/OpenRTM-aist/win32/OpenRTM-aist/installer/autowix.cmd.in
===================================================================
--- branches/test/OpenRTM-aist/win32/OpenRTM-aist/installer/autowix.cmd.in	2012-02-03 07:58:31 UTC (rev 2293)
+++ branches/test/OpenRTM-aist/win32/OpenRTM-aist/installer/autowix.cmd.in	2012-02-03 08:32:49 UTC (rev 2294)
@@ -66,6 +66,15 @@
 set INCLUDE_RTSE=YES
 set INCLUDE_OPENRTP=YES
 
+ at rem ============================================================
+ at rem build OpenCV-RTC
+ at rem ============================================================
+
+cd %OPENCV_RTC_ROOT%
+call copyprops.bat
+msbuild /M:2 /t:rebuild ImageProcessing_opencv.sln
+cd %RTM_ROOT%\installer
+
 if not exist OpenRTP_inc.wxs (
    cd OpenRTP
 rem set TMP_PYTHONPATH=%PYTHONPATH%