[openrtm-commit:01681] r2697 - in trunk/OpenRTM-aist: src/lib/rtm/idl win32/OpenRTM-aist
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2016年 1月 18日 (月) 09:47:39 JST
Author: kawauchi
Date: 2016-01-18 09:47:39 +0900 (Mon, 18 Jan 2016)
New Revision: 2697
Modified:
trunk/OpenRTM-aist/src/lib/rtm/idl/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/idl/libCameraSkel.vcproj.yaml
trunk/OpenRTM-aist/src/lib/rtm/idl/libManipulatorSkel.vcproj.yaml
trunk/OpenRTM-aist/src/lib/rtm/idl/libRTCSkel.vcproj.yaml
trunk/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep
Log:
[compat,->RELENG_1_1] New IDLs skel/stub are now compiled into individual so/dll. refs #3431
Modified: trunk/OpenRTM-aist/src/lib/rtm/idl/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/idl/Makefile.am 2016-01-14 14:00:29 UTC (rev 2696)
+++ trunk/OpenRTM-aist/src/lib/rtm/idl/Makefile.am 2016-01-18 00:47:39 UTC (rev 2697)
@@ -302,27 +302,27 @@
--version $(RTM_VERSION) \
--out $(win32_builddir)/rtm/idl/libRTCSkel_vc9.vcproj \
--yaml libRTCSkel.vcproj.yaml \
- --source $(SKEL_CPP) \
- --header $(SKEL_H)
+ --source $(RTCSKEL_CPP) \
+ --header $(RTCSKEL_H)
qkc -O- -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc9.vcproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type LIB \
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --type DLL \
--vcversion "9.00" \
--version $(RTM_VERSION) \
- --out $(win32_builddir)/rtm/idl/libManipulatorSkel_vc9.vcxproj \
+ --out $(win32_builddir)/rtm/idl/libManipulatorSkel_vc9.vcproj \
--yaml libManipulatorSkel.vcproj.yaml \
- --source $(SKEL_CPP) \
- --header $(SKEL_H)
- qkc -O- -sm $(win32_builddir)/rtm/idl/libManipulatorSkel_vc9.vcxproj
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type LIB \
+ --source $(MANIPULATORSKEL_CPP) \
+ --header $(MANIPULATORSKEL_H)
+ qkc -O- -sm $(win32_builddir)/rtm/idl/libManipulatorSkel_vc9.vcproj
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --type DLL \
--vcversion "9.00" \
--version $(RTM_VERSION) \
- --out $(win32_builddir)/rtm/idl/libCameraSkel_vc9.vcxproj \
+ --out $(win32_builddir)/rtm/idl/libCameraSkel_vc9.vcproj \
--yaml libCameraSkel.vcproj.yaml \
- --source $(SKEL_CPP) \
- --header $(SKEL_H)
- qkc -O- -sm $(win32_builddir)/rtm/idl/libCameraSkel_vc9.vcxproj
+ --source $(CAMERASKEL_CPP) \
+ --header $(CAMERASKEL_H)
+ qkc -O- -sm $(win32_builddir)/rtm/idl/libCameraSkel_vc9.vcproj
vc10proj: libRTCSkel.vcproj.yaml
$(top_builddir)/build/vcxprojtool.py vcxproj \
@@ -331,26 +331,26 @@
--version $(RTM_VERSION) \
--out $(win32_builddir)/rtm/idl/libRTCSkel_vc10.vcxproj \
--yaml libRTCSkel.vcproj.yaml \
- --source $(SKEL_CPP) \
- --header $(SKEL_H)
+ --source $(RTCSKEL_CPP) \
+ --header $(RTCSKEL_H)
qkc -O- -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc10.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
- --type LIB \
+ --type DLL \
--vcversion "10.00" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/rtm/idl/libManipulatorSkel_vc10.vcxproj \
--yaml libManipulatorSkel.vcproj.yaml \
- --source $(SKEL_CPP) \
- --header $(SKEL_H)
+ --source $(MANIPULATORSKEL_CPP) \
+ --header $(MANIPULATORSKEL_H)
qkc -O- -sm $(win32_builddir)/rtm/idl/libManipulatorSkel_vc10.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
- --type LIB \
+ --type DLL \
--vcversion "10.00" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/rtm/idl/libCameraSkel_vc10.vcxproj \
--yaml libCameraSkel.vcproj.yaml \
- --source $(SKEL_CPP) \
- --header $(SKEL_H)
+ --source $(CAMERASKEL_CPP) \
+ --header $(CAMERASKEL_H)
qkc -O- -sm $(win32_builddir)/rtm/idl/libCameraSkel_vc10.vcxproj
vc11proj: libRTCSkel.vcproj.yaml
@@ -360,26 +360,26 @@
--version $(RTM_VERSION) \
--out $(win32_builddir)/rtm/idl/libRTCSkel_vc11.vcxproj \
--yaml libRTCSkel.vcproj.yaml \
- --source $(SKEL_CPP) \
- --header $(SKEL_H)
+ --source $(RTCSKEL_CPP) \
+ --header $(RTCSKEL_H)
qkc -O- -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc11.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
- --type LIB \
+ --type DLL \
--vcversion "11.00" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/rtm/idl/libManipulatorSkel_vc11.vcxproj \
--yaml libManipulatorSkel.vcproj.yaml \
- --source $(SKEL_CPP) \
- --header $(SKEL_H)
+ --source $(MANIPULATORSKEL_CPP) \
+ --header $(MANIPULATORSKEL_H)
qkc -O- -sm $(win32_builddir)/rtm/idl/libManipulatorSkel_vc11.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
- --type LIB \
+ --type DLL \
--vcversion "11.00" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/rtm/idl/libCameraSkel_vc11.vcxproj \
--yaml libCameraSkel.vcproj.yaml \
- --source $(SKEL_CPP) \
- --header $(SKEL_H)
+ --source $(CAMERASKEL_CPP) \
+ --header $(CAMERASKEL_H)
qkc -O- -sm $(win32_builddir)/rtm/idl/libCameraSkel_vc11.vcxproj
vc12proj: libRTCSkel.vcproj.yaml
@@ -389,26 +389,26 @@
--version $(RTM_VERSION) \
--out $(win32_builddir)/rtm/idl/libRTCSkel_vc12.vcxproj \
--yaml libRTCSkel.vcproj.yaml \
- --source $(SKEL_CPP) \
- --header $(SKEL_H)
+ --source $(RTCSKEL_CPP) \
+ --header $(RTCSKEL_H)
qkc -O- -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc12.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
- --type LIB \
+ --type DLL \
--vcversion "12.00" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/rtm/idl/libManipulatorSkel_vc12.vcxproj \
--yaml libManipulatorSkel.vcproj.yaml \
- --source $(SKEL_CPP) \
- --header $(SKEL_H)
+ --source $(MANIPULATORSKEL_CPP) \
+ --header $(MANIPULATORSKEL_H)
qkc -O- -sm $(win32_builddir)/rtm/idl/libManipulatorSkel_vc12.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
- --type LIB \
+ --type DLL \
--vcversion "12.00" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/rtm/idl/libCameraSkel_vc12.vcxproj \
--yaml libCameraSkel.vcproj.yaml \
- --source $(SKEL_CPP) \
- --header $(SKEL_H)
+ --source $(CAMERASKEL_CPP) \
+ --header $(CAMERASKEL_H)
qkc -O- -sm $(win32_builddir)/rtm/idl/libCameraSkel_vc12.vcxproj
vc14proj: libRTCSkel.vcproj.yaml
$(top_builddir)/build/vcxprojtool.py vcxproj \
@@ -417,26 +417,26 @@
--version $(RTM_VERSION) \
--out $(win32_builddir)/rtm/idl/libRTCSkel_vc14.vcxproj \
--yaml libRTCSkel.vcproj.yaml \
- --source $(SKEL_CPP) \
- --header $(SKEL_H)
+ --source $(RTCSKEL_CPP) \
+ --header $(RTCSKEL_H)
qkc -O- -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc14.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
- --type LIB \
+ --type DLL \
--vcversion "14.00" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/rtm/idl/libManipulatorSkel_vc14.vcxproj \
--yaml libManipulatorSkel.vcproj.yaml \
- --source $(SKEL_CPP) \
- --header $(SKEL_H)
+ --source $(MANIPULATORSKEL_CPP) \
+ --header $(MANIPULATORSKEL_H)
qkc -O- -sm $(win32_builddir)/rtm/idl/libManipulatorSkel_vc14.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
- --type LIB \
+ --type DLL \
--vcversion "14.00" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/rtm/idl/libCameraSkel_vc14.vcxproj \
--yaml libCameraSkel.vcproj.yaml \
- --source $(SKEL_CPP) \
- --header $(SKEL_H)
+ --source $(CAMERASKEL_CPP) \
+ --header $(CAMERASKEL_H)
qkc -O- -sm $(win32_builddir)/rtm/idl/libCameraSkel_vc14.vcxproj
Modified: trunk/OpenRTM-aist/src/lib/rtm/idl/libCameraSkel.vcproj.yaml
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/idl/libCameraSkel.vcproj.yaml 2016-01-14 14:00:29 UTC (rev 2696)
+++ trunk/OpenRTM-aist/src/lib/rtm/idl/libCameraSkel.vcproj.yaml 2016-01-18 00:47:39 UTC (rev 2697)
@@ -19,6 +19,12 @@
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
CharacterSet: "0"
+ VCPreBuildEventTool:
+ - Key: CommandLine
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
+ makewrapper.py CameraCommonInterface.idl
+ omniidl -bcxx -Wba -nf CameraCommonInterface.idl

VCCLCompilerTool:
- Key: Optimization
Value: "0"
@@ -46,7 +52,7 @@
move CameraSkel$(rtm_dllver)d.def ..\
VCLinkerTool:
- Key: AdditionalDependencies
- Value: "$(rtm_depend_libd)"
+ Value: "libRTCSkeld.lib $(rtm_depend_libd)"
- Key: OutputFile
Value: "$(OutDir)\\CameraSkel$(rtm_dllver)d.dll"
- Key: Version
@@ -72,6 +78,12 @@
- "$(SolutionDir)rtm_config.props"
- "$(SolutionDir)rtm_distbuild.props"
VC10_LinkIncrementalCondition: "true"
+ VC10_VCPreBuildEventTool:
+ - Key: Command
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
+ makewrapper.py CameraCommonInterface.idl
+ omniidl -bcxx -Wba -nf CameraCommonInterface.idl

VC10_VCCLCompilerTool:
- Key: Optimization
Value: "Disabled"
@@ -99,7 +111,7 @@
move CameraSkel$(rtm_dllver)d.def ..\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
- Value: "%(AdditionalDependencies)"
+ Value: "libRTCSkeld.lib;$(rtm_depend_libd);%(AdditionalDependencies)"
- Key: OutputFile
Value: "$(OutDir)\\CameraSkel$(rtm_dllver)d.dll"
- Key: Version
@@ -125,6 +137,12 @@
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
CharacterSet: "0"
+ VCPreBuildEventTool:
+ - Key: CommandLine
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
+ makewrapper.py CameraCommonInterface.idl
+ omniidl -bcxx -Wba -nf CameraCommonInterface.idl

VCCLCompilerTool:
- Key: Optimization
Value: "0"
@@ -152,7 +170,7 @@
move CameraSkel$(rtm_dllver)d.def ..\
VCLinkerTool:
- Key: AdditionalDependencies
- Value: "$(rtm_depend_libd)"
+ Value: "libRTCSkeld.lib $(rtm_depend_libd)"
- Key: OutputFile
Value: "$(OutDir)\\CameraSkel$(rtm_dllver)d.dll"
- Key: Version
@@ -178,6 +196,12 @@
- "$(SolutionDir)rtm_config.props"
- "$(SolutionDir)rtm_distbuild.props"
VC10_LinkIncrementalCondition: "true"
+ VC10_VCPreBuildEventTool:
+ - Key: Command
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
+ makewrapper.py CameraCommonInterface.idl
+ omniidl -bcxx -Wba -nf CameraCommonInterface.idl

VC10_VCCLCompilerTool:
- Key: Optimization
Value: "Disabled"
@@ -205,7 +229,7 @@
move CameraSkel$(rtm_dllver)d.def ..\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
- Value: "%(AdditionalDependencies)"
+ Value: "libRTCSkeld.lib;$(rtm_depend_libd);%(AdditionalDependencies)"
- Key: OutputFile
Value: "$(OutDir)\\CameraSkel$(rtm_dllver)d.dll"
- Key: Version
@@ -235,6 +259,12 @@
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
CharacterSet: "0"
WholeProgramOptimization: "0"
+ VCPreBuildEventTool:
+ - Key: CommandLine
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
+ makewrapper.py CameraCommonInterface.idl
+ omniidl -bcxx -Wba -nf CameraCommonInterface.idl

VCCLCompilerTool:
- Key: PreprocessorDefinitions
Value: "LIBRARY_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
@@ -256,7 +286,7 @@
move CameraSkel$(rtm_dllver).def ..\\
VCLinkerTool:
- Key: AdditionalDependencies
- Value: "$(rtm_depend_lib)"
+ Value: "libRTCSkel.lib $(rtm_depend_lib)"
- Key: OutputFile
Value: "$(OutDir)\\CameraSkel$(rtm_dllver).dll"
- Key: LinkIncremental
@@ -284,6 +314,12 @@
- "$(SolutionDir)rtm_config.props"
- "$(SolutionDir)rtm_distbuild.props"
VC10_LinkIncrementalCondition: "false"
+ VC10_VCPreBuildEventTool:
+ - Key: Command
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
+ makewrapper.py CameraCommonInterface.idl
+ omniidl -bcxx -Wba -nf CameraCommonInterface.idl

VC10_VCCLCompilerTool:
- Key: PreprocessorDefinitions
Value: "LIBRARY_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
@@ -305,7 +341,7 @@
move CameraSkel$(rtm_dllver).def ..\\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
- Value: "%(AdditionalDependencies)"
+ Value: "libRTCSkel.lib;$(rtm_depend_lib);%(AdditionalDependencies)"
- Key: OutputFile
Value: "$(OutDir)\\CameraSkel$(rtm_dllver).dll"
- Key: LinkIncremental
@@ -334,6 +370,12 @@
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
CharacterSet: "0"
WholeProgramOptimization: "0"
+ VCPreBuildEventTool:
+ - Key: CommandLine
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
+ makewrapper.py CameraCommonInterface.idl
+ omniidl -bcxx -Wba -nf CameraCommonInterface.idl

VCCLCompilerTool:
- Key: PreprocessorDefinitions
Value: "LIBRARY_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
@@ -355,7 +397,7 @@
move CameraSkel$(rtm_dllver).def ..\\
VCLinkerTool:
- Key: AdditionalDependencies
- Value: "$(rtm_depend_lib)"
+ Value: "libRTCSkel.lib $(rtm_depend_lib)"
- Key: OutputFile
Value: "$(OutDir)\\CameraSkel$(rtm_dllver).dll"
- Key: LinkIncremental
@@ -383,6 +425,12 @@
- "$(SolutionDir)rtm_config.props"
- "$(SolutionDir)rtm_distbuild.props"
VC10_LinkIncrementalCondition: "false"
+ VC10_VCPreBuildEventTool:
+ - Key: Command
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
+ makewrapper.py CameraCommonInterface.idl
+ omniidl -bcxx -Wba -nf CameraCommonInterface.idl

VC10_VCCLCompilerTool:
- Key: PreprocessorDefinitions
Value: "LIBRARY_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
@@ -404,7 +452,7 @@
move CameraSkel$(rtm_dllver).def ..\\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
- Value: "%(AdditionalDependencies)"
+ Value: "libRTCSkel.lib;$(rtm_depend_lib);%(AdditionalDependencies)"
- Key: OutputFile
Value: "$(OutDir)\\CameraSkel$(rtm_dllver).dll"
- Key: LinkIncremental
Modified: trunk/OpenRTM-aist/src/lib/rtm/idl/libManipulatorSkel.vcproj.yaml
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/idl/libManipulatorSkel.vcproj.yaml 2016-01-14 14:00:29 UTC (rev 2696)
+++ trunk/OpenRTM-aist/src/lib/rtm/idl/libManipulatorSkel.vcproj.yaml 2016-01-18 00:47:39 UTC (rev 2697)
@@ -19,6 +19,16 @@
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
CharacterSet: "0"
+ VCPreBuildEventTool:
+ - Key: CommandLine
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
+ makewrapper.py ManipulatorCommonInterface_DataTypes.idl
+ makewrapper.py ManipulatorCommonInterface_Common.idl
+ makewrapper.py ManipulatorCommonInterface_Middle.idl
+ omniidl -bcxx -Wba -nf ManipulatorCommonInterface_DataTypes.idl
+ omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Common.idl
+ omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Middle.idl
VCCLCompilerTool:
- Key: Optimization
Value: "0"
@@ -46,7 +56,7 @@
move ManipulatorSkel$(rtm_dllver)d.def ..\
VCLinkerTool:
- Key: AdditionalDependencies
- Value: "$(rtm_depend_libd)"
+ Value: "libRTCSkeld.lib $(rtm_depend_libd)"
- Key: OutputFile
Value: "$(OutDir)\\ManipulatorSkel$(rtm_dllver)d.dll"
- Key: Version
@@ -72,6 +82,16 @@
- "$(SolutionDir)rtm_config.props"
- "$(SolutionDir)rtm_distbuild.props"
VC10_LinkIncrementalCondition: "true"
+ VC10_VCPreBuildEventTool:
+ - Key: Command
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
+ makewrapper.py ManipulatorCommonInterface_DataTypes.idl
+ makewrapper.py ManipulatorCommonInterface_Common.idl
+ makewrapper.py ManipulatorCommonInterface_Middle.idl
+ omniidl -bcxx -Wba -nf ManipulatorCommonInterface_DataTypes.idl
+ omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Common.idl
+ omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Middle.idl
VC10_VCCLCompilerTool:
- Key: Optimization
Value: "Disabled"
@@ -99,7 +119,7 @@
move ManipulatorSkel$(rtm_dllver)d.def ..\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
- Value: "%(AdditionalDependencies)"
+ Value: "libRTCSkeld.lib;$(rtm_depend_libd);%(AdditionalDependencies)"
- Key: OutputFile
Value: "$(OutDir)\\ManipulatorSkel$(rtm_dllver)d.dll"
- Key: Version
@@ -125,6 +145,16 @@
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
CharacterSet: "0"
+ VCPreBuildEventTool:
+ - Key: CommandLine
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
+ makewrapper.py ManipulatorCommonInterface_DataTypes.idl
+ makewrapper.py ManipulatorCommonInterface_Common.idl
+ makewrapper.py ManipulatorCommonInterface_Middle.idl
+ omniidl -bcxx -Wba -nf ManipulatorCommonInterface_DataTypes.idl
+ omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Common.idl
+ omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Middle.idl
VCCLCompilerTool:
- Key: Optimization
Value: "0"
@@ -152,7 +182,7 @@
move ManipulatorSkel$(rtm_dllver)d.def ..\
VCLinkerTool:
- Key: AdditionalDependencies
- Value: "$(rtm_depend_libd)"
+ Value: "libRTCSkeld.lib $(rtm_depend_libd)"
- Key: OutputFile
Value: "$(OutDir)\\ManipulatorSkel$(rtm_dllver)d.dll"
- Key: Version
@@ -178,6 +208,16 @@
- "$(SolutionDir)rtm_config.props"
- "$(SolutionDir)rtm_distbuild.props"
VC10_LinkIncrementalCondition: "true"
+ VC10_VCPreBuildEventTool:
+ - Key: Command
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
+ makewrapper.py ManipulatorCommonInterface_DataTypes.idl
+ makewrapper.py ManipulatorCommonInterface_Common.idl
+ makewrapper.py ManipulatorCommonInterface_Middle.idl
+ omniidl -bcxx -Wba -nf ManipulatorCommonInterface_DataTypes.idl
+ omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Common.idl
+ omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Middle.idl
VC10_VCCLCompilerTool:
- Key: Optimization
Value: "Disabled"
@@ -205,7 +245,7 @@
move ManipulatorSkel$(rtm_dllver)d.def ..\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
- Value: "%(AdditionalDependencies)"
+ Value: "libRTCSkeld.lib;$(rtm_depend_libd);%(AdditionalDependencies)"
- Key: OutputFile
Value: "$(OutDir)\\ManipulatorSkel$(rtm_dllver)d.dll"
- Key: Version
@@ -235,6 +275,16 @@
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
CharacterSet: "0"
WholeProgramOptimization: "0"
+ VCPreBuildEventTool:
+ - Key: CommandLine
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
+ makewrapper.py ManipulatorCommonInterface_DataTypes.idl
+ makewrapper.py ManipulatorCommonInterface_Common.idl
+ makewrapper.py ManipulatorCommonInterface_Middle.idl
+ omniidl -bcxx -Wba -nf ManipulatorCommonInterface_DataTypes.idl
+ omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Common.idl
+ omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Middle.idl
VCCLCompilerTool:
- Key: PreprocessorDefinitions
Value: "LIBRARY_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
@@ -256,7 +306,7 @@
move ManipulatorSkel$(rtm_dllver).def ..\\
VCLinkerTool:
- Key: AdditionalDependencies
- Value: "$(rtm_depend_lib)"
+ Value: "libRTCSkel.lib $(rtm_depend_lib)"
- Key: OutputFile
Value: "$(OutDir)\\ManipulatorSkel$(rtm_dllver).dll"
- Key: LinkIncremental
@@ -284,6 +334,16 @@
- "$(SolutionDir)rtm_config.props"
- "$(SolutionDir)rtm_distbuild.props"
VC10_LinkIncrementalCondition: "false"
+ VC10_VCPreBuildEventTool:
+ - Key: Command
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
+ makewrapper.py ManipulatorCommonInterface_DataTypes.idl
+ makewrapper.py ManipulatorCommonInterface_Common.idl
+ makewrapper.py ManipulatorCommonInterface_Middle.idl
+ omniidl -bcxx -Wba -nf ManipulatorCommonInterface_DataTypes.idl
+ omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Common.idl
+ omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Middle.idl
VC10_VCCLCompilerTool:
- Key: PreprocessorDefinitions
Value: "LIBRARY_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
@@ -305,7 +365,7 @@
move ManipulatorSkel$(rtm_dllver).def ..\\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
- Value: "%(AdditionalDependencies)"
+ Value: "libRTCSkel.lib;$(rtm_depend_lib);%(AdditionalDependencies)"
- Key: OutputFile
Value: "$(OutDir)\\ManipulatorSkel$(rtm_dllver).dll"
- Key: LinkIncremental
@@ -334,6 +394,16 @@
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
CharacterSet: "0"
WholeProgramOptimization: "0"
+ VCPreBuildEventTool:
+ - Key: CommandLine
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
+ makewrapper.py ManipulatorCommonInterface_DataTypes.idl
+ makewrapper.py ManipulatorCommonInterface_Common.idl
+ makewrapper.py ManipulatorCommonInterface_Middle.idl
+ omniidl -bcxx -Wba -nf ManipulatorCommonInterface_DataTypes.idl
+ omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Common.idl
+ omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Middle.idl
VCCLCompilerTool:
- Key: PreprocessorDefinitions
Value: "LIBRARY_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
@@ -355,7 +425,7 @@
move ManipulatorSkel$(rtm_dllver).def ..\\
VCLinkerTool:
- Key: AdditionalDependencies
- Value: "$(rtm_depend_lib)"
+ Value: "libRTCSkel.lib $(rtm_depend_lib)"
- Key: OutputFile
Value: "$(OutDir)\\ManipulatorSkel$(rtm_dllver).dll"
- Key: LinkIncremental
@@ -383,6 +453,16 @@
- "$(SolutionDir)rtm_config.props"
- "$(SolutionDir)rtm_distbuild.props"
VC10_LinkIncrementalCondition: "false"
+ VC10_VCPreBuildEventTool:
+ - Key: Command
+ Value: |
+ set PATH=$(rtm_path);%PYTHON_ROOT%\\;%PATH%
+ makewrapper.py ManipulatorCommonInterface_DataTypes.idl
+ makewrapper.py ManipulatorCommonInterface_Common.idl
+ makewrapper.py ManipulatorCommonInterface_Middle.idl
+ omniidl -bcxx -Wba -nf ManipulatorCommonInterface_DataTypes.idl
+ omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Common.idl
+ omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Middle.idl
VC10_VCCLCompilerTool:
- Key: PreprocessorDefinitions
Value: "LIBRARY_EXPORTS;WIN32;NDEBUG;_WINDOWS;_USRDLL;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
@@ -404,7 +484,7 @@
move ManipulatorSkel$(rtm_dllver).def ..\\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
- Value: "%(AdditionalDependencies)"
+ Value: "libRTCSkel.lib;$(rtm_depend_lib);%(AdditionalDependencies)"
- Key: OutputFile
Value: "$(OutDir)\\ManipulatorSkel$(rtm_dllver).dll"
- Key: LinkIncremental
Modified: trunk/OpenRTM-aist/src/lib/rtm/idl/libRTCSkel.vcproj.yaml
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/idl/libRTCSkel.vcproj.yaml 2016-01-14 14:00:29 UTC (rev 2696)
+++ trunk/OpenRTM-aist/src/lib/rtm/idl/libRTCSkel.vcproj.yaml 2016-01-18 00:47:39 UTC (rev 2697)
@@ -23,10 +23,6 @@
makewrapper.py SDOPackage.idl
makewrapper.py ExtendedDataTypes.idl
makewrapper.py InterfaceDataTypes.idl
- makewrapper.py ManipulatorCommonInterface_DataTypes.idl
- makewrapper.py ManipulatorCommonInterface_Common.idl
- makewrapper.py ManipulatorCommonInterface_Middle.idl
- makewrapper.py CameraCommonInterface.idl
omniidl -bcxx -Wba -nf BasicDataType.idl
omniidl -bcxx -Wba -nf DataPort.idl
omniidl -bcxx -Wba -nf Manager.idl
@@ -35,10 +31,6 @@
omniidl -bcxx -Wba -nf SDOPackage.idl
omniidl -bcxx -Wba -nf ExtendedDataTypes.idl
omniidl -bcxx -Wba -nf InterfaceDataTypes.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_DataTypes.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Common.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Middle.idl
- omniidl -bcxx -Wba -nf CameraCommonInterface.idl

VCCLCompilerTool:
- Key: Optimization
Value: "0"
@@ -84,10 +76,6 @@
makewrapper.py SDOPackage.idl
makewrapper.py ExtendedDataTypes.idl
makewrapper.py InterfaceDataTypes.idl
- makewrapper.py ManipulatorCommonInterface_DataTypes.idl
- makewrapper.py ManipulatorCommonInterface_Common.idl
- makewrapper.py ManipulatorCommonInterface_Middle.idl
- makewrapper.py CameraCommonInterface.idl
omniidl -bcxx -Wba -nf BasicDataType.idl
omniidl -bcxx -Wba -nf DataPort.idl
omniidl -bcxx -Wba -nf Manager.idl
@@ -96,10 +84,6 @@
omniidl -bcxx -Wba -nf SDOPackage.idl
omniidl -bcxx -Wba -nf ExtendedDataTypes.idl
omniidl -bcxx -Wba -nf InterfaceDataTypes.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_DataTypes.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Common.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Middle.idl
- omniidl -bcxx -Wba -nf CameraCommonInterface.idl

VC10_VCCLCompilerTool:
- Key: Optimization
Value: "Disabled"
@@ -143,10 +127,6 @@
makewrapper.py SDOPackage.idl
makewrapper.py ExtendedDataTypes.idl
makewrapper.py InterfaceDataTypes.idl
- makewrapper.py ManipulatorCommonInterface_DataTypes.idl
- makewrapper.py ManipulatorCommonInterface_Common.idl
- makewrapper.py ManipulatorCommonInterface_Middle.idl
- makewrapper.py CameraCommonInterface.idl
omniidl -bcxx -Wba -nf BasicDataType.idl
omniidl -bcxx -Wba -nf DataPort.idl
omniidl -bcxx -Wba -nf Manager.idl
@@ -155,10 +135,6 @@
omniidl -bcxx -Wba -nf SDOPackage.idl
omniidl -bcxx -Wba -nf ExtendedDataTypes.idl
omniidl -bcxx -Wba -nf InterfaceDataTypes.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_DataTypes.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Common.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Middle.idl
- omniidl -bcxx -Wba -nf CameraCommonInterface.idl

VCCLCompilerTool:
- Key: Optimization
Value: "0"
@@ -204,10 +180,6 @@
makewrapper.py SDOPackage.idl
makewrapper.py ExtendedDataTypes.idl
makewrapper.py InterfaceDataTypes.idl
- makewrapper.py ManipulatorCommonInterface_DataTypes.idl
- makewrapper.py ManipulatorCommonInterface_Common.idl
- makewrapper.py ManipulatorCommonInterface_Middle.idl
- makewrapper.py CameraCommonInterface.idl
omniidl -bcxx -Wba -nf BasicDataType.idl
omniidl -bcxx -Wba -nf DataPort.idl
omniidl -bcxx -Wba -nf Manager.idl
@@ -216,10 +188,6 @@
omniidl -bcxx -Wba -nf SDOPackage.idl
omniidl -bcxx -Wba -nf ExtendedDataTypes.idl
omniidl -bcxx -Wba -nf InterfaceDataTypes.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_DataTypes.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Common.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Middle.idl
- omniidl -bcxx -Wba -nf CameraCommonInterface.idl

VC10_VCCLCompilerTool:
- Key: Optimization
Value: "Disabled"
@@ -264,10 +232,6 @@
makewrapper.py SDOPackage.idl
makewrapper.py ExtendedDataTypes.idl
makewrapper.py InterfaceDataTypes.idl
- makewrapper.py ManipulatorCommonInterface_DataTypes.idl
- makewrapper.py ManipulatorCommonInterface_Common.idl
- makewrapper.py ManipulatorCommonInterface_Middle.idl
- makewrapper.py CameraCommonInterface.idl
omniidl -bcxx -Wba -nf BasicDataType.idl
omniidl -bcxx -Wba -nf DataPort.idl
omniidl -bcxx -Wba -nf Manager.idl
@@ -276,10 +240,6 @@
omniidl -bcxx -Wba -nf SDOPackage.idl
omniidl -bcxx -Wba -nf ExtendedDataTypes.idl
omniidl -bcxx -Wba -nf InterfaceDataTypes.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_DataTypes.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Common.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Middle.idl
- omniidl -bcxx -Wba -nf CameraCommonInterface.idl

VCCLCompilerTool:
- Key: PreprocessorDefinitions
Value: "WIN32;NDEBUG;_LIB;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
@@ -319,10 +279,6 @@
makewrapper.py SDOPackage.idl
makewrapper.py ExtendedDataTypes.idl
makewrapper.py InterfaceDataTypes.idl
- makewrapper.py ManipulatorCommonInterface_DataTypes.idl
- makewrapper.py ManipulatorCommonInterface_Common.idl
- makewrapper.py ManipulatorCommonInterface_Middle.idl
- makewrapper.py CameraCommonInterface.idl
omniidl -bcxx -Wba -nf BasicDataType.idl
omniidl -bcxx -Wba -nf DataPort.idl
omniidl -bcxx -Wba -nf Manager.idl
@@ -331,10 +287,6 @@
omniidl -bcxx -Wba -nf SDOPackage.idl
omniidl -bcxx -Wba -nf ExtendedDataTypes.idl
omniidl -bcxx -Wba -nf InterfaceDataTypes.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_DataTypes.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Common.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Middle.idl
- omniidl -bcxx -Wba -nf CameraCommonInterface.idl

VC10_VCCLCompilerTool:
- Key: PreprocessorDefinitions
Value: "WIN32;NDEBUG;_LIB;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
@@ -373,10 +325,6 @@
makewrapper.py SDOPackage.idl
makewrapper.py ExtendedDataTypes.idl
makewrapper.py InterfaceDataTypes.idl
- makewrapper.py ManipulatorCommonInterface_DataTypes.idl
- makewrapper.py ManipulatorCommonInterface_Common.idl
- makewrapper.py ManipulatorCommonInterface_Middle.idl
- makewrapper.py CameraCommonInterface.idl
omniidl -bcxx -Wba -nf BasicDataType.idl
omniidl -bcxx -Wba -nf DataPort.idl
omniidl -bcxx -Wba -nf Manager.idl
@@ -385,10 +333,6 @@
omniidl -bcxx -Wba -nf SDOPackage.idl
omniidl -bcxx -Wba -nf ExtendedDataTypes.idl
omniidl -bcxx -Wba -nf InterfaceDataTypes.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_DataTypes.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Common.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Middle.idl
- omniidl -bcxx -Wba -nf CameraCommonInterface.idl

VCCLCompilerTool:
- Key: PreprocessorDefinitions
Value: "WIN32;NDEBUG;_LIB;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
@@ -428,10 +372,6 @@
makewrapper.py SDOPackage.idl
makewrapper.py ExtendedDataTypes.idl
makewrapper.py InterfaceDataTypes.idl
- makewrapper.py ManipulatorCommonInterface_DataTypes.idl
- makewrapper.py ManipulatorCommonInterface_Common.idl
- makewrapper.py ManipulatorCommonInterface_Middle.idl
- makewrapper.py CameraCommonInterface.idl
omniidl -bcxx -Wba -nf BasicDataType.idl
omniidl -bcxx -Wba -nf DataPort.idl
omniidl -bcxx -Wba -nf Manager.idl
@@ -440,10 +380,6 @@
omniidl -bcxx -Wba -nf SDOPackage.idl
omniidl -bcxx -Wba -nf ExtendedDataTypes.idl
omniidl -bcxx -Wba -nf InterfaceDataTypes.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_DataTypes.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Common.idl
- omniidl -bcxx -Wba -nf ManipulatorCommonInterface_Middle.idl
- omniidl -bcxx -Wba -nf CameraCommonInterface.idl

VC10_VCCLCompilerTool:
- Key: PreprocessorDefinitions
Value: "WIN32;NDEBUG;_LIB;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep 2016-01-14 14:00:29 UTC (rev 2696)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep 2016-01-18 00:47:39 UTC (rev 2697)
@@ -1,5 +1,7 @@
libcoil:
libRTC: libcoil libRTCSkel
+libManipulatorSkel: libcoil libRTCSkel libRTC
+libCameraSkel: libcoil libRTCSkel libManipulatorSkel libRTC
rtcd: libcoil libRTC
rtcprof: libcoil libRTC
ComponentObserverConsumer: libcoil libRTC
@@ -27,4 +29,4 @@
FileNameservice: libcoil libRTC
LogicalTimeTriggeredEC: libcoil libRTC
LTTSample: libcoil libRTC
-LTTSampleComp: libcoil libRTC
\ No newline at end of file
+LTTSampleComp: libcoil libRTC
More information about the openrtm-commit
mailing list