[openrtm-commit:00206] r2190 - trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV2.1

[openrtm ＠ openrtm.org]

Author: fsi-katami
Date: 2011-06-29 11:57:45 +0900 (Wed, 29 Jun 2011)
New Revision: 2190

Modified:
   trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV2.1/opencvwxs.py
Log:
For vc2010. refs #1915

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV2.1/opencvwxs.py
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV2.1/opencvwxs.py	2011-06-28 07:49:35 UTC (rev 2189)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV2.1/opencvwxs.py	2011-06-29 02:57:45 UTC (rev 2190)
@@ -76,9 +76,15 @@
 
     makewxs.main(cmd)
 
+import re
+if None != re.search('2\.2',base_dir):
+    cmd = ["wxs",
+           "-o", "OpenCV_inc.wxs",
+           "-i", "OpenCV22_inc.wxs.in"]
+else:
+    cmd = ["wxs",
+           "-o", "OpenCV_inc.wxs",
+           "-i", "OpenCV_inc.wxs.in"]
 
-cmd = ["wxs",
-       "-o", "OpenCV_inc.wxs",
-       "-i", "OpenCV_inc.wxs.in"]
 cmd += glob.glob("*.yaml")
 makewxs.main(cmd)