[openrtm-commit:03219] r3236 - in branches/RELENG_1_2/OpenRTM-aist: src/ext/ssl src/lib/rtm src/lib/rtm/idl win32/OpenRTM-aist
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2018年 3月 6日 (火) 10:48:03 JST
Author: miyamoto
Date: 2018-03-06 10:48:03 +0900 (Tue, 06 Mar 2018)
New Revision: 3236
Modified:
branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/idl/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/idl/libRTCSkel.vcproj.yaml
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/build.bat.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:
[build, ->trunk] Build bug fixed.
Modified: branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/Makefile.am 2018-03-05 07:52:37 UTC (rev 3235)
+++ branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/Makefile.am 2018-03-06 01:48:03 UTC (rev 3236)
@@ -68,7 +68,7 @@
--version $(RTM_VERSION) \
--out $(win32_builddir)/$(PROJNAME)Dll_vc9.vcproj \
--yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
- --source $(SSL_WIN_SRC) \
+ --source $(SSL_WIN_SRC) ; \
qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc9.vcproj
vcxproj:
@@ -80,7 +80,7 @@
--version $(RTM_VERSION) \
--out $(win32_builddir)/$(PROJNAME)Dll_vc$${ver}.vcxproj \
--yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
- --source $(SSL_WIN_SRC) \
+ --source $(SSL_WIN_SRC) ; \
qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc$${ver}.vcxproj ; \
done
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Makefile.am 2018-03-05 07:52:37 UTC (rev 3235)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Makefile.am 2018-03-06 01:48:03 UTC (rev 3236)
@@ -238,8 +238,8 @@
--version $(RTM_VERSION) \
--out $(win32_builddir)/rtm/libRTC_vc9.vcproj \
--yaml libRTC.vcproj.yaml \
- --source $(RTC_SRC) \
- --header $(rtmheader_HEADERS)
+ --source $(RTC_SRC) ../ext/sdo/observer/ComponentObserverConsumer.cpp \
+ --header $(rtmheader_HEADERS) ../ext/sdo/observer/ComponentObserverConsumer.h ; \
qkc -O- -sm $(win32_builddir)/rtm/libRTC_vc9.vcproj
vcxproj: libRTC.vcproj.yaml
@@ -250,8 +250,8 @@
--version $(RTM_VERSION) \
--out $(win32_builddir)/rtm/libRTC_vc$${ver}.vcxproj \
--yaml libRTC.vcproj.yaml \
- --source $(RTC_SRC) \
- --header $(rtmheader_HEADERS) ; \
+ --source $(RTC_SRC) ../ext/sdo/observer/ComponentObserverConsumer.cpp \
+ --header $(rtmheader_HEADERS) ../ext/sdo/observer/ComponentObserverConsumer.h ; \
qkc -O- -sm $(win32_builddir)/rtm/libRTC_vc$${ver}.vcxproj ; \
done
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/idl/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/idl/Makefile.am 2018-03-05 07:52:37 UTC (rev 3235)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/idl/Makefile.am 2018-03-06 01:48:03 UTC (rev 3236)
@@ -231,8 +231,8 @@
--version $(RTM_VERSION) \
--out $(win32_builddir)/rtm/idl/libRTCSkel_vc9.vcproj \
--yaml libRTCSkel.vcproj.yaml \
- --source $(SKEL_CPP) \
- --header $(SKEL_H)
+ --source $(SKEL_CPP) ComponentObserverSkel.cpp \
+ --header $(SKEL_H) ComponentObserverSkel.h ; \
qkc -O- -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc9.vcproj
vcxproj: libRTCSkel.vcproj.yaml
@@ -243,9 +243,9 @@
--version $(RTM_VERSION) \
--out $(win32_builddir)/rtm/idl/libRTCSkel_vc$${ver}.vcxproj \
--yaml libRTCSkel.vcproj.yaml \
- --source $(SKEL_CPP) \
- --header $(SKEL_H) ; \
- qkc -O- -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc$${ver}.vcxproj ; \
+ --source $(SKEL_CPP) ComponentObserverSkel.cpp \
+ --header $(SKEL_H) ComponentObserverSkel.h ; \
+ qkc -O- -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc$${ver}.vcxproj ;
done
dist-hook: lst vcproj
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-03-05 07:52:37 UTC (rev 3235)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/idl/libRTCSkel.vcproj.yaml 2018-03-06 01:48:03 UTC (rev 3236)
@@ -24,6 +24,7 @@
makewrapper.py ExtendedDataTypes.idl
makewrapper.py InterfaceDataTypes.idl
makewrapper.py SharedMemory.idl
+ makewrapper.py ../../ext/sdo/observer/ComponentObserver.idl
omniidl -bcxx -Wba -nf -Wbshortcut BasicDataType.idl
omniidl -bcxx -Wba -nf -Wbshortcut DataPort.idl
omniidl -bcxx -Wba -nf -Wbshortcut Manager.idl
@@ -33,6 +34,7 @@
omniidl -bcxx -Wba -nf -Wbshortcut ExtendedDataTypes.idl
omniidl -bcxx -Wba -nf -Wbshortcut InterfaceDataTypes.idl
omniidl -bcxx -Wba -nf -Wbshortcut SharedMemory.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut -I. ../../ext/sdo/observer/ComponentObserver.idl
VCCLCompilerTool:
- Key: Optimization
Value: "0"
@@ -79,6 +81,7 @@
makewrapper.py ExtendedDataTypes.idl
makewrapper.py InterfaceDataTypes.idl
makewrapper.py SharedMemory.idl
+ makewrapper.py ../../ext/sdo/observer/ComponentObserver.idl
omniidl -bcxx -Wba -nf -Wbshortcut BasicDataType.idl
omniidl -bcxx -Wba -nf -Wbshortcut DataPort.idl
omniidl -bcxx -Wba -nf -Wbshortcut Manager.idl
@@ -88,6 +91,7 @@
omniidl -bcxx -Wba -nf -Wbshortcut ExtendedDataTypes.idl
omniidl -bcxx -Wba -nf -Wbshortcut InterfaceDataTypes.idl
omniidl -bcxx -Wba -nf -Wbshortcut SharedMemory.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut -I. ../../ext/sdo/observer/ComponentObserver.idl
VC10_VCCLCompilerTool:
- Key: Optimization
Value: "Disabled"
@@ -132,6 +136,7 @@
makewrapper.py ExtendedDataTypes.idl
makewrapper.py InterfaceDataTypes.idl
makewrapper.py SharedMemory.idl
+ makewrapper.py ../../ext/sdo/observer/ComponentObserver.idl
omniidl -bcxx -Wba -nf -Wbshortcut BasicDataType.idl
omniidl -bcxx -Wba -nf -Wbshortcut DataPort.idl
omniidl -bcxx -Wba -nf -Wbshortcut Manager.idl
@@ -141,6 +146,7 @@
omniidl -bcxx -Wba -nf -Wbshortcut ExtendedDataTypes.idl
omniidl -bcxx -Wba -nf -Wbshortcut InterfaceDataTypes.idl
omniidl -bcxx -Wba -nf -Wbshortcut SharedMemory.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut -I. ../../ext/sdo/observer/ComponentObserver.idl
VCCLCompilerTool:
- Key: Optimization
Value: "0"
@@ -187,6 +193,7 @@
makewrapper.py ExtendedDataTypes.idl
makewrapper.py InterfaceDataTypes.idl
makewrapper.py SharedMemory.idl
+ makewrapper.py ../../ext/sdo/observer/ComponentObserver.idl
omniidl -bcxx -Wba -nf -Wbshortcut BasicDataType.idl
omniidl -bcxx -Wba -nf -Wbshortcut DataPort.idl
omniidl -bcxx -Wba -nf -Wbshortcut Manager.idl
@@ -196,6 +203,7 @@
omniidl -bcxx -Wba -nf -Wbshortcut ExtendedDataTypes.idl
omniidl -bcxx -Wba -nf -Wbshortcut InterfaceDataTypes.idl
omniidl -bcxx -Wba -nf -Wbshortcut SharedMemory.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut -I. ../../ext/sdo/observer/ComponentObserver.idl
VC10_VCCLCompilerTool:
- Key: Optimization
Value: "Disabled"
@@ -241,6 +249,7 @@
makewrapper.py ExtendedDataTypes.idl
makewrapper.py InterfaceDataTypes.idl
makewrapper.py SharedMemory.idl
+ makewrapper.py ../../ext/sdo/observer/ComponentObserver.idl
omniidl -bcxx -Wba -nf -Wbshortcut BasicDataType.idl
omniidl -bcxx -Wba -nf -Wbshortcut DataPort.idl
omniidl -bcxx -Wba -nf -Wbshortcut Manager.idl
@@ -250,6 +259,7 @@
omniidl -bcxx -Wba -nf -Wbshortcut ExtendedDataTypes.idl
omniidl -bcxx -Wba -nf -Wbshortcut InterfaceDataTypes.idl
omniidl -bcxx -Wba -nf -Wbshortcut SharedMemory.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut -I. ../../ext/sdo/observer/ComponentObserver.idl
VCCLCompilerTool:
- Key: PreprocessorDefinitions
Value: "WIN32;NDEBUG;_LIB;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
@@ -290,6 +300,7 @@
makewrapper.py ExtendedDataTypes.idl
makewrapper.py InterfaceDataTypes.idl
makewrapper.py SharedMemory.idl
+ makewrapper.py ../../ext/sdo/observer/ComponentObserver.idl
omniidl -bcxx -Wba -nf -Wbshortcut BasicDataType.idl
omniidl -bcxx -Wba -nf -Wbshortcut DataPort.idl
omniidl -bcxx -Wba -nf -Wbshortcut Manager.idl
@@ -299,6 +310,7 @@
omniidl -bcxx -Wba -nf -Wbshortcut ExtendedDataTypes.idl
omniidl -bcxx -Wba -nf -Wbshortcut InterfaceDataTypes.idl
omniidl -bcxx -Wba -nf -Wbshortcut SharedMemory.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut -I. ../../ext/sdo/observer/ComponentObserver.idl
VC10_VCCLCompilerTool:
- Key: PreprocessorDefinitions
Value: "WIN32;NDEBUG;_LIB;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)"
@@ -338,6 +350,7 @@
makewrapper.py ExtendedDataTypes.idl
makewrapper.py InterfaceDataTypes.idl
makewrapper.py SharedMemory.idl
+ makewrapper.py ../../ext/sdo/observer/ComponentObserver.idl
omniidl -bcxx -Wba -nf -Wbshortcut BasicDataType.idl
omniidl -bcxx -Wba -nf -Wbshortcut DataPort.idl
omniidl -bcxx -Wba -nf -Wbshortcut Manager.idl
@@ -347,6 +360,7 @@
omniidl -bcxx -Wba -nf -Wbshortcut ExtendedDataTypes.idl
omniidl -bcxx -Wba -nf -Wbshortcut InterfaceDataTypes.idl
omniidl -bcxx -Wba -nf -Wbshortcut SharedMemory.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut -I. ../../ext/sdo/observer/ComponentObserver.idl
VCCLCompilerTool:
- Key: PreprocessorDefinitions
Value: "WIN32;NDEBUG;_LIB;__WIN32__;__NT__;__OSVERSION__=4;__x86__;_WIN32_WINNT=0x0400;_CRT_SECURE_NO_DEPRECATE"
@@ -387,6 +401,7 @@
makewrapper.py ExtendedDataTypes.idl
makewrapper.py InterfaceDataTypes.idl
makewrapper.py SharedMemory.idl
+ makewrapper.py ../../ext/sdo/observer/ComponentObserver.idl
omniidl -bcxx -Wba -nf -Wbshortcut BasicDataType.idl
omniidl -bcxx -Wba -nf -Wbshortcut DataPort.idl
omniidl -bcxx -Wba -nf -Wbshortcut Manager.idl
@@ -396,6 +411,7 @@
omniidl -bcxx -Wba -nf -Wbshortcut ExtendedDataTypes.idl
omniidl -bcxx -Wba -nf -Wbshortcut InterfaceDataTypes.idl
omniidl -bcxx -Wba -nf -Wbshortcut SharedMemory.idl
+ omniidl -bcxx -Wba -nf -Wbshortcut -I. ../../ext/sdo/observer/ComponentObserver.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/win32/OpenRTM-aist/OpenRTM-aist.sln.dep
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep 2018-03-05 07:52:37 UTC (rev 3235)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep 2018-03-06 01:48:03 UTC (rev 3236)
@@ -6,6 +6,7 @@
rtcd: libcoil libRTCSkel libRTC
rtcprof: libcoil libRTCSkel libRTC
ComponentObserverConsumer: libcoil libRTCSkel libRTC
+SSLTransport: libcoil libRTCSkel libRTC
ConfigSampleComp: libcoil libRTCSkel libRTC
ConfigSample: libcoil libRTCSkel libRTC
ConsoleInComp: libcoil libRTCSkel libRTC
Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/build.bat.in
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/build.bat.in 2018-03-05 07:52:37 UTC (rev 3235)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/build.bat.in 2018-03-06 01:48:03 UTC (rev 3236)
@@ -36,6 +36,7 @@
set RTM_ROOT=%~dp0
set COIL_ROOT=%RTM_ROOT%\coil
set OMNI_ROOT=%RTM_ROOT%\omniORB
+set SSL_ROOT=%RTM_ROOT%\OpenSSL\build
if not DEFINED ARCH set ARCH=x86
if not DEFINED VC_VERSION set VC_VERSION=12
if not DEFINED PYTHON_DIR set PYTHON_DIR=c:\python27
@@ -54,6 +55,7 @@
echo OMNI_VERSION : %OMNI_VERSION%
echo OMNITHREAD_VERSION : %OMNITHREAD_VERSION%
+
set PATH_ORG=%PATH%
set PATH=%PATH%;C:\cygwin\bin;C:\cygwin64\bin
set PATH=%OMNI_ROOT%\bin\x86_win32;%PATH%
@@ -77,6 +79,7 @@
set OMNI_DLLVER=%OMNI_VERSION:.=%
set OMNI_SHORTVER=%OMNI_VERSION:~0,3%
set OMNITHREAD_DLLVER=%OMNITHREAD_VERSION:.=%
+set OMNISSL_DLLVER=%OMNITHREAD_VERSION:~0,1%
%PYTHON_DIR%\python build\cmakeconfgen.py rtm_config.vsprops
move OpenRTMConfig.cmake cmake
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-03-05 07:52:37 UTC (rev 3235)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props 2018-03-06 01:48:03 UTC (rev 3236)
@@ -4,6 +4,7 @@
<omni_version>$(OMNI_VERSION)</omni_version>
<omni_dllver>$(OMNI_DLLVER)</omni_dllver>
<omnithread_dllver>$(OMNITHREAD_DLLVER)</omnithread_dllver>
+ <omnissl_dllver>$(OMNISSL_DLLVER)</omnissl_dllver>
<rtm_dllver>$(RTM_DLLVER)</rtm_dllver>
<rtm_version>$(RTM_VERSION)</rtm_version>
<rtm_shortver>$(RTM_SHORTVER)</rtm_shortver>
@@ -17,9 +18,9 @@
<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;omnisslTP$(omnithread_dllver)_rt.lib</omni_lib>
- <omni_libd>omniORB$(omni_dllver)_rtd.lib;omniDynamic$(omni_dllver)_rtd.lib;omnithread$(omnithread_dllver)_rtd.lib;omnisslTP$(omnithread_dllver)_rtd.lib</omni_libd>
- <rtm_includes>$(rtm_root);$(rtm_root)\rtm\idl;$(rtm_root)\rtm\ext</rtm_includes>
+ <omni_lib>omniORB$(omni_dllver)_rt.lib;omniDynamic$(omni_dllver)_rt.lib;omnithread$(omnithread_dllver)_rt.lib;omnisslTP$(omnissl_dllver)_rt.lib</omni_lib>
+ <omni_libd>omniORB$(omni_dllver)_rtd.lib;omniDynamic$(omni_dllver)_rtd.lib;omnithread$(omnithread_dllver)_rtd.lib;omnisslTP$(omnissl_dllver)_rtd.lib</omni_libd>
+ <rtm_includes>$(rtm_root);$(rtm_root)\rtm\idl;$(rtm_root)\rtm\ext;$(rtm_root)\rtm</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>
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-03-05 07:52:37 UTC (rev 3235)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops 2018-03-06 01:48:03 UTC (rev 3236)
@@ -14,7 +14,7 @@
AdditionalLibraryDirectories="$(omni_libdir);$(rtm_libdir)"
/>
<UserMacro
- Name="ss;_root"
+ Name="ssl_root"
Value="%SSL_ROOT%"
/>
<UserMacro
@@ -34,6 +34,10 @@
Value="%OMNITHREAD_DLLVER%"
/>
<UserMacro
+ Name="omnissl_dllver"
+ Value="%OMNISSL_DLLVER%"
+ />
+ <UserMacro
Name="rtm_root"
Value="%RTM_ROOT%"
/>
More information about the openrtm-commit
mailing list