[openrtm-commit:00272] r2211 - in branches/RELENG_1_1/OpenRTM-aist: . src/lib/coil/build win32/OpenRTM-aist win32/OpenRTM-aist/etc

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2011-07-27 23:29:53 +0900 (Wed, 27 Jul 2011)
New Revision: 2211

Modified:
   branches/RELENG_1_1/OpenRTM-aist/
   branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/build/vcxprojtool.py
   branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat
   branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni414.props
Log:
merged r2182:2183


Property changes on: branches/RELENG_1_1/OpenRTM-aist
___________________________________________________________________
Modified: svn:mergeinfo
   - /tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2184-2208
   + /tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208

Modified: branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/build/vcxprojtool.py
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/build/vcxprojtool.py	2011-07-27 14:07:51 UTC (rev 2210)
+++ branches/RELENG_1_1/OpenRTM-aist/src/lib/coil/build/vcxprojtool.py	2011-07-27 14:29:53 UTC (rev 2211)
@@ -1087,9 +1087,6 @@
         text += FileList(self.flist).generate()
 
         text = self.replace_uuid(text)
-        print "zzzzzzzzzzzzz--"
-        print text
-        print "zzzzzzzzzzzzz--"
         if self.projectname:
             text = text.replace("__PROJECT_NAME__", self.projectname)
         if self.version:
@@ -1135,16 +1132,10 @@
                 text += self.temp % \
                     (self.filter[f]["Id"], self.filter[f]["name"],
                      self.filter[f]["filter"])
-                print "zzzzzzzzzzzzz"
-                print text
-                print "zzzzzzzzzzzzz"
                 for file in self.flist[f]:
                     # vcproj's path delimiter should be "\"
                     file = file.replace("/","\\")
                     text += "    - Path: " + file + "\n"
-                print "zzzzzzzzzzzzz"
-                print text
-                print "zzzzzzzzzzzzz"
         return text
 
 

Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat	2011-07-27 14:07:51 UTC (rev 2210)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat	2011-07-27 14:29:53 UTC (rev 2211)
@@ -24,6 +24,8 @@
 @set OMNI_ROOT=C:\distribution\omniORB-4.1.4_vc10
 @set RTSE_ROOT=C:\distribution\OpenRTP\RTSystemEditor
 @set VC_VERSION=Visual C++ 2010
+ at set OPENCV_ROOT=C:\distribution\OpenCV2.2
+ at set OPENCV_RTC_ROOT=C:\distribution\ImageProcessing\opencv
 
 @rem ============================================================
 @rem copy property sheet

Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni414.props
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni414.props	2011-07-27 14:07:51 UTC (rev 2210)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni414.props	2011-07-27 14:29:53 UTC (rev 2211)
@@ -20,7 +20,7 @@
     <rtm_libd>RTC$(rtm_dllver)d.lib;$(coil_libd);$(omni_libd);advapi32.lib;ws2_32.lib;mswsock.lib;$(user_libd)</rtm_libd>
     <rtm_lib>RTC$(rtm_dllver).lib;$(coil_lib);$(omni_lib);advapi32.lib;ws2_32.lib;mswsock.lib;$(user_lib)</rtm_lib>
     <rtm_idlc>omniidl</rtm_idlc>
-    <rtm_idlflags>-bcxx -Wba -nf</rtm_idlflags>
+    <rtm_idlflags>-bcxx -Wba -nf -I $(SolutionDir)\rtm\idl</rtm_idlflags>
   </PropertyGroup>
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>