[openrtm-commit:01343] r2525 - trunk/OpenRTM-aist/src/lib/coil/win32

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2014-03-14 15:14:02 +0900 (Fri, 14 Mar 2014)
New Revision: 2525

Modified:
   trunk/OpenRTM-aist/src/lib/coil/win32/coil_config.props
   trunk/OpenRTM-aist/src/lib/coil/win32/coil_config.vsprops
   trunk/OpenRTM-aist/src/lib/coil/win32/coil_distbuild.props
   trunk/OpenRTM-aist/src/lib/coil/win32/coil_distbuild.vsprops
Log:
[compat,build,->RELENG_1_1] Now coil version in property sheets uses environment variables. refs #3042

Modified: trunk/OpenRTM-aist/src/lib/coil/win32/coil_config.props
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/win32/coil_config.props	2014-03-14 03:17:27 UTC (rev 2524)
+++ trunk/OpenRTM-aist/src/lib/coil/win32/coil_config.props	2014-03-14 06:14:02 UTC (rev 2525)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="UserMacros">
-    <coil_dllver>110</coil_dllver>
-    <coil_version>1.0.0</coil_version>
+    <coil_dllver>$(COIL_DLL_VER)</coil_dllver>
+    <coil_version>$(COIL_VERSION)</coil_version>
     <coil_includes>$(coil_root);..</coil_includes>
     <coil_libdir>$(coil_root)\bin</coil_libdir>
     <coil_bin>$(coil_root)\bin;$(coil_root)\build</coil_bin>
@@ -12,7 +12,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <_PropertySheetDisplayName>coil-1.0</_PropertySheetDisplayName>
+    <_PropertySheetDisplayName>coil-$(COIL_SHORT_VER)</_PropertySheetDisplayName>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>

Modified: trunk/OpenRTM-aist/src/lib/coil/win32/coil_config.vsprops
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/win32/coil_config.vsprops	2014-03-14 03:17:27 UTC (rev 2524)
+++ trunk/OpenRTM-aist/src/lib/coil/win32/coil_config.vsprops	2014-03-14 06:14:02 UTC (rev 2525)
@@ -2,7 +2,7 @@
 <VisualStudioPropertySheet
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="coil-1.0"
+	Name="coil-%COIL_SHORT_VER%"
 	>
 	<Tool
 		Name="VCCLCompilerTool"
@@ -18,11 +18,11 @@
 	/>
 	<UserMacro
 		Name="coil_dllver"
-		Value="110"
+		Value="%COIL_DLL_VER%"
 	/>
 	<UserMacro
 		Name="coil_version"
-		Value="1.1.0"
+		Value="%COIL_VERSION%"
 	/>
 	<!-- coil macros -->
 	<UserMacro

Modified: trunk/OpenRTM-aist/src/lib/coil/win32/coil_distbuild.props
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/win32/coil_distbuild.props	2014-03-14 03:17:27 UTC (rev 2524)
+++ trunk/OpenRTM-aist/src/lib/coil/win32/coil_distbuild.props	2014-03-14 06:14:02 UTC (rev 2525)
@@ -2,14 +2,12 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="UserMacros">
     <coil_root>$(SolutionDir)</coil_root>
-    <!--    <coil_depend_libd>"advapi32.lib";"ws2_32.lib";"mswsock.lib";"rpcrt4.lib";"msvcrt.lib";"msvcmrt.lib"</coil_depend_libd>
-    -->
     <coil_depend_libd>"advapi32.lib";"ws2_32.lib";"mswsock.lib";"rpcrt4.lib";"msvcrtd.lib";"msvcmrtd.lib"</coil_depend_libd>
     <coil_depend_lib>"advapi32.lib";"ws2_32.lib";"mswsock.lib";"rpcrt4.lib";"msvcrt.lib";"msvcmrt.lib"</coil_depend_lib>
   </PropertyGroup>
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <_PropertySheetDisplayName>coil-dist-1.0</_PropertySheetDisplayName>
+    <_PropertySheetDisplayName>coil-dist-$(COIL_SHORT_VER)</_PropertySheetDisplayName>
   </PropertyGroup>
   <ItemGroup>
     <BuildMacro Include="coil_root">

Modified: trunk/OpenRTM-aist/src/lib/coil/win32/coil_distbuild.vsprops
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/win32/coil_distbuild.vsprops	2014-03-14 03:17:27 UTC (rev 2524)
+++ trunk/OpenRTM-aist/src/lib/coil/win32/coil_distbuild.vsprops	2014-03-14 06:14:02 UTC (rev 2525)
@@ -2,7 +2,7 @@
 <VisualStudioPropertySheet
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="coil-dist-1.0"
+	Name="coil-dist-%COIL_SHORT_VER%"
 	>
 	<UserMacro
 		Name="coil_root"