[openrtm-commit:03308] r3274 - in trunk/OpenRTM-aist: . src/ext src/ext/ssl src/lib/coil/posix/coil src/lib/rtm win32/OpenRTM-aist win32/OpenRTM-aist/ext
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2018年 3月 28日 (水) 13:47:34 JST
Author: miyamoto
Date: 2018-03-28 13:47:34 +0900 (Wed, 28 Mar 2018)
New Revision: 3274
Added:
trunk/OpenRTM-aist/src/ext/ssl/Makefile.am
trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/ssl/
Modified:
trunk/OpenRTM-aist/configure.ac
trunk/OpenRTM-aist/src/ext/Makefile.am
trunk/OpenRTM-aist/src/lib/coil/posix/coil/Affinity.cpp
trunk/OpenRTM-aist/src/lib/rtm/DirectInPortBase.h
trunk/OpenRTM-aist/src/lib/rtm/DirectOutPortBase.h
trunk/OpenRTM-aist/src/lib/rtm/DirectPortBase.h
trunk/OpenRTM-aist/src/lib/rtm/InPortConnector.cpp
trunk/OpenRTM-aist/src/lib/rtm/InPortConnector.h
trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp
trunk/OpenRTM-aist/src/lib/rtm/OutPort.h
trunk/OpenRTM-aist/src/lib/rtm/OutPortConnector.cpp
trunk/OpenRTM-aist/src/lib/rtm/OutPortConnector.h
trunk/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.cpp
trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/Makefile.am
trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props
trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops
Log:
[merge] r3195-3201 have been merged from RELENG_1_2.
Modified: trunk/OpenRTM-aist/configure.ac
===================================================================
--- trunk/OpenRTM-aist/configure.ac 2018-03-28 04:24:59 UTC (rev 3273)
+++ trunk/OpenRTM-aist/configure.ac 2018-03-28 04:47:34 UTC (rev 3274)
@@ -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)
@@ -1677,6 +1679,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
@@ -1732,6 +1735,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/ext/sdo/fsm4rtc_observer/Makefile
win32/OpenRTM-aist/ext/sdo/extended_fsm/Makefile
win32/OpenRTM-aist/utils/Makefile
Modified: trunk/OpenRTM-aist/src/ext/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/ext/Makefile.am 2018-03-28 04:24:59 UTC (rev 3273)
+++ trunk/OpenRTM-aist/src/ext/Makefile.am 2018-03-28 04:47:34 UTC (rev 3274)
@@ -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
Copied: trunk/OpenRTM-aist/src/ext/ssl/Makefile.am (from rev 3201, branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/Makefile.am)
===================================================================
--- trunk/OpenRTM-aist/src/ext/ssl/Makefile.am (rev 0)
+++ trunk/OpenRTM-aist/src/ext/ssl/Makefile.am 2018-03-28 04:47:34 UTC (rev 3274)
@@ -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: trunk/OpenRTM-aist/src/lib/coil/posix/coil/Affinity.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/posix/coil/Affinity.cpp 2018-03-28 04:24:59 UTC (rev 3273)
+++ trunk/OpenRTM-aist/src/lib/coil/posix/coil/Affinity.cpp 2018-03-28 04:47:34 UTC (rev 3274)
@@ -38,7 +38,7 @@
{
if (CPU_ISSET(i, &cpu_set))
{
- cpu_mask.push_back((unsigned int)i);
+ cpu_mask.push_back((unsigned int)i+1);
}
}
return true;
@@ -88,7 +88,7 @@
{
if (CPU_ISSET(i, &cpu_set))
{
- cpu_mask.push_back((unsigned int)i);
+ cpu_mask.push_back((unsigned int)i+1);
}
}
return true;
Modified: trunk/OpenRTM-aist/src/lib/rtm/DirectInPortBase.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/DirectInPortBase.h 2018-03-28 04:24:59 UTC (rev 3273)
+++ trunk/OpenRTM-aist/src/lib/rtm/DirectInPortBase.h 2018-03-28 04:47:34 UTC (rev 3274)
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// -*- C++ -*-
/*!
* @file DirectInPortBase.h
* @brief DirectInPortBase class
@@ -20,6 +20,7 @@
#include <coil/Mutex.h>
+#include <rtm/DirectPortBase.h>
@@ -28,7 +29,7 @@
/*!
* @if jp
* @class DirectInPortBase
- * @brief direct接続用InPort基底クラス
+ * @brief directÀܳÍÑInPort´ðÄ쥯¥é¥¹
*
*
* @since 1.2.0
@@ -49,7 +50,7 @@
public:
/*!
* @if jp
- * @brief コンストラクタ
+ * @brief ¥³¥ó¥¹¥È¥é¥¯¥¿
*
* @param value
*
@@ -60,14 +61,13 @@
*
* @endif
*/
- DirectInPortBase(DataType& value):
- m_directNewData(false), m_value(value)
+ DirectInPortBase(DataType& value)
{
}
/*!
* @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,25 +101,25 @@
*
* @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
*/
virtual bool isNew()
{
- return m_directNewData;
+ return false;
}
/*!
* @if jp
*
- * @brief バッファが空かどうか確認する
+ * @brief ¥Ð¥Ã¥Õ¥¡¤¬¶õ¤«¤É¤¦¤«³Îǧ¤¹¤ë
*
- * InPortのバッファが空かどうかを bool 値で返す。
- * 空の場合は true, 未読データがある場合は false を返す。
+ * InPort¤Î¥Ð¥Ã¥Õ¥¡¤¬¶õ¤«¤É¤¦¤«¤ò bool ÃͤÇÊÖ¤¹¡£
+ * ¶õ¤Î¾ì¹ç¤Ï true, ̤Æɥǡ¼¥¿¤¬¤¢¤ë¾ì¹ç¤Ï false ¤òÊÖ¤¹¡£
*
- * @return true バッファは空
- * false バッファに未読データがある
+ * @return true ¥Ð¥Ã¥Õ¥¡¤Ï¶õ
+ * false ¥Ð¥Ã¥Õ¥¡¤Ë̤Æɥǡ¼¥¿¤¬¤¢¤ë
*
* @else
*
@@ -129,20 +129,20 @@
*
* @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
*/
virtual bool isEmpty()
{
- return !m_directNewData;
+ return true;
}
/*!
* @if jp
- * @brief データの書き込み
+ * @brief ¥Ç¡¼¥¿¤Î½ñ¤¹þ¤ß
*
- * @param data データ
+ * @param data ¥Ç¡¼¥¿
*
* @else
* @brief
@@ -158,25 +158,7 @@
protected:
- /*!
- * @if jp
- * @brief バインドされる T 型の変数への参照
- * @else
- * @brief The reference to type-T value bound this OutPort
- * @endif
- */
- DataType& m_value;
- mutable coil::Mutex m_valueMutex;
-
- /*!
- * @if jp
- * @brief ダイレクトデータ転送フラグ
- * @else
- * @brief A flag for direct data transfer
- * @endif
- */
- bool m_directNewData;
};
}; // End of namesepace RTM
Modified: trunk/OpenRTM-aist/src/lib/rtm/DirectOutPortBase.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/DirectOutPortBase.h 2018-03-28 04:24:59 UTC (rev 3273)
+++ trunk/OpenRTM-aist/src/lib/rtm/DirectOutPortBase.h 2018-03-28 04:47:34 UTC (rev 3274)
@@ -29,7 +29,7 @@
/*!
* @if jp
* @class DirectOutPortBase
- * @brief directÚ‘±—pOutPortŠî’êƒNƒ‰ƒX
+ * @brief directÀܳÍÑOutPort´ðÄ쥯¥é¥¹
*
*
* @since 1.2.0
@@ -51,7 +51,7 @@
public:
/*!
* @if jp
- * @brief ƒRƒ“ƒXƒgƒ‰ƒNƒ^
+ * @brief ¥³¥ó¥¹¥È¥é¥¯¥¿
*
* @param value
*
@@ -62,13 +62,12 @@
*
* @endif
*/
- DirectOutPortBase(DataType& value):
- m_directNewData(false), m_directValue(value)
+ DirectOutPortBase(DataType& value)
{
}
/*!
* @if jp
- * @brief ƒfƒXƒgƒ‰ƒNƒ^
+ * @brief ¥Ç¥¹¥È¥é¥¯¥¿
*
*
* @else
@@ -82,9 +81,9 @@
}
/*!
* @if jp
- * @brief ƒf[ƒ^‚̎擾
+ * @brief ¥Ç¡¼¥¿¤Î¼èÆÀ
*
- * @param data ƒf[ƒ^‚ðŠi”[‚·‚é•Ï”
+ * @param data ¥Ç¡¼¥¿¤ò³ÊǼ¤¹¤ëÊÑ¿ô
*
* @else
* @brief
@@ -98,9 +97,9 @@
}
/*!
* @if jp
- * @brief V‹Kƒf[ƒ^‚Ì‘¶ÝŠm”F
+ * @brief ¿·µ¬¥Ç¡¼¥¿¤Î¸ºß³Îǧ
*
- * @return trueFV‹Kƒf[ƒ^‚ ‚è
+ * @return true¡§¿·µ¬¥Ç¡¼¥¿¤¢¤ê
*
* @else
* @brief
@@ -111,13 +110,13 @@
*/
virtual bool isNew()
{
- return !m_directNewData;
+ return false;
}
/*!
* @if jp
- * @brief V‹Kƒf[ƒ^‚ª–³‚¢‚±‚Æ‚ðŠm”F
+ * @brief ¿·µ¬¥Ç¡¼¥¿¤¬Ìµ¤¤¤³¤È¤ò³Îǧ
*
- * @return trueFV‹Kƒf[ƒ^‚È‚µ
+ * @return true¡§¿·µ¬¥Ç¡¼¥¿¤Ê¤·
*
* @else
* @brief
@@ -128,13 +127,10 @@
*/
virtual bool isEmpty()
{
- return !m_directNewData;
+ return true;
}
protected:
- coil::Mutex m_valueMutex;
- bool m_directNewData;
- DataType m_directValue;
};
}; // namespace RTC
Modified: trunk/OpenRTM-aist/src/lib/rtm/DirectPortBase.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/DirectPortBase.h 2018-03-28 04:24:59 UTC (rev 3273)
+++ trunk/OpenRTM-aist/src/lib/rtm/DirectPortBase.h 2018-03-28 04:47:34 UTC (rev 3274)
@@ -28,7 +28,7 @@
/*!
* @if jp
* @class DirectPortBase
- * @brief directÚ‘±—pPortŠî’êƒNƒ‰ƒX
+ * @brief directÀܳÍÑPort´ðÄ쥯¥é¥¹
*
*
* @since 1.2.0
@@ -48,7 +48,7 @@
public:
/*!
* @if jp
- * @brief ƒRƒ“ƒXƒgƒ‰ƒNƒ^
+ * @brief ¥³¥ó¥¹¥È¥é¥¯¥¿
*
*
* @else
@@ -61,7 +61,7 @@
/*!
* @if jp
- * @brief ƒfƒXƒgƒ‰ƒNƒ^
+ * @brief ¥Ç¥¹¥È¥é¥¯¥¿
*
*
* @else
Modified: trunk/OpenRTM-aist/src/lib/rtm/InPortConnector.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/InPortConnector.cpp 2018-03-28 04:24:59 UTC (rev 3273)
+++ trunk/OpenRTM-aist/src/lib/rtm/InPortConnector.cpp 2018-03-28 04:47:34 UTC (rev 3274)
@@ -163,8 +163,7 @@
}
m_directOutPort = directOutPort;
- m_outPortListeners = &(m_directOutPort->getListeners());
- m_directOutPort->getListeners();
+ m_outPortListeners = &(directOutPort->getListeners());
return true;
}
};
Modified: trunk/OpenRTM-aist/src/lib/rtm/InPortConnector.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/InPortConnector.h 2018-03-28 04:24:59 UTC (rev 3273)
+++ trunk/OpenRTM-aist/src/lib/rtm/InPortConnector.h 2018-03-28 04:47:34 UTC (rev 3274)
@@ -23,11 +23,12 @@
#include <rtm/ConnectorListener.h>
#include <rtm/ConnectorBase.h>
#include <rtm/DirectOutPortBase.h>
+#include <rtm/PortBase.h>
namespace RTC
{
- class OutPortBase;
+ class OutPortBase;
/*!
* @if jp
* @class InPortConnector
@@ -351,7 +352,7 @@
* @brief OutProt pointer to the peer in the same process
* @endif
*/
- OutPortBase* m_directOutPort;
+ PortBase* m_directOutPort;
};
}; // namespace RTC
Modified: trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp 2018-03-28 04:24:59 UTC (rev 3273)
+++ trunk/OpenRTM-aist/src/lib/rtm/Manager.cpp 2018-03-28 04:47:34 UTC (rev 3274)
@@ -394,11 +394,8 @@
- if (m_initProc != NULL)
- {
- m_initProc(this);
- }
+
invokeInitProc();
initPreCreation();
initPreConnection();
Modified: trunk/OpenRTM-aist/src/lib/rtm/OutPort.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/OutPort.h 2018-03-28 04:24:59 UTC (rev 3273)
+++ trunk/OpenRTM-aist/src/lib/rtm/OutPort.h 2018-03-28 04:47:34 UTC (rev 3274)
@@ -556,6 +556,10 @@
DataPortStatusList m_status;
CORBA::Long m_propValueIndex;
+
+ coil::Mutex m_valueMutex;
+ bool m_directNewData;
+ DataType m_directValue;
};
}; // namespace RTC
Modified: trunk/OpenRTM-aist/src/lib/rtm/OutPortConnector.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/OutPortConnector.cpp 2018-03-28 04:24:59 UTC (rev 3273)
+++ trunk/OpenRTM-aist/src/lib/rtm/OutPortConnector.cpp 2018-03-28 04:47:34 UTC (rev 3274)
@@ -174,7 +174,7 @@
return false;
}
m_directInPort = directInPort;
- m_inPortListeners = &(m_directInPort->getListeners());
+ m_inPortListeners = &(directInPort->getListeners());
return true;
}
}; // namespace RTC
Modified: trunk/OpenRTM-aist/src/lib/rtm/OutPortConnector.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/OutPortConnector.h 2018-03-28 04:24:59 UTC (rev 3273)
+++ trunk/OpenRTM-aist/src/lib/rtm/OutPortConnector.h 2018-03-28 04:47:34 UTC (rev 3274)
@@ -24,12 +24,13 @@
#include <rtm/ConnectorBase.h>
#include <rtm/ConnectorListener.h>
#include <rtm/DirectInPortBase.h>
+#include <rtm/PortBase.h>
namespace RTC
{
- class InPortBase;
+ class InPortBase;
/*!
* @if jp
* @class OutPortConnector
@@ -338,7 +339,7 @@
* @brief InProt pointer to the peer in the same process
* @endif
*/
- InPortBase* m_directInPort;
+ PortBase* m_directInPort;
/*!
* @if jp
Modified: trunk/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.cpp 2018-03-28 04:24:59 UTC (rev 3273)
+++ trunk/OpenRTM-aist/src/lib/rtm/PeriodicExecutionContext.cpp 2018-03-28 04:47:34 UTC (rev 3274)
@@ -134,13 +134,12 @@
coil::CpuMask ret_cpu;
result = coil::getThreadCpuAffinity(ret_cpu);
-
#ifdef RTM_OS_LINUX
std::sort(ret_cpu.begin(), ret_cpu.end());
std::sort(m_cpu.begin(), m_cpu.end());
- if ( result && ret_cpu.size() == ret_cpu.size()
+ if (result && ret_cpu.size() > 0 && m_cpu.size() > 0 && ret_cpu.size() == m_cpu.size()
&& std::equal(ret_cpu.begin(), ret_cpu.end(), m_cpu.begin()))
{
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/Makefile.am 2018-03-28 04:24:59 UTC (rev 3273)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/Makefile.am 2018-03-28 04:47:34 UTC (rev 3274)
@@ -4,7 +4,7 @@
##
## $Id$
##---------------------------------------------------------------------------
-SUBDIRS = ec local_service logger sdo .
+SUBDIRS = ec local_service logger sdo ssl .
clean-local:
rm -f *~
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props 2018-03-28 04:24:59 UTC (rev 3273)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props 2018-03-28 04:47:34 UTC (rev 3274)
@@ -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: trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops 2018-03-28 04:24:59 UTC (rev 3273)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops 2018-03-28 04:47:34 UTC (rev 3274)
@@ -14,6 +14,10 @@
AdditionalLibraryDirectories="$(omni_libdir);$(rtm_libdir)"
/>
<UserMacro
+ Name="ss;_root"
+ Value="%SSL_ROOT%"
+ />
+ <UserMacro
Name="omni_root"
Value="%OMNI_ROOT%"
/>
openrtm-commit メーリングリストの案内