[openrtm-commit:03133] r3201 - in branches/RELENG_1_2/OpenRTM-aist: . src/ext src/ext/ssl src/lib/rtm win32/OpenRTM-aist win32/OpenRTM-aist/ext win32/OpenRTM-aist/ext/ssl
openrtm @ openrtm.org
openrtm @ openrtm.org
2018年 1月 24日 (水) 12:20:38 JST
Author: miyamoto
Date: 2018-01-24 12:20:38 +0900 (Wed, 24 Jan 2018)
New Revision: 3201
Added:
branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/ssl/
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/ssl/Makefile.am
Modified:
branches/RELENG_1_2/OpenRTM-aist/configure.ac
branches/RELENG_1_2/OpenRTM-aist/src/ext/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/DirectInPortBase.h
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/DirectOutPortBase.h
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/DirectPortBase.h
branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/Makefile.am
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 #3265
Modified: branches/RELENG_1_2/OpenRTM-aist/configure.ac
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/configure.ac 2018-01-24 03:04:18 UTC (rev 3200)
+++ branches/RELENG_1_2/OpenRTM-aist/configure.ac 2018-01-24 03:20:38 UTC (rev 3201)
@@ -1522,6 +1522,7 @@
rtm_rtmdir=$rtm_libdir"/rtm"
rtm_svcdir=$rtm_libdir"/svc"
rtm_sdodir=$rtm_libdir"/sdo"
+rtm_ssldir=$rtm_libdir"/ssl"
rtm_cxx_docdir=$rtm_datadir"/doc/c++"
rtm_idl_docdir=$rtm_datadir"/doc/idl"
rtm_exampledir=$rtm_datadir"/components/c++/examples"
@@ -1537,6 +1538,7 @@
AC_SUBST(rtm_rtmdir)
AC_SUBST(rtm_svcdir)
AC_SUBST(rtm_sdodir)
+AC_SUBST(rtm_ssldir)
AC_SUBST(rtm_cxx_docdir)
AC_SUBST(rtm_idl_docdir)
AC_SUBST(rtm_exampledir)
@@ -1673,6 +1675,7 @@
src/ext/local_service/nameservice_file/Makefile
src/ext/logger/Makefile
src/ext/logger/fluentbit_stream/Makefile
+ src/ext/ssl/Makefile
utils/Makefile
utils/rtm-config/Makefile
utils/cmake/Makefile
@@ -1723,6 +1726,7 @@
win32/OpenRTM-aist/ext/sdo/Makefile
win32/OpenRTM-aist/ext/sdo/logger/Makefile
win32/OpenRTM-aist/ext/sdo/observer/Makefile
+ win32/OpenRTM-aist/ext/ssl/Makefile
win32/OpenRTM-aist/utils/Makefile
win32/OpenRTM-aist/utils/rtc-template/Makefile
win32/OpenRTM-aist/utils/rtcd/Makefile
Modified: branches/RELENG_1_2/OpenRTM-aist/src/ext/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/ext/Makefile.am 2018-01-24 03:04:18 UTC (rev 3200)
+++ branches/RELENG_1_2/OpenRTM-aist/src/ext/Makefile.am 2018-01-24 03:20:38 UTC (rev 3201)
@@ -7,6 +7,6 @@
AUTOMAKE_OPTIONS = 1.4
-SUBDIRS = local_service ec sdo
-DIST_SUBDIRS = local_service ec sdo logger
+SUBDIRS = local_service ec sdo ssl
+DIST_SUBDIRS = local_service ec sdo logger ssl
Added: branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/Makefile.am (rev 0)
+++ branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/Makefile.am 2018-01-24 03:20:38 UTC (rev 3201)
@@ -0,0 +1,97 @@
+## -*- Makefile -*-
+##---------------------------------------------------------------------------
+## Makefile.am for external libraries
+##
+## $Id$
+##---------------------------------------------------------------------------
+
+AUTOMAKE_OPTIONS = 1.4
+
+AM_CPPFLAGS= \
+ -I$(top_srcdir)/src/lib \
+ -I$(top_srcdir)/src/lib/coil/include \
+ -I$(top_srcdir)/src/lib/rtm/idl
+
+AM_LDFLAGS= \
+ -L$(top_builddir) \
+ -L$(top_builddir)/src/lib/rtm \
+ -L$(top_builddir)/src/lib/rtm/idl
+
+
+SSL_SRC = SSLTransport.cpp
+SSL_WIN_SRC = SSLTransport.cpp
+
+SSL_H =
+SSL_WIN_H =
+
+#------------------------------------------------------------
+# Targets
+#------------------------------------------------------------
+# Targets directories
+socompdir = $(rtm_ssldir)
+
+socomp_LTLIBRARIES = SSLTransport.la
+
+
+
+SSLTransport_la_SOURCES = $(SSL_SRC)
+SSLTransport_la_LDFLAGS = -module -shared
+SSLTransport_la_LIBADD = \
+ $(top_builddir)/src/lib/rtm/libRTC.la \
+ $(top_builddir)/src/lib/coil/lib/libcoil.la
+
+clean-local:
+ rm -rf *~ *.o *.so
+
+
+
+#------------------------------------------------------------
+# File list for deb/ports packages
+#------------------------------------------------------------
+lst:
+ echo $(ALL_SRC) > src.lst
+ echo $(EXTRA_DIST) > other.lst
+
+#------------------------------------------------------------
+# Visual Studio Project
+#------------------------------------------------------------
+win32_builddir=$(top_builddir)/win32/OpenRTM-aist/ext/ssl
+PROJNAME=SSLTransport
+
+vcproj: vc9proj vcxproj
+
+vc9proj:
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --type DLL \
+ --vcversion "9.00" \
+ --projectname "$(PROJNAME)" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/$(PROJNAME)Dll_vc9.vcproj \
+ --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
+ --source $(SSL_WIN_SRC) \
+ qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc9.vcproj
+
+vcxproj:
+ for ver in $(VC_VERSION); do \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "$${ver}.00" \
+ --projectname "$(PROJNAME)" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/$(PROJNAME)Dll_vc$${ver}.vcxproj \
+ --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
+ --source $(SSL_WIN_SRC) \
+ qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc$${ver}.vcxproj ; \
+ done
+
+dist-hook: lst vcproj
+
+
+clean_objs:
+ rm -f $(OBJS)
+
+
+clean-local: clean_objs clean_skelstub
+ rm -f *.bak *.rpo *.sym lib*.*_pure_*
+ rm -f *.lst *core *~ *loT *.log
+ rm -f Makefile.old
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/DirectInPortBase.h
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/DirectInPortBase.h 2018-01-24 03:04:18 UTC (rev 3200)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/DirectInPortBase.h 2018-01-24 03:20:38 UTC (rev 3201)
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- C++ -*-
/*!
* @file DirectInPortBase.h
* @brief DirectInPortBase class
@@ -29,7 +29,7 @@
/*!
* @if jp
* @class DirectInPortBase
- * @brief direct接続用InPort基底クラス
+ * @brief directÀܳÍÑInPort´ðÄ쥯¥é¥¹
*
*
* @since 1.2.0
@@ -50,7 +50,7 @@
public:
/*!
* @if jp
- * @brief コンストラクタ
+ * @brief ¥³¥ó¥¹¥È¥é¥¯¥¿
*
* @param value
*
@@ -67,7 +67,7 @@
/*!
* @if jp
- * @brief デストラクタ
+ * @brief ¥Ç¥¹¥È¥é¥¯¥¿
*
*
* @else
@@ -84,14 +84,14 @@
/*!
* @if jp
*
- * @brief 最新データが存在するか確認する
+ * @brief ºÇ¿·¥Ç¡¼¥¿¤¬Â¸ºß¤¹¤ë¤«³Îǧ¤¹¤ë
*
- * InPortに未読の最新データが到着しているかをbool値で返す。
- * InPortが未接続の場合、および接続コネクタのバッファがEmpty
- * の場合にはfalseを返す。
+ * InPort¤Ë̤Æɤκǿ·¥Ç¡¼¥¿¤¬ÅþÃ夷¤Æ¤¤¤ë¤«¤òboolÃͤÇÊÖ¤¹¡£
+ * InPort¤¬Ì¤Àܳ¤Î¾ì¹ç¡¢¤ª¤è¤ÓÀܳ¥³¥Í¥¯¥¿¤Î¥Ð¥Ã¥Õ¥¡¤¬Empty
+ * ¤Î¾ì¹ç¤Ë¤Ïfalse¤òÊÖ¤¹¡£
*
- * @return true 未読の最新データが存在する
- * false 未接続またはバッファにデータが存在しない。
+ * @return true ̤Æɤκǿ·¥Ç¡¼¥¿¤¬Â¸ºß¤¹¤ë
+ * false ̤Àܳ¤Þ¤¿¤Ï¥Ð¥Ã¥Õ¥¡¤Ë¥Ç¡¼¥¿¤¬Â¸ºß¤·¤Ê¤¤¡£
*
* @else
*
@@ -101,7 +101,7 @@
*
* @return Newest data check result
* ( true:Newest data. Data has not been readout yet.
- * false:Past data.Data has already been readout.)
+ * false:Past data¡¥Data has already been readout.)
*
* @endif
*/
@@ -113,13 +113,13 @@
/*!
* @if jp
*
- * @brief バッファが空かどうか確認する
+ * @brief ¥Ð¥Ã¥Õ¥¡¤¬¶õ¤«¤É¤¦¤«³Îǧ¤¹¤ë
*
- * InPortのバッファが空かどうかを bool 値で返す。
- * 空の場合は true, 未読データがある場合は false を返す。
+ * InPort¤Î¥Ð¥Ã¥Õ¥¡¤¬¶õ¤«¤É¤¦¤«¤ò bool ÃͤÇÊÖ¤¹¡£
+ * ¶õ¤Î¾ì¹ç¤Ï true, ̤Æɥǡ¼¥¿¤¬¤¢¤ë¾ì¹ç¤Ï false ¤òÊÖ¤¹¡£
*
- * @return true バッファは空
- * false バッファに未読データがある
+ * @return true ¥Ð¥Ã¥Õ¥¡¤Ï¶õ
+ * false ¥Ð¥Ã¥Õ¥¡¤Ë̤Æɥǡ¼¥¿¤¬¤¢¤ë
*
* @else
*
@@ -129,7 +129,7 @@
*
* @return Newest data check result
* ( true:Newest data. Data has not been readout yet.
- * false:Past data.Data has already been readout.)
+ * false:Past data¡¥Data has already been readout.)
*
* @endif
*/
@@ -140,9 +140,9 @@
/*!
* @if jp
- * @brief データの書き込み
+ * @brief ¥Ç¡¼¥¿¤Î½ñ¤¹þ¤ß
*
- * @param data データ
+ * @param data ¥Ç¡¼¥¿
*
* @else
* @brief
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/DirectOutPortBase.h
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/DirectOutPortBase.h 2018-01-24 03:04:18 UTC (rev 3200)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/DirectOutPortBase.h 2018-01-24 03:20:38 UTC (rev 3201)
@@ -29,7 +29,7 @@
/*!
* @if jp
* @class DirectOutPortBase
- * @brief directÚ±pOutPortîêNX
+ * @brief directÀܳÍÑOutPort´ðÄ쥯¥é¥¹
*
*
* @since 1.2.0
@@ -51,7 +51,7 @@
public:
/*!
* @if jp
- * @brief RXgN^
+ * @brief ¥³¥ó¥¹¥È¥é¥¯¥¿
*
* @param value
*
@@ -67,7 +67,7 @@
}
/*!
* @if jp
- * @brief fXgN^
+ * @brief ¥Ç¥¹¥È¥é¥¯¥¿
*
*
* @else
@@ -81,9 +81,9 @@
}
/*!
* @if jp
- * @brief f[^Ìæ¾
+ * @brief ¥Ç¡¼¥¿¤Î¼èÆÀ
*
- * @param data f[^ði[·éÏ
+ * @param data ¥Ç¡¼¥¿¤ò³ÊǼ¤¹¤ëÊÑ¿ô
*
* @else
* @brief
@@ -97,9 +97,9 @@
}
/*!
* @if jp
- * @brief VKf[^̶ÝmF
+ * @brief ¿·µ¬¥Ç¡¼¥¿¤Î¸ºß³Îǧ
*
- * @return trueFVKf[^ è
+ * @return true¡§¿·µ¬¥Ç¡¼¥¿¤¢¤ê
*
* @else
* @brief
@@ -114,9 +114,9 @@
}
/*!
* @if jp
- * @brief VKf[^ª³¢±ÆðmF
+ * @brief ¿·µ¬¥Ç¡¼¥¿¤¬Ìµ¤¤¤³¤È¤ò³Îǧ
*
- * @return trueFVKf[^ȵ
+ * @return true¡§¿·µ¬¥Ç¡¼¥¿¤Ê¤·
*
* @else
* @brief
Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/DirectPortBase.h
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/DirectPortBase.h 2018-01-24 03:04:18 UTC (rev 3200)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/DirectPortBase.h 2018-01-24 03:20:38 UTC (rev 3201)
@@ -28,7 +28,7 @@
/*!
* @if jp
* @class DirectPortBase
- * @brief directÚ±pPortîêNX
+ * @brief directÀܳÍÑPort´ðÄ쥯¥é¥¹
*
*
* @since 1.2.0
@@ -48,7 +48,7 @@
public:
/*!
* @if jp
- * @brief RXgN^
+ * @brief ¥³¥ó¥¹¥È¥é¥¯¥¿
*
*
* @else
@@ -61,7 +61,7 @@
/*!
* @if jp
- * @brief fXgN^
+ * @brief ¥Ç¥¹¥È¥é¥¯¥¿
*
*
* @else
Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/Makefile.am 2018-01-24 03:04:18 UTC (rev 3200)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/Makefile.am 2018-01-24 03:20:38 UTC (rev 3201)
@@ -4,7 +4,7 @@
##
## $Id$
##---------------------------------------------------------------------------
-SUBDIRS = ec local_service logger sdo .
+SUBDIRS = ec local_service logger sdo ssl .
clean-local:
rm -f *~
Added: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/ssl/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/ssl/Makefile.am (rev 0)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/ext/ssl/Makefile.am 2018-01-24 03:20:38 UTC (rev 3201)
@@ -0,0 +1,16 @@
+## -*- Makefile -*-
+##---------------------------------------------------------------------------
+## Makefile.am for win32/OpenRTM-aist/ext/ssl
+##
+## $Id: Makefile.am 1680 2018-01-24 15:12:59Z n-miyamoto $
+##---------------------------------------------------------------------------
+clean-local:
+ rm -rf Debug Release
+ rm -rf *.vcproj *.vcxproj *.user *.ncb *.suo
+ rm -rf SSLTransport
+
+src:
+ cp -p $(top_srcdir)/src/ext/ssl/*.cpp .
+ qkc -O- -ms *.cpp
+
+dist-hook: src
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-24 03:04:18 UTC (rev 3200)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props 2018-01-24 03:20:38 UTC (rev 3201)
@@ -10,17 +10,21 @@
<coil_dllver>$(COIL_DLLVER)</coil_dllver>
<coil_lib>coil$(coil_dllver).lib</coil_lib>
<coil_libd>coil$(coil_dllver)d.lib</coil_libd>
+ <ssl_includes>$(ssl_root)\include</ssl_includes>
+ <ssl_libdir>$(ssl_root)\lib</ssl_libdir>
+ <ssl_lib>libssl.lib;libcrypto.lib</ssl_lib>
+ <ssl_libd>libssl.lib;libcrypto.lib</ssl_libd>
<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</omni_lib>
- <omni_libd>omniORB$(omni_dllver)_rtd.lib;omniDynamic$(omni_dllver)_rtd.lib;omnithread$(omnithread_dllver)_rtd.lib</omni_libd>
+ <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>
<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>
- <rtm_libd>RTC$(rtm_dllver)d.lib;$(coil_libd);$(omni_libd);advapi32.lib;ws2_32.lib;mswsock.lib;$(user_libd)</rtm_libd>
- <rtm_lib>RTC$(rtm_dllver).lib;$(coil_lib);$(omni_lib);advapi32.lib;ws2_32.lib;mswsock.lib;$(user_lib)</rtm_lib>
+ <rtm_libd>RTC$(rtm_dllver)d.lib;$(coil_libd);$(omni_libd);$(ssl_libd);advapi32.lib;ws2_32.lib;mswsock.lib;$(user_libd)</rtm_libd>
+ <rtm_lib>RTC$(rtm_dllver).lib;$(coil_lib);$(omni_lib);$(ssl_lib);advapi32.lib;ws2_32.lib;mswsock.lib;$(user_lib)</rtm_lib>
<rtm_ext_libd>$(rtm_ext_libd)</rtm_ext_libd>
<rtm_ext_lib>$(rtm_ext_lib)</rtm_ext_lib>
<rtm_idlc>omniidl</rtm_idlc>
@@ -32,11 +36,11 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
- <AdditionalIncludeDirectories>$(omni_includes);$(rtm_includes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ssl_includes);$(omni_includes);$(rtm_includes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>RTC_CORBA_CXXMAPPING11;_WIN32_WINNT=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
- <AdditionalLibraryDirectories>$(omni_libdir);$(rtm_libdir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(ssl_libdir);$(omni_libdir);$(rtm_libdir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@@ -67,6 +71,18 @@
<BuildMacro Include="coil_dllver">
<Value>$(coil_dllver)</Value>
</BuildMacro>
+ <BuildMacro Include="ssl_includes">
+ <Value>$(ssl_includes)</Value>
+ </BuildMacro>
+ <BuildMacro Include="ssl_libdir">
+ <Value>$(ssl_libdir)</Value>
+ </BuildMacro>
+ <BuildMacro Include="ssl_lib">
+ <Value>$(ssl_lib)</Value>
+ </BuildMacro>
+ <BuildMacro Include="ssl_libd">
+ <Value>$(ssl_libd)</Value>
+ </BuildMacro>
<BuildMacro Include="omni_includes">
<Value>$(omni_includes)</Value>
</BuildMacro>
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-24 03:04:18 UTC (rev 3200)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops 2018-01-24 03:20:38 UTC (rev 3201)
@@ -14,6 +14,10 @@
AdditionalLibraryDirectories="$(omni_libdir);$(rtm_libdir)"
/>
<UserMacro
+ Name="ss;_root"
+ Value="%SSL_ROOT%"
+ />
+ <UserMacro
Name="omni_root"
Value="%OMNI_ROOT%"
/>
More information about the openrtm-commit
mailing list