[openrtm-commit:00664] r2309 - in branches/test/OpenRTM-aist/win32/OpenRTM-aist: . installer

[openrtm ＠ openrtm.org]

Author: kurihara
Date: 2012-02-06 16:04:23 +0900 (Mon, 06 Feb 2012)
New Revision: 2309

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:
reverted to revision 2292.

Modified: branches/test/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat
===================================================================
--- branches/test/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat	2012-02-06 06:53:09 UTC (rev 2308)
+++ branches/test/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat	2012-02-06 07:04:23 UTC (rev 2309)
@@ -64,6 +64,15 @@
 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-06 06:53:09 UTC (rev 2308)
+++ branches/test/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc8.bat	2012-02-06 07:04:23 UTC (rev 2309)
@@ -54,6 +54,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: branches/test/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc9.bat
===================================================================
--- branches/test/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc9.bat	2012-02-06 06:53:09 UTC (rev 2308)
+++ branches/test/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc9.bat	2012-02-06 07:04:23 UTC (rev 2309)
@@ -54,6 +54,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 ..

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-06 06:53:09 UTC (rev 2308)
+++ branches/test/OpenRTM-aist/win32/OpenRTM-aist/installer/autowix.cmd.in	2012-02-06 07:04:23 UTC (rev 2309)
@@ -129,15 +129,6 @@
 )
 set INCLUDE_OPENCV_RTC=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 OpenCV-RTC_inc.wxs (
    cd OpenCV-RTC
    set TMP_PYTHONPATH=%PYTHONPATH%