[openrtm-commit:01427] r2553 - in trunk/OpenRTM-aist: src/lib/coil/win32 src/lib/coil/win32/coil src/lib/rtm win32/OpenRTM-aist
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2014年 4月 8日 (火) 22:19:02 JST
Author: n-ando
Date: 2014-04-08 22:19:02 +0900 (Tue, 08 Apr 2014)
New Revision: 2553
Modified:
trunk/OpenRTM-aist/src/lib/coil/win32/coil/libcoil.vcproj.yaml
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/rtm/libRTC.vcproj.yaml
trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props
trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops
Log:
[compat,->RELENG_1_1] DLL version numver for def file is now short version RTM_SHORTVER/COIL_SHORTVER.
Modified: trunk/OpenRTM-aist/src/lib/coil/win32/coil/libcoil.vcproj.yaml
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/win32/coil/libcoil.vcproj.yaml 2014-04-04 05:44:59 UTC (rev 2552)
+++ trunk/OpenRTM-aist/src/lib/coil/win32/coil/libcoil.vcproj.yaml 2014-04-08 13:19:02 UTC (rev 2553)
@@ -42,7 +42,7 @@
lib -out:"$(TargetDir)coil_static.lib" "$(TargetDir)*.obj"
set PATH=%PATH%;$(coil_path)
cd "$(TargetDir)"
- start /wait cmd /c makedeffile.py coil_static.lib coil$(coil_dllver)d $(coil_version) coil$(coil_dllver)d.def
+ start /wait cmd /c makedeffile.py coil_static.lib coil$(coil_dllver)d $(coil_shortver) coil$(coil_dllver)d.def
move coil$(coil_dllver)d.def ..\
VCLinkerTool:
- Key: AdditionalDependencies
@@ -95,7 +95,7 @@
lib -out:"$(TargetDir)coil_static.lib" "$(TargetDir)*.obj"
set PATH=%PATH%;$(coil_path)
cd "$(TargetDir)"
- start /wait cmd /c makedeffile.py coil_static.lib coil$(coil_dllver)d $(coil_version) coil$(coil_dllver)d.def
+ start /wait cmd /c makedeffile.py coil_static.lib coil$(coil_dllver)d $(coil_shortver) coil$(coil_dllver)d.def
move coil$(coil_dllver)d.def ..\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
@@ -148,7 +148,7 @@
lib -out:"$(TargetDir)coil_static.lib" "$(TargetDir)*.obj"
set PATH=%PATH%;$(coil_path)
cd "$(TargetDir)"
- start /wait cmd /c makedeffile.py coil_static.lib coil$(coil_dllver)d $(coil_version) coil$(coil_dllver)d.def
+ start /wait cmd /c makedeffile.py coil_static.lib coil$(coil_dllver)d $(coil_shortver) coil$(coil_dllver)d.def
move coil$(coil_dllver)d.def ..\
VCLinkerTool:
- Key: AdditionalDependencies
@@ -201,7 +201,7 @@
lib -out:"$(TargetDir)coil_static.lib" "$(TargetDir)*.obj"
set PATH=%PATH%;$(coil_path)
cd "$(TargetDir)"
- start /wait cmd /c makedeffile.py coil_static.lib coil$(coil_dllver)d $(coil_version) coil$(coil_dllver)d.def
+ start /wait cmd /c makedeffile.py coil_static.lib coil$(coil_dllver)d $(coil_shortver) coil$(coil_dllver)d.def
move coil$(coil_dllver)d.def ..\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
@@ -252,7 +252,7 @@
lib -out:"$(TargetDir)coil_static.lib" "$(TargetDir)*.obj"
set PATH=%PATH%;$(coil_path)
cd "$(OutDir)"
- start /wait cmd /c makedeffile.py coil_static.lib $(TargetName) $(coil_version) $(TargetName).def
+ start /wait cmd /c makedeffile.py coil_static.lib $(TargetName) $(coil_shortver) $(TargetName).def
move coil$(coil_dllver).def ..\\
VCLinkerTool:
- Key: AdditionalDependencies
@@ -302,7 +302,7 @@
lib -out:"$(TargetDir)coil_static.lib" "$(TargetDir)*.obj"
set PATH=%PATH%;$(coil_path)
cd "$(OutDir)"
- start /wait cmd /c makedeffile.py coil_static.lib coil$(coil_dllver) $(coil_version) coil$(coil_dllver).def
+ start /wait cmd /c makedeffile.py coil_static.lib coil$(coil_dllver) $(coil_shortver) coil$(coil_dllver).def
move coil$(coil_dllver).def ..\\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
@@ -352,7 +352,7 @@
lib -out:"$(TargetDir)coil_static.lib" "$(TargetDir)*.obj"
set PATH=%PATH%;$(coil_path)
cd "$(OutDir)"
- start /wait cmd /c makedeffile.py coil_static.lib $(TargetName) $(coil_version) $(TargetName).def
+ start /wait cmd /c makedeffile.py coil_static.lib $(TargetName) $(coil_shortver) $(TargetName).def
move coil$(coil_dllver).def ..\\
VCLinkerTool:
- Key: AdditionalDependencies
@@ -402,7 +402,7 @@
lib -out:"$(TargetDir)coil_static.lib" "$(TargetDir)*.obj"
set PATH=%PATH%;$(coil_path)
cd "$(OutDir)"
- start /wait cmd /c makedeffile.py coil_static.lib coil$(coil_dllver) $(coil_version) coil$(coil_dllver).def
+ start /wait cmd /c makedeffile.py coil_static.lib coil$(coil_dllver) $(coil_shortver) coil$(coil_dllver).def
move coil$(coil_dllver).def ..\\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
Modified: trunk/OpenRTM-aist/src/lib/coil/win32/coil_config.props
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/win32/coil_config.props 2014-04-04 05:44:59 UTC (rev 2552)
+++ trunk/OpenRTM-aist/src/lib/coil/win32/coil_config.props 2014-04-08 13:19:02 UTC (rev 2553)
@@ -3,6 +3,7 @@
<PropertyGroup Label="UserMacros">
<coil_dllver>$(COIL_DLLVER)</coil_dllver>
<coil_version>$(COIL_VERSION)</coil_version>
+ <coil_shortver>$(COIL_SHORTVER)</coil_shortver>
<coil_includes>$(coil_root);..</coil_includes>
<coil_libdir>$(coil_root)\bin</coil_libdir>
<coil_bin>$(coil_root)\bin;$(coil_root)\build</coil_bin>
@@ -32,6 +33,9 @@
<BuildMacro Include="coil_version">
<Value>$(coil_version)</Value>
</BuildMacro>
+ <BuildMacro Include="coil_shortver">
+ <Value>$(coil_shortver)</Value>
+ </BuildMacro>
<BuildMacro Include="coil_includes">
<Value>$(coil_includes)</Value>
</BuildMacro>
Modified: trunk/OpenRTM-aist/src/lib/coil/win32/coil_config.vsprops
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/win32/coil_config.vsprops 2014-04-04 05:44:59 UTC (rev 2552)
+++ trunk/OpenRTM-aist/src/lib/coil/win32/coil_config.vsprops 2014-04-08 13:19:02 UTC (rev 2553)
@@ -24,6 +24,10 @@
Name="coil_version"
Value="%COIL_VERSION%"
/>
+ <UserMacro
+ Name="coil_shortver"
+ Value="%COIL_SHORTVER%"
+ />
<!-- coil macros -->
<UserMacro
Name="coil_includes"
Modified: trunk/OpenRTM-aist/src/lib/rtm/libRTC.vcproj.yaml
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/libRTC.vcproj.yaml 2014-04-04 05:44:59 UTC (rev 2552)
+++ trunk/OpenRTM-aist/src/lib/rtm/libRTC.vcproj.yaml 2014-04-08 13:19:02 UTC (rev 2553)
@@ -42,7 +42,7 @@
lib -out:"$(TargetDir)RTC_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
set PATH=%PATH%;$(rtm_path)
cd "$(TargetDir)"
- start /wait cmd /c makedeffile.py RTC_static.lib RTC$(rtm_dllver)d $(rtm_version) RTC$(rtm_dllver)d.def
+ start /wait cmd /c makedeffile.py RTC_static.lib RTC$(rtm_dllver)d $(rtm_shortver) RTC$(rtm_dllver)d.def
move RTC$(rtm_dllver)d.def ..\
VCLinkerTool:
- Key: AdditionalDependencies
@@ -95,7 +95,7 @@
lib -out:"$(TargetDir)RTC_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
set PATH=%PATH%;$(rtm_path)
cd "$(TargetDir)"
- start /wait cmd /c makedeffile.py RTC_static.lib RTC$(rtm_dllver)d $(rtm_version) RTC$(rtm_dllver)d.def
+ start /wait cmd /c makedeffile.py RTC_static.lib RTC$(rtm_dllver)d $(rtm_shortver) RTC$(rtm_dllver)d.def
move RTC$(rtm_dllver)d.def ..\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
@@ -148,7 +148,7 @@
lib -out:"$(TargetDir)RTC_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
set PATH=%PATH%;$(rtm_path)
cd "$(TargetDir)"
- start /wait cmd /c makedeffile.py RTC_static.lib RTC$(rtm_dllver)d $(rtm_version) RTC$(rtm_dllver)d.def
+ start /wait cmd /c makedeffile.py RTC_static.lib RTC$(rtm_dllver)d $(rtm_shortver) RTC$(rtm_dllver)d.def
move RTC$(rtm_dllver)d.def ..\
VCLinkerTool:
- Key: AdditionalDependencies
@@ -201,7 +201,7 @@
lib -out:"$(TargetDir)RTC_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
set PATH=%PATH%;$(rtm_path)
cd "$(TargetDir)"
- start /wait cmd /c makedeffile.py RTC_static.lib RTC$(rtm_dllver)d $(rtm_version) RTC$(rtm_dllver)d.def
+ start /wait cmd /c makedeffile.py RTC_static.lib RTC$(rtm_dllver)d $(rtm_shortver) RTC$(rtm_dllver)d.def
move RTC$(rtm_dllver)d.def ..\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
@@ -252,7 +252,7 @@
lib -out:"$(TargetDir)RTC_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
set PATH=%PATH%;$(rtm_path)
cd "$(OutDir)"
- start /wait cmd /c makedeffile.py RTC_static.lib $(TargetName) $(rtm_version) $(TargetName).def
+ start /wait cmd /c makedeffile.py RTC_static.lib $(TargetName) $(rtm_shortver) $(TargetName).def
move RTC$(rtm_dllver).def ..\\
VCLinkerTool:
- Key: AdditionalDependencies
@@ -301,7 +301,7 @@
lib -out:"$(TargetDir)RTC_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
set PATH=%PATH%;$(rtm_path)
cd "$(OutDir)"
- start /wait cmd /c makedeffile.py RTC_static.lib RTC$(rtm_dllver) $(rtm_version) RTC$(rtm_dllver).def
+ start /wait cmd /c makedeffile.py RTC_static.lib RTC$(rtm_dllver) $(rtm_shortver) RTC$(rtm_dllver).def
move RTC$(rtm_dllver).def ..\\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
@@ -351,7 +351,7 @@
lib -out:"$(TargetDir)RTC_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
set PATH=%PATH%;$(rtm_path)
cd "$(OutDir)"
- start /wait cmd /c makedeffile.py RTC_static.lib $(TargetName) $(rtm_version) $(TargetName).def
+ start /wait cmd /c makedeffile.py RTC_static.lib $(TargetName) $(rtm_shortver) $(TargetName).def
move RTC$(rtm_dllver).def ..\\
VCLinkerTool:
- Key: AdditionalDependencies
@@ -400,7 +400,7 @@
lib -out:"$(TargetDir)RTC_static.lib" "$(TargetDir)*.obj" "$(ProjectDir)idl\$(ConfigurationName)\*.obj"
set PATH=%PATH%;$(rtm_path)
cd "$(OutDir)"
- start /wait cmd /c makedeffile.py RTC_static.lib RTC$(rtm_dllver) $(rtm_version) RTC$(rtm_dllver).def
+ start /wait cmd /c makedeffile.py RTC_static.lib RTC$(rtm_dllver) $(rtm_shortver) RTC$(rtm_dllver).def
move RTC$(rtm_dllver).def ..\\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props 2014-04-04 05:44:59 UTC (rev 2552)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props 2014-04-08 13:19:02 UTC (rev 2553)
@@ -5,6 +5,7 @@
<omnithread_dllver>$(OMNITHREAD_DLLVER)</omnithread_dllver>
<rtm_dllver>$(RTM_DLLVER)</rtm_dllver>
<rtm_version>$(RTM_VERSION)</rtm_version>
+ <rtm_shortver>$(RTM_SHORTVER)</rtm_shortver>
<coil_dllver>$(COIL_DLLVER)</coil_dllver>
<coil_lib>coil$(coil_dllver).lib</coil_lib>
<coil_libd>coil$(coil_dllver)d.lib</coil_libd>
@@ -54,6 +55,9 @@
<BuildMacro Include="rtm_version">
<Value>$(rtm_version)</Value>
</BuildMacro>
+ <BuildMacro Include="rtm_shortver">
+ <Value>$(rtm_shortver)</Value>
+ </BuildMacro>
<BuildMacro Include="coil_dllver">
<Value>$(coil_dllver)</Value>
</BuildMacro>
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops 2014-04-04 05:44:59 UTC (rev 2552)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops 2014-04-08 13:19:02 UTC (rev 2553)
@@ -38,6 +38,10 @@
Value="%RTM_VERSION%"
/>
<UserMacro
+ Name="rtm_shortver"
+ Value="%RTM_SHORTVER%"
+ />
+ <UserMacro
Name="coil_dllver"
Value="%COIL_DLLVER%"
/>
More information about the openrtm-commit
mailing list