[openrtm-commit:00261] r2205 - in trunk/OpenRTM-aist/win32/OpenRTM-aist/installer: OpenCV-RTC OpenCV2.1

[openrtm ＠ openrtm.org]

Author: kurihara
Date: 2011-07-21 18:21:48 +0900 (Thu, 21 Jul 2011)
New Revision: 2205

Modified:
   trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV-RTC/OpenCVRTC_bin.yaml
   trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV-RTC/opencvrtcwxs.py
   trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV2.1/OpenCV22_inc.wxs.in
   trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV2.1/OpenCV_inc.wxs.in
   trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV2.1/opencvwxs.py
Log:
- OpenCVConfig.cmake file came to be installed in OpenCV installation-dir.
- rtc.conf file came to be installed in opencv-rtcs-dir.

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV-RTC/OpenCVRTC_bin.yaml
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV-RTC/OpenCVRTC_bin.yaml	2011-07-20 15:32:17 UTC (rev 2204)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV-RTC/OpenCVRTC_bin.yaml	2011-07-21 09:21:48 UTC (rev 2205)
@@ -225,3 +225,8 @@
       Name: translateComp.exe
       Source: C:\\distribution\\ImageProcessing\\opencv\\bin\\translateComp.exe
       Shortcut: true
+    - Id: OpenCVRTCBin0050
+      ShortName: rtc.conf
+      Name: rtc.conf
+      Source: C:\\distribution\\ImageProcessing\\opencv\\bin\\rtc.conf
+      Shortcut: false

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV-RTC/opencvrtcwxs.py
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV-RTC/opencvrtcwxs.py	2011-07-20 15:32:17 UTC (rev 2204)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV-RTC/opencvrtcwxs.py	2011-07-21 09:21:48 UTC (rev 2205)
@@ -15,7 +15,7 @@
 #
 
 data = [
-    ("bin",             "*.dll *.exe")
+    ("bin",             "*.dll *.exe rtc.conf")
 ]
 
 import os

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV2.1/OpenCV22_inc.wxs.in
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV2.1/OpenCV22_inc.wxs.in	2011-07-20 15:32:17 UTC (rev 2204)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV2.1/OpenCV22_inc.wxs.in	2011-07-21 09:21:48 UTC (rev 2205)
@@ -3,7 +3,7 @@
   <!-- root directory -->		
   <Directory Id="OpenCVRoot" Name="OpenCV2.2">
     <Component Id="OpenCV" Guid="{% OpenCV.GUID %}">
-	  <Environment Id="OPENCV_ROOT" Name="OPENCV_ROOT" Action="set"
+	  <Environment Id="OPENCV_DIR" Name="OpenCV_DIR" Action="set"
 		           System="yes" Value="[OpenCVRoot]" />
 	    {% for file in OpenCV.Files %}
 	      <File Id="{% file.Id %}" Name="{% file.Name %}"

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV2.1/OpenCV_inc.wxs.in
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV2.1/OpenCV_inc.wxs.in	2011-07-20 15:32:17 UTC (rev 2204)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV2.1/OpenCV_inc.wxs.in	2011-07-21 09:21:48 UTC (rev 2205)
@@ -3,7 +3,7 @@
   <!-- root directory -->		
   <Directory Id="OpenCVRoot" Name="OpenCV2.1">
     <Component Id="OpenCV" Guid="{% OpenCV.GUID %}">
-	  <Environment Id="OPENCV_ROOT" Name="OPENCV_ROOT" Action="set"
+	  <Environment Id="OPENCV_DIR" Name="OpenCV_DIR" Action="set"
 		           System="yes" Value="[OpenCVRoot]" />
 	    {% for file in OpenCV.Files %}
 	      <File Id="{% file.Id %}" Name="{% file.Name %}"

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV2.1/opencvwxs.py
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV2.1/opencvwxs.py	2011-07-20 15:32:17 UTC (rev 2204)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV2.1/opencvwxs.py	2011-07-21 09:21:48 UTC (rev 2205)
@@ -14,7 +14,7 @@
 # $Id$
 #
 
-OpenCV_files = "README"
+OpenCV_files = "README OpenCVConfig.cmake"
 
 data = [
     ("",                OpenCV_files),