[openrtm-commit:03085] r3171 - in branches/RELENG_1_2/OpenRTM-aist: . build docs/DevelopersGuide src/lib/rtm/idl utils/rtc-template win32/OpenRTM-aist win32/OpenRTM-aist/examples/SimpleService win32/OpenRTM-aist/rtm/idl
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2018年 1月 19日 (金) 17:13:12 JST
Author: miyamoto
Date: 2018-01-19 17:13:12 +0900 (Fri, 19 Jan 2018)
New Revision: 3171
Modified:
branches/RELENG_1_2/OpenRTM-aist/build/cmakeconfgen.py
branches/RELENG_1_2/OpenRTM-aist/build/vcprojtool.py
branches/RELENG_1_2/OpenRTM-aist/configure.ac
branches/RELENG_1_2/OpenRTM-aist/docs/DevelopersGuide/Tools.tex
branches/RELENG_1_2/OpenRTM-aist/docs/DevelopersGuide/Tutorial.tex
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/idl/libRTCSkel.vcproj.yaml
branches/RELENG_1_2/OpenRTM-aist/utils/rtc-template/test-template.py
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/SimpleService/MyServiceConsumervc8.vcproj.in
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/SimpleService/MyServiceProvidervc8.vcproj.in
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/rtm/idl/libRTCSkelvc8.vcproj.in
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops
Log:
[compat,->RELENG_1_2] refs #3441
Modified: branches/RELENG_1_2/OpenRTM-aist/build/cmakeconfgen.py
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/build/cmakeconfgen.py 2018-01-19 07:53:14 UTC (rev 3170)
+++ branches/RELENG_1_2/OpenRTM-aist/build/cmakeconfgen.py 2018-01-19 08:13:12 UTC (rev 3171)
@@ -249,7 +249,7 @@
dict["openrtm_idl_wrapper"] = "rtm-skelwrapper.py"
dict["openrtm_idl_wrapper_flags"] = '--include-dir="";--skel-suffix=Skel;--stub-suffix=Stub'
dict["openrtm_idlc"] = "omniidl"
- dict["openrtm_idlflags"] = "-bcxx;-Wba;-nf;-I${OPENRTM_DIR}/rtm/idl"
+ dict["openrtm_idlflags"] = "-bcxx;-Wba;-nf;-Wbshortcut;-I${OPENRTM_DIR}/rtm/idl"
t = yat.Template(template)
f = file("OpenRTMConfig.cmake", "w")
Modified: branches/RELENG_1_2/OpenRTM-aist/build/vcprojtool.py
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/build/vcprojtool.py 2018-01-19 07:53:14 UTC (rev 3170)
+++ branches/RELENG_1_2/OpenRTM-aist/build/vcprojtool.py 2018-01-19 08:13:12 UTC (rev 3171)
@@ -492,7 +492,7 @@
Value: |
set PATH=$(rtm_path);%PYTHON_ROOT%\\\\;%PATH%
for %%x in (*.idl) do makewrapper.py %%x
- for %%x in (*.idl) do omniidl -bcxx -Wba -nf %%x
+ for %%x in (*.idl) do omniidl -bcxx -Wba -nf -Wbshortcut %%x
# VCCustomBuildTool:
# VCXMLDataGeneratorTool:
# VCWebServiceProxyGeneratorTool:
@@ -544,7 +544,7 @@
Value: |
set PATH=$(rtm_path);%PYTHON_ROOT%\\\\;%PATH%
for %%x in (*.idl) do makewrapper.py %%x
- for %%x in (*.idl) do omniidl -bcxx -Wba -nf %%x
+ for %%x in (*.idl) do omniidl -bcxx -Wba -nf -Wbshortcut %%x
# VCCustomBuildTool:
# VCXMLDataGeneratorTool:
# VCWebServiceProxyGeneratorTool:
Modified: branches/RELENG_1_2/OpenRTM-aist/configure.ac
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/configure.ac 2018-01-19 07:53:14 UTC (rev 3170)
+++ branches/RELENG_1_2/OpenRTM-aist/configure.ac 2018-01-19 08:13:12 UTC (rev 3171)
@@ -1043,7 +1043,7 @@
PATH_NORM($omniidl)
omniidl=$n_path
IDLC=$omniidl
- IDL_FLAGS="-bcxx -Wba -nf -Wbuse_quotes"
+ IDL_FLAGS="-bcxx -Wba -nf -Wbuse_quotes -Wbshortcut"
dnl omniNames
PATH_NORM($omniNames)
Modified: branches/RELENG_1_2/OpenRTM-aist/docs/DevelopersGuide/Tools.tex
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/docs/DevelopersGuide/Tools.tex 2018-01-19 07:53:14 UTC (rev 3170)
+++ branches/RELENG_1_2/OpenRTM-aist/docs/DevelopersGuide/Tools.tex 2018-01-19 08:13:12 UTC (rev 3171)
@@ -796,7 +796,7 @@
\begin{cmd}
\begin{verbatim}
> ./rtm-config --idlflags
--bcxx -Wba -nf
+-bcxx -Wba -nf -Wbshortcut
\end{verbatim}
\end{cmd}
Modified: branches/RELENG_1_2/OpenRTM-aist/docs/DevelopersGuide/Tutorial.tex
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/docs/DevelopersGuide/Tutorial.tex 2018-01-19 07:53:14 UTC (rev 3170)
+++ branches/RELENG_1_2/OpenRTM-aist/docs/DevelopersGuide/Tutorial.tex 2018-01-19 08:13:12 UTC (rev 3171)
@@ -218,7 +218,7 @@
ORB: omniORB
IDLC: /usr/local/bin/../bin/omniidl
-IDL_FLAGS: -bcxx -Wba -nf
+IDL_FLAGS: -bcxx -Wba -nf -Wbshortcut
WRAPPERS:
------------------------------------------------------------
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/idl/libRTCSkel.vcproj.yaml
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/idl/libRTCSkel.vcproj.yaml 2018-01-19 07:53:14 UTC (rev 3170)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/idl/libRTCSkel.vcproj.yaml 2018-01-19 08:13:12 UTC (rev 3171)
@@ -24,15 +24,15 @@
makewrapper.py ExtendedDataTypes.idl
makewrapper.py InterfaceDataTypes.idl
makewrapper.py SharedMemory.idl
- omniidl -bcxx -Wba -nf BasicDataType.idl
- omniidl -bcxx -Wba -nf DataPort.idl
- omniidl -bcxx -Wba -nf Manager.idl
- omniidl -bcxx -Wba -nf OpenRTM.idl
- omniidl -bcxx -Wba -nf RTC.idl
- omniidl -bcxx -Wba -nf SDOPackage.idl
- omniidl -bcxx -Wba -nf ExtendedDataTypes.idl
- omniidl -bcxx -Wba -nf InterfaceDataTypes.idl
- omniidl -bcxx -Wba -nf SharedMemory.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut BasicDataType.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut DataPort.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut Manager.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut OpenRTM.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut RTC.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut SDOPackage.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut ExtendedDataTypes.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut InterfaceDataTypes.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut SharedMemory.idl
VCCLCompilerTool:
- Key: Optimization
Value: "0"
@@ -79,15 +79,15 @@
makewrapper.py ExtendedDataTypes.idl
makewrapper.py InterfaceDataTypes.idl
makewrapper.py SharedMemory.idl
- omniidl -bcxx -Wba -nf BasicDataType.idl
- omniidl -bcxx -Wba -nf DataPort.idl
- omniidl -bcxx -Wba -nf Manager.idl
- omniidl -bcxx -Wba -nf OpenRTM.idl
- omniidl -bcxx -Wba -nf RTC.idl
- omniidl -bcxx -Wba -nf SDOPackage.idl
- omniidl -bcxx -Wba -nf ExtendedDataTypes.idl
- omniidl -bcxx -Wba -nf InterfaceDataTypes.idl
- omniidl -bcxx -Wba -nf SharedMemory.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut BasicDataType.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut DataPort.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut Manager.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut OpenRTM.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut RTC.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut SDOPackage.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut ExtendedDataTypes.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut InterfaceDataTypes.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut SharedMemory.idl
VC10_VCCLCompilerTool:
- Key: Optimization
Value: "Disabled"
@@ -132,15 +132,15 @@
makewrapper.py ExtendedDataTypes.idl
makewrapper.py InterfaceDataTypes.idl
makewrapper.py SharedMemory.idl
- omniidl -bcxx -Wba -nf BasicDataType.idl
- omniidl -bcxx -Wba -nf DataPort.idl
- omniidl -bcxx -Wba -nf Manager.idl
- omniidl -bcxx -Wba -nf OpenRTM.idl
- omniidl -bcxx -Wba -nf RTC.idl
- omniidl -bcxx -Wba -nf SDOPackage.idl
- omniidl -bcxx -Wba -nf ExtendedDataTypes.idl
- omniidl -bcxx -Wba -nf InterfaceDataTypes.idl
- omniidl -bcxx -Wba -nf SharedMemory.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut BasicDataType.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut DataPort.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut Manager.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut OpenRTM.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut RTC.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut SDOPackage.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut ExtendedDataTypes.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut InterfaceDataTypes.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut SharedMemory.idl
VCCLCompilerTool:
- Key: Optimization
Value: "0"
@@ -187,15 +187,15 @@
makewrapper.py ExtendedDataTypes.idl
makewrapper.py InterfaceDataTypes.idl
makewrapper.py SharedMemory.idl
- omniidl -bcxx -Wba -nf BasicDataType.idl
- omniidl -bcxx -Wba -nf DataPort.idl
- omniidl -bcxx -Wba -nf Manager.idl
- omniidl -bcxx -Wba -nf OpenRTM.idl
- omniidl -bcxx -Wba -nf RTC.idl
- omniidl -bcxx -Wba -nf SDOPackage.idl
- omniidl -bcxx -Wba -nf ExtendedDataTypes.idl
- omniidl -bcxx -Wba -nf InterfaceDataTypes.idl
- omniidl -bcxx -Wba -nf SharedMemory.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut BasicDataType.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut DataPort.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut Manager.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut OpenRTM.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut RTC.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut SDOPackage.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut ExtendedDataTypes.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut InterfaceDataTypes.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut SharedMemory.idl
VC10_VCCLCompilerTool:
- Key: Optimization
Value: "Disabled"
@@ -241,15 +241,15 @@
makewrapper.py ExtendedDataTypes.idl
makewrapper.py InterfaceDataTypes.idl
makewrapper.py SharedMemory.idl
- omniidl -bcxx -Wba -nf BasicDataType.idl
- omniidl -bcxx -Wba -nf DataPort.idl
- omniidl -bcxx -Wba -nf Manager.idl
- omniidl -bcxx -Wba -nf OpenRTM.idl
- omniidl -bcxx -Wba -nf RTC.idl
- omniidl -bcxx -Wba -nf SDOPackage.idl
- omniidl -bcxx -Wba -nf ExtendedDataTypes.idl
- omniidl -bcxx -Wba -nf InterfaceDataTypes.idl
- omniidl -bcxx -Wba -nf SharedMemory.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut BasicDataType.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut DataPort.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut Manager.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut OpenRTM.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut RTC.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut SDOPackage.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut ExtendedDataTypes.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut InterfaceDataTypes.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut SharedMemory.idl
VCCLCompilerTool:
- Key: PreprocessorDefinitions
Value: "WIN32;NDEBUG;_LIB;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
@@ -290,15 +290,15 @@
makewrapper.py ExtendedDataTypes.idl
makewrapper.py InterfaceDataTypes.idl
makewrapper.py SharedMemory.idl
- omniidl -bcxx -Wba -nf BasicDataType.idl
- omniidl -bcxx -Wba -nf DataPort.idl
- omniidl -bcxx -Wba -nf Manager.idl
- omniidl -bcxx -Wba -nf OpenRTM.idl
- omniidl -bcxx -Wba -nf RTC.idl
- omniidl -bcxx -Wba -nf SDOPackage.idl
- omniidl -bcxx -Wba -nf ExtendedDataTypes.idl
- omniidl -bcxx -Wba -nf InterfaceDataTypes.idl
- omniidl -bcxx -Wba -nf SharedMemory.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut BasicDataType.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut DataPort.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut Manager.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut OpenRTM.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut RTC.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut SDOPackage.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut ExtendedDataTypes.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut InterfaceDataTypes.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut SharedMemory.idl
VC10_VCCLCompilerTool:
- Key: PreprocessorDefinitions
Value: "WIN32;NDEBUG;_LIB;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
@@ -338,15 +338,15 @@
makewrapper.py ExtendedDataTypes.idl
makewrapper.py InterfaceDataTypes.idl
makewrapper.py SharedMemory.idl
- omniidl -bcxx -Wba -nf BasicDataType.idl
- omniidl -bcxx -Wba -nf DataPort.idl
- omniidl -bcxx -Wba -nf Manager.idl
- omniidl -bcxx -Wba -nf OpenRTM.idl
- omniidl -bcxx -Wba -nf RTC.idl
- omniidl -bcxx -Wba -nf SDOPackage.idl
- omniidl -bcxx -Wba -nf ExtendedDataTypes.idl
- omniidl -bcxx -Wba -nf InterfaceDataTypes.idl
- omniidl -bcxx -Wba -nf SharedMemory.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut BasicDataType.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut DataPort.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut Manager.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut OpenRTM.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut RTC.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut SDOPackage.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut ExtendedDataTypes.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut InterfaceDataTypes.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut SharedMemory.idl
VCCLCompilerTool:
- Key: PreprocessorDefinitions
Value: "WIN32;NDEBUG;_LIB;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
@@ -387,15 +387,15 @@
makewrapper.py ExtendedDataTypes.idl
makewrapper.py InterfaceDataTypes.idl
makewrapper.py SharedMemory.idl
- omniidl -bcxx -Wba -nf BasicDataType.idl
- omniidl -bcxx -Wba -nf DataPort.idl
- omniidl -bcxx -Wba -nf Manager.idl
- omniidl -bcxx -Wba -nf OpenRTM.idl
- omniidl -bcxx -Wba -nf RTC.idl
- omniidl -bcxx -Wba -nf SDOPackage.idl
- omniidl -bcxx -Wba -nf ExtendedDataTypes.idl
- omniidl -bcxx -Wba -nf InterfaceDataTypes.idl
- omniidl -bcxx -Wba -nf SharedMemory.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut BasicDataType.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut DataPort.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut Manager.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut OpenRTM.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut RTC.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut SDOPackage.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut ExtendedDataTypes.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut InterfaceDataTypes.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut SharedMemory.idl
VC10_VCCLCompilerTool:
- Key: PreprocessorDefinitions
Value: "WIN32;NDEBUG;_LIB;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
Modified: branches/RELENG_1_2/OpenRTM-aist/utils/rtc-template/test-template.py
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/utils/rtc-template/test-template.py 2018-01-19 07:53:14 UTC (rev 3170)
+++ branches/RELENG_1_2/OpenRTM-aist/utils/rtc-template/test-template.py 2018-01-19 08:13:12 UTC (rev 3171)
@@ -258,7 +258,7 @@
rtm_version="1.0.0"
rtm_orb="omniORB"
rtm_idlc="omniidl"
-rtm_idlflags="-bcxx -Wba -nf"
+rtm_idlflags="-bcxx -Wba -nf -Wbshortcut"
usage()
{
Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/SimpleService/MyServiceConsumervc8.vcproj.in
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/SimpleService/MyServiceConsumervc8.vcproj.in 2018-01-19 07:53:14 UTC (rev 3170)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/SimpleService/MyServiceConsumervc8.vcproj.in 2018-01-19 08:13:12 UTC (rev 3171)
@@ -25,7 +25,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="REM @echo off
set PATH=$(rtm_path);%PYTHON_ROOT%\;%PATH%
echo %PATH%
for %%x in (*.idl) do omniidl -bcxx -Wba -nf %%x
for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x

"
+ CommandLine="REM @echo off
set PATH=$(rtm_path);%PYTHON_ROOT%\;%PATH%
echo %PATH%
for %%x in (*.idl) do omniidl -bcxx -Wba -nf -Wbshortcut %%x
for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x

"
/>
<Tool
Name="VCCustomBuildTool"
@@ -106,7 +106,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="REM @echo off
set PATH=$(rtm_path);%PYTHON_ROOT%\;%PATH%
echo %PATH%
for %%x in (*.idl) do omniidl -bcxx -Wba -nf %%x
for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x

"
+ CommandLine="REM @echo off
set PATH=$(rtm_path);%PYTHON_ROOT%\;%PATH%
echo %PATH%
for %%x in (*.idl) do omniidl -bcxx -Wba -nf -Wbshortcut %%x
for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x

"
/>
<Tool
Name="VCCustomBuildTool"
Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/SimpleService/MyServiceProvidervc8.vcproj.in
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/SimpleService/MyServiceProvidervc8.vcproj.in 2018-01-19 07:53:14 UTC (rev 3170)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/SimpleService/MyServiceProvidervc8.vcproj.in 2018-01-19 08:13:12 UTC (rev 3171)
@@ -25,7 +25,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="REM @echo off
set PATH=$(rtm_path);%PYTHON_ROOT%\;%PATH%
echo %PATH%
for %%x in (*.idl) do omniidl -bcxx -Wba -nf %%x
for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x

"
+ CommandLine="REM @echo off
set PATH=$(rtm_path);%PYTHON_ROOT%\;%PATH%
echo %PATH%
for %%x in (*.idl) do omniidl -bcxx -Wba -nf -Wbshortcut %%x
for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x

"
/>
<Tool
Name="VCCustomBuildTool"
@@ -105,7 +105,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="REM @echo off
set PATH=$(rtm_path);%PYTHON_ROOT%\;%PATH%
echo %PATH%
for %%x in (*.idl) do omniidl -bcxx -Wba -nf %%x
for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x

"
+ CommandLine="REM @echo off
set PATH=$(rtm_path);%PYTHON_ROOT%\;%PATH%
echo %PATH%
for %%x in (*.idl) do omniidl -bcxx -Wba -nf -Wbshortcut %%x
for %%x in (*.idl) do rtm-skelwrapper.py --include-dir="" --skel-suffix=Skel --stub-suffix=Stub --idl-file=%%x

"
/>
<Tool
Name="VCCustomBuildTool"
Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/rtm/idl/libRTCSkelvc8.vcproj.in
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/rtm/idl/libRTCSkelvc8.vcproj.in 2018-01-19 07:53:14 UTC (rev 3170)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/rtm/idl/libRTCSkelvc8.vcproj.in 2018-01-19 08:13:12 UTC (rev 3171)
@@ -26,7 +26,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="REM @echo off

set PATH=$(rtm_path);%PYTHON_ROOT%\;%PATH%

REM del /F/Q *.cpp *.cc *.c *.h *.hh *.obj

for %%x in (*.idl) do makewrapper.py %%x

for %%x in (*.idl) do omniidl -bcxx -Wba -nf %%x


"
+ CommandLine="REM @echo off

set PATH=$(rtm_path);%PYTHON_ROOT%\;%PATH%

REM del /F/Q *.cpp *.cc *.c *.h *.hh *.obj

for %%x in (*.idl) do makewrapper.py %%x

for %%x in (*.idl) do omniidl -bcxx -Wba -nf -Wbshortcut %%x


"
/>
<Tool
Name="VCCustomBuildTool"
@@ -94,7 +94,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="REM @echo off

set PATH=$(rtm_path);%PYTHON_ROOT%\;%PATH%

REM del /F/Q *.cpp *.cc *.c *.h *.hh *.obj

for %%x in (*.idl) do makewrapper.py %%x

for %%x in (*.idl) do omniidl -bcxx -Wba -nf %%x


"
+ CommandLine="REM @echo off

set PATH=$(rtm_path);%PYTHON_ROOT%\;%PATH%

REM del /F/Q *.cpp *.cc *.c *.h *.hh *.obj

for %%x in (*.idl) do makewrapper.py %%x

for %%x in (*.idl) do omniidl -bcxx -Wba -nf -Wbshortcut %%x


"
/>
<Tool
Name="VCCustomBuildTool"
Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props 2018-01-19 07:53:14 UTC (rev 3170)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props 2018-01-19 08:13:12 UTC (rev 3171)
@@ -24,7 +24,7 @@
<rtm_ext_libd>$(rtm_ext_libd)</rtm_ext_libd>
<rtm_ext_lib>$(rtm_ext_lib)</rtm_ext_lib>
<rtm_idlc>omniidl</rtm_idlc>
- <rtm_idlflags>-bcxx -Wba -nf -I $(SolutionDir)\rtm\idl</rtm_idlflags>
+ <rtm_idlflags>-bcxx -Wba -nf -Wbshortcut -I $(SolutionDir)\rtm\idl</rtm_idlflags>
</PropertyGroup>
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops 2018-01-19 07:53:14 UTC (rev 3170)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops 2018-01-19 08:13:12 UTC (rev 3171)
@@ -109,7 +109,7 @@
/>
<UserMacro
Name="rtm_idlflags"
- Value="-bcxx -Wba -nf -I"$(SolutionDir)\rtm\idl""
+ Value="-bcxx -Wba -nf -Wbshortcut -I"$(SolutionDir)\rtm\idl""
/>
<!-- coil macros -->
<UserMacro
More information about the openrtm-commit
mailing list