[openrtm-commit:00200] r2188 - in trunk/OpenRTM-aist: src/lib/coil/win32/coil win32/OpenRTM-aist/installer win32/OpenRTM-aist/installer/OpenCV-RTC

[openrtm ＠ openrtm.org]

Author: fsi-katami
Date: 2011-06-27 14:49:34 +0900 (Mon, 27 Jun 2011)
New Revision: 2188

Modified:
   trunk/OpenRTM-aist/src/lib/coil/win32/coil/libcoil.vcproj.yaml
   trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/Makefile.am
   trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV-RTC/opencvrtcwxs.py
Log:
For vc2010. refs #1915

Modified: trunk/OpenRTM-aist/src/lib/coil/win32/coil/libcoil.vcproj.yaml
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/win32/coil/libcoil.vcproj.yaml	2011-06-27 04:06:38 UTC (rev 2187)
+++ trunk/OpenRTM-aist/src/lib/coil/win32/coil/libcoil.vcproj.yaml	2011-06-27 05:49:34 UTC (rev 2188)
@@ -69,8 +69,8 @@
     VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
     VC10_IntermediateDirectory: "$(Configuration)"
     VC10_InheritedPropertySheets: 
+      - "$(SolutionDir)coil_distbuild.props"
       - "$(SolutionDir)coil_config.props"
-      - "$(SolutionDir)coil_distbuild.props"
     VC10_LinkIncrementalCondition: "true"
     VC10_VCCLCompilerTool:
       - Key: Optimization
@@ -176,8 +176,8 @@
     VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
     VC10_IntermediateDirectory: "$(Configuration)"
     VC10_InheritedPropertySheets: 
+      - "$(SolutionDir)coil_distbuild.props"
       - "$(SolutionDir)coil_config.props"
-      - "$(SolutionDir)coil_distbuild.props"
     VC10_LinkIncrementalCondition: "false"
     VC10_VCCLCompilerTool:
       - Key: PreprocessorDefinitions

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/Makefile.am	2011-06-27 04:06:38 UTC (rev 2187)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/Makefile.am	2011-06-27 05:49:34 UTC (rev 2188)
@@ -43,7 +43,6 @@
 	OpenRTP/openrtpwxs.py      \
 	OpenCV2.1/OpenCV_inc.wxs.in \
 	OpenCV2.1/opencvwxs.py \
-	OpenCV-RTC/OpenCVRTC_bin.yaml \
 	OpenCV-RTC/OpenCV-RTC_inc.wxs.in \
 	OpenCV-RTC/opencvrtcwxs.py
 

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV-RTC/opencvrtcwxs.py
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV-RTC/opencvrtcwxs.py	2011-06-27 04:06:38 UTC (rev 2187)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/OpenCV-RTC/opencvrtcwxs.py	2011-06-27 05:49:34 UTC (rev 2188)
@@ -62,13 +62,13 @@
     for f in files.split(" "):
         flist += glob.glob(full_path + "\\" + f)
 
-    #cmd = ["flist",
-    #       "-c", comp_name,
-    #       "-o", dir_name + ".yaml",
-    #       "-p",  base_dir + path]
-    #cmd += flist
-    #
-    #makewxs.main(cmd)
+    cmd = ["flist",
+           "-c", comp_name,
+           "-o", dir_name + ".yaml",
+           "-p",  base_dir + path]
+    cmd += flist
+    
+    makewxs.main(cmd)
 
 
 cmd = ["wxs",