[openrtm-commit:01414] r2541 - branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc

openrtm ＠ openrtm.org openrtm ＠ openrtm.org
2014年 3月 29日 (土) 17:18:32 JST 

Author: n-ando
Date: 2014-03-29 17:18:32 +0900 (Sat, 29 Mar 2014)
New Revision: 2541

Removed:
   branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni407.vsprops
   branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni412.vsprops
   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.vsprops
Log:
[compat,build] omni version dependent property sheets have been deleted.

Deleted: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni407.vsprops
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni407.vsprops	2014-03-29 08:09:18 UTC (rev 2540)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni407.vsprops	2014-03-29 08:18:32 UTC (rev 2541)
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="OpenRTM-aist-1.0"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="$(omni_includes);$(rtm_includes)"
-		PreprocessorDefinitions="_WIN32_WINNT=0x0500"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		AdditionalLibraryDirectories="$(omni_libdir);$(rtm_libdir)"
-	/>
-	<UserMacro
-		Name="omni_root"
-		Value="%OMNI_ROOT%"
-	/>
-	<UserMacro
-		Name="omni_dllver"
-		Value="407"
-	/>
-	<UserMacro
-		Name="omnithread_dllver"
-		Value="32"
-	/>
-	<UserMacro
-		Name="rtm_root"
-		Value="%RTM_ROOT%"
-	/>
-	<UserMacro
-		Name="rtm_dllver"
-		Value="110"
-	/>
-	<UserMacro
-		Name="rtm_version"
-		Value="1.1.0"
-	/>
-	<UserMacro
-		Name="coil_dllver"
-		Value=""
-	/>
-	<!-- omniORB macros -->
-	<UserMacro
-		Name="omni_includes"
-		Value=""$(omni_root)\include""
-	/>
-	<UserMacro
-		Name="omni_libdir"
-		Value=""$(omni_root)\lib\x86_win32""
-	/>
-	<UserMacro
-		Name="omni_bin"
-		Value=""$(omni_root)\bin\x86_win32""
-	/>
-	<UserMacro
-		Name="omni_lib"
-		Value="omniORB$(omni_dllver)_rt.lib omniDynamic$(omni_dllver)_rt.lib omnithread$(omnithread_dllver)_rt.lib"
-	/>
-	<UserMacro
-		Name="omni_libd"
-		Value="omniORB$(omni_dllver)_rtd.lib omniDynamic$(omni_dllver)_rtd.lib omnithread$(omnithread_dllver)_rtd.lib"
-	/>
-	<!-- OpenRTM-aist macros -->
-	<UserMacro
-		Name="rtm_includes"
-		Value=""$(rtm_root)";"$(rtm_root)\rtm\idl""
-	/>
-	<UserMacro
-		Name="rtm_libdir"
-		Value=""$(rtm_root)\bin""
-	/>
-	<UserMacro
-		Name="rtm_bin"
-		Value=""$(rtm_root)\bin";"$(rtm_root)\build""
-	/>
-	<UserMacro
-		Name="rtm_path"
-		Value="$(rtm_bin);$(omni_bin)"
-	/>
-	<UserMacro
-		Name="rtm_libd"
-		Value="RTC$(rtm_dllver)d.lib $(coil_libd) $(omni_libd) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
-	/>
-	<UserMacro
-		Name="rtm_lib"
-		Value="RTC$(rtm_dllver).lib $(coil_lib) $(omni_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
-	/>
-	<UserMacro
-		Name="rtm_idlc"
-		Value="omniidl"
-	/>
-	<UserMacro
-		Name="rtm_idlflags"
-		Value="-bcxx -Wba -nf"
-	/>
-	<!-- coil macros -->
-	<UserMacro
-		Name="coil_lib"
-		Value="coil$(coil_dllver).lib"
-	/>
-	<UserMacro
-		Name="coil_libd"
-		Value="coil$(coil_dllver)d.lib"
-	/>
-
-</VisualStudioPropertySheet>

Deleted: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni412.vsprops
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni412.vsprops	2014-03-29 08:09:18 UTC (rev 2540)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni412.vsprops	2014-03-29 08:18:32 UTC (rev 2541)
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="OpenRTM-aist-1.0"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="$(omni_includes);$(rtm_includes)"
-		PreprocessorDefinitions="RTC_CORBA_CXXMAPPING11;_WIN32_WINNT=0x0500"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		AdditionalLibraryDirectories="$(omni_libdir);$(rtm_libdir)"
-	/>
-	<UserMacro
-		Name="omni_root"
-		Value="%OMNI_ROOT%"
-	/>
-	<UserMacro
-		Name="omni_dllver"
-		Value="412"
-	/>
-	<UserMacro
-		Name="omnithread_dllver"
-		Value="33"
-	/>
-	<UserMacro
-		Name="rtm_root"
-		Value="%RTM_ROOT%"
-	/>
-	<UserMacro
-		Name="rtm_dllver"
-		Value="110"
-	/>
-	<UserMacro
-		Name="rtm_version"
-		Value="1.1.0"
-	/>
-	<UserMacro
-		Name="coil_dllver"
-		Value=""
-	/>
-	<!-- omniORB macros -->
-	<UserMacro
-		Name="omni_includes"
-		Value=""$(omni_root)\include""
-	/>
-	<UserMacro
-		Name="omni_libdir"
-		Value=""$(omni_root)\lib\x86_win32""
-	/>
-	<UserMacro
-		Name="omni_bin"
-		Value=""$(omni_root)\bin\x86_win32""
-	/>
-	<UserMacro
-		Name="omni_lib"
-		Value="omniORB$(omni_dllver)_rt.lib omniDynamic$(omni_dllver)_rt.lib omnithread$(omnithread_dllver)_rt.lib"
-	/>
-	<UserMacro
-		Name="omni_libd"
-		Value="omniORB$(omni_dllver)_rtd.lib omniDynamic$(omni_dllver)_rtd.lib omnithread$(omnithread_dllver)_rtd.lib"
-	/>
-	<!-- OpenRTM-aist macros -->
-	<UserMacro
-		Name="rtm_includes"
-		Value=""$(rtm_root)";"$(rtm_root)\rtm\idl""
-	/>
-	<UserMacro
-		Name="rtm_libdir"
-		Value=""$(rtm_root)\bin""
-	/>
-	<UserMacro
-		Name="rtm_bin"
-		Value=""$(rtm_root)\bin";"$(rtm_root)\build""
-	/>
-	<UserMacro
-		Name="rtm_path"
-		Value="$(rtm_bin);$(omni_bin)"
-	/>
-	<UserMacro
-		Name="rtm_libd"
-		Value="RTC$(rtm_dllver)d.lib $(coil_libd) $(omni_libd) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
-	/>
-	<UserMacro
-		Name="rtm_lib"
-		Value="RTC$(rtm_dllver).lib $(coil_lib) $(omni_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
-	/>
-	<UserMacro
-		Name="rtm_idlc"
-		Value="omniidl"
-	/>
-	<UserMacro
-		Name="rtm_idlflags"
-		Value="-bcxx -Wba -nf"
-	/>
-	<!-- coil macros -->
-	<UserMacro
-		Name="coil_lib"
-		Value="coil$(coil_dllver).lib"
-	/>
-	<UserMacro
-		Name="coil_libd"
-		Value="coil$(coil_dllver)d.lib"
-	/>
-
-</VisualStudioPropertySheet>

Deleted: 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	2014-03-29 08:09:18 UTC (rev 2540)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni414.props	2014-03-29 08:18:32 UTC (rev 2541)
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="UserMacros">
-    <omni_dllver>414</omni_dllver>
-    <omnithread_dllver>34</omnithread_dllver>
-    <rtm_dllver>110</rtm_dllver>
-    <rtm_version>1.1.0</rtm_version>
-    <coil_dllver>110</coil_dllver>
-    <coil_lib>coil$(coil_dllver).lib</coil_lib>
-    <coil_libd>coil$(coil_dllver)d.lib</coil_libd>
-    <omni_includes>$(omni_root)\include</omni_includes>
-    <omni_libdir>$(omni_root)\lib\x86_win32</omni_libdir>
-    <omni_bin>$(omni_root)\bin\x86_win32</omni_bin>
-    <omni_lib>omniORB$(omni_dllver)_rt.lib;omniDynamic$(omni_dllver)_rt.lib;omnithread$(omnithread_dllver)_rt.lib</omni_lib>
-    <omni_libd>omniORB$(omni_dllver)_rtd.lib;omniDynamic$(omni_dllver)_rtd.lib;omnithread$(omnithread_dllver)_rtd.lib</omni_libd>
-    <rtm_includes>$(rtm_root);$(rtm_root)\rtm\idl</rtm_includes>
-    <rtm_libdir>$(rtm_root)\bin</rtm_libdir>
-    <rtm_bin>$(rtm_root)\bin;$(rtm_root)\build</rtm_bin>
-    <rtm_path>$(rtm_bin);$(omni_bin)</rtm_path>
-    <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 -I $(SolutionDir)\rtm\idl</rtm_idlflags>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <_PropertySheetDisplayName>OpenRTM-aist-1.0</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(omni_includes);$(rtm_includes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>RTC_CORBA_CXXMAPPING11;_WIN32_WINNT=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$(omni_libdir);$(rtm_libdir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <BuildMacro Include="omni_root">
-      <Value>$(omni_root)</Value>
-    </BuildMacro>
-    <BuildMacro Include="omni_dllver">
-      <Value>$(omni_dllver)</Value>
-    </BuildMacro>
-    <BuildMacro Include="omnithread_dllver">
-      <Value>$(omnithread_dllver)</Value>
-    </BuildMacro>
-    <BuildMacro Include="rtm_root">
-      <Value>$(rtm_root)</Value>
-    </BuildMacro>
-    <BuildMacro Include="rtm_dllver">
-      <Value>$(rtm_dllver)</Value>
-    </BuildMacro>
-    <BuildMacro Include="rtm_version">
-      <Value>$(rtm_version)</Value>
-    </BuildMacro>
-    <BuildMacro Include="coil_dllver">
-      <Value>$(coil_dllver)</Value>
-    </BuildMacro>
-    <BuildMacro Include="omni_includes">
-      <Value>$(omni_includes)</Value>
-    </BuildMacro>
-    <BuildMacro Include="omni_libdir">
-      <Value>$(omni_libdir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="omni_bin">
-      <Value>$(omni_bin)</Value>
-    </BuildMacro>
-    <BuildMacro Include="omni_lib">
-      <Value>$(omni_lib)</Value>
-    </BuildMacro>
-    <BuildMacro Include="omni_libd">
-      <Value>$(omni_libd)</Value>
-    </BuildMacro>
-    <BuildMacro Include="rtm_includes">
-      <Value>$(rtm_includes)</Value>
-    </BuildMacro>
-    <BuildMacro Include="rtm_libdir">
-      <Value>$(rtm_libdir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="rtm_bin">
-      <Value>$(rtm_bin)</Value>
-    </BuildMacro>
-    <BuildMacro Include="rtm_path">
-      <Value>$(rtm_path)</Value>
-    </BuildMacro>
-    <BuildMacro Include="rtm_libd">
-      <Value>$(rtm_libd)</Value>
-    </BuildMacro>
-    <BuildMacro Include="rtm_lib">
-      <Value>$(rtm_lib)</Value>
-    </BuildMacro>
-    <BuildMacro Include="rtm_idlc">
-      <Value>$(rtm_idlc)</Value>
-    </BuildMacro>
-    <BuildMacro Include="rtm_idlflags">
-      <Value>$(rtm_idlflags)</Value>
-    </BuildMacro>
-    <BuildMacro Include="coil_lib">
-      <Value>$(coil_lib)</Value>
-    </BuildMacro>
-    <BuildMacro Include="coil_libd">
-      <Value>$(coil_libd)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>

Deleted: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni414.vsprops
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni414.vsprops	2014-03-29 08:09:18 UTC (rev 2540)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni414.vsprops	2014-03-29 08:18:32 UTC (rev 2541)
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="OpenRTM-aist-1.1"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="$(omni_includes);$(rtm_includes)"
-		PreprocessorDefinitions="RTC_CORBA_CXXMAPPING11;_WIN32_WINNT=0x0500"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		AdditionalLibraryDirectories="$(omni_libdir);$(rtm_libdir)"
-	/>
-	<UserMacro
-		Name="omni_root"
-		Value="%OMNI_ROOT%"
-	/>
-	<UserMacro
-		Name="omni_dllver"
-		Value="414"
-	/>
-	<UserMacro
-		Name="omnithread_dllver"
-		Value="34"
-	/>
-	<UserMacro
-		Name="rtm_root"
-		Value="%RTM_ROOT%"
-	/>
-	<UserMacro
-		Name="rtm_dllver"
-		Value="110"
-	/>
-	<UserMacro
-		Name="rtm_version"
-		Value="1.1.0"
-	/>
-	<UserMacro
-		Name="coil_dllver"
-		Value="110"
-	/>
-	<!-- omniORB macros -->
-	<UserMacro
-		Name="omni_includes"
-		Value=""$(omni_root)\include""
-	/>
-	<UserMacro
-		Name="omni_libdir"
-		Value=""$(omni_root)\lib\x86_win32""
-	/>
-	<UserMacro
-		Name="omni_bin"
-		Value=""$(omni_root)\bin\x86_win32""
-	/>
-	<UserMacro
-		Name="omni_lib"
-		Value="omniORB$(omni_dllver)_rt.lib omniDynamic$(omni_dllver)_rt.lib omnithread$(omnithread_dllver)_rt.lib"
-	/>
-	<UserMacro
-		Name="omni_libd"
-		Value="omniORB$(omni_dllver)_rtd.lib omniDynamic$(omni_dllver)_rtd.lib omnithread$(omnithread_dllver)_rtd.lib"
-	/>
-	<!-- OpenRTM-aist macros -->
-	<UserMacro
-		Name="rtm_includes"
-		Value=""$(rtm_root)";"$(rtm_root)\rtm\idl""
-	/>
-	<UserMacro
-		Name="rtm_libdir"
-		Value=""$(rtm_root)\bin""
-	/>
-	<UserMacro
-		Name="rtm_bin"
-		Value=""$(rtm_root)\bin";"$(rtm_root)\build""
-	/>
-	<UserMacro
-		Name="rtm_path"
-		Value="$(rtm_bin);$(omni_bin)"
-	/>
-	<UserMacro
-		Name="rtm_libd"
-		Value="RTC$(rtm_dllver)d.lib $(coil_libd) $(omni_libd) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
-	/>
-	<UserMacro
-		Name="rtm_lib"
-		Value="RTC$(rtm_dllver).lib $(coil_lib) $(omni_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
-	/>
-	<UserMacro
-		Name="rtm_idlc"
-		Value="omniidl"
-	/>
-	<UserMacro
-		Name="rtm_idlflags"
-		Value="-bcxx -Wba -nf -I"$(SolutionDir)\rtm\idl""
-	/>
-	<!-- coil macros -->
-	<UserMacro
-		Name="coil_lib"
-		Value="coil$(coil_dllver).lib"
-	/>
-	<UserMacro
-		Name="coil_libd"
-		Value="coil$(coil_dllver)d.lib"
-	/>
-
-</VisualStudioPropertySheet>

More information about the openrtm-commit mailing list