[openrtm-commit:00205] r2189 - in trunk/OpenRTM-aist: build win32/OpenRTM-aist/installer/OpenCV-RTC

[openrtm ＠ openrtm.org]

Author: fsi-katami
Date: 2011-06-28 16:49:35 +0900 (Tue, 28 Jun 2011)
New Revision: 2189

Modified:
   trunk/OpenRTM-aist/build/makewxs.py
   trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV-RTC/OpenCV-RTC_inc.wxs.in
Log:
For vc2010. refs #1915

Modified: trunk/OpenRTM-aist/build/makewxs.py
===================================================================
--- trunk/OpenRTM-aist/build/makewxs.py	2011-06-27 05:49:34 UTC (rev 2188)
+++ trunk/OpenRTM-aist/build/makewxs.py	2011-06-28 07:49:35 UTC (rev 2189)
@@ -52,6 +52,7 @@
       ShortName: %s
       Name: %s
       Source: %s
+      Shortcut: %s
 """
         self.count = -1
 
@@ -83,6 +84,18 @@
             return short_name
         return short_name + "." + short_ext
 
+    def is_ext_exe(self, fname):
+        try:
+            name, ext = fname.rsplit(".", 1)
+        except:
+            name = fname
+            ext  = ""
+        if ext == "exe":
+            flag = "true"
+        else:
+            flag = "false"
+        return flag
+
     def id(self):
         self.count += 1
         return self.comp + '%04d' % (self.count)
@@ -113,7 +126,8 @@
             self.write(self.fitem % (self.escape(self.id()),
                                      self.escape(self.to_shortname(fname)),
                                      self.escape(fname),
-                                     self.escape(self.path + fname)))
+                                     self.escape(self.path + fname),
+                                     self.is_ext_exe(fname)))
         return self.output
 
 

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV-RTC/OpenCV-RTC_inc.wxs.in
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV-RTC/OpenCV-RTC_inc.wxs.in	2011-06-27 05:49:34 UTC (rev 2188)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV-RTC/OpenCV-RTC_inc.wxs.in	2011-06-28 07:49:35 UTC (rev 2189)
@@ -14,9 +14,6 @@
 			          Icon="RTC.ico" IconIndex="0"
 			  {% if-any file.Arguments %}
 			    Arguments='{% file.Arguments %}'{% endif %}> 
-		      {% if file.Name is AffineComp.exe %}
-		        <Icon Id="RTC.ico" SourceFile="Bitmaps\RTC.ico"/>
-		      {% endif %}
 		    </Shortcut>
 		  {% endif %}{% endif %}
 	    </File>