[openrtm-commit:03312] r3278 - in trunk/OpenRTM-aist: src/ext/ssl src/lib/rtm src/lib/rtm/idl win32/OpenRTM-aist
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2018年 3月 28日 (水) 14:07:19 JST
Author: miyamoto
Date: 2018-03-28 14:07:19 +0900 (Wed, 28 Mar 2018)
New Revision: 3278
Modified:
trunk/OpenRTM-aist/src/ext/ssl/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/BufferBase.h
trunk/OpenRTM-aist/src/lib/rtm/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/ManagerConfig.h
trunk/OpenRTM-aist/src/lib/rtm/RingBuffer.h
trunk/OpenRTM-aist/src/lib/rtm/idl/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/idl/libRTCSkel.vcproj.yaml
trunk/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep
trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat.in
trunk/OpenRTM-aist/win32/OpenRTM-aist/prepare_openrtm_inst.sh
trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props
trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops
Log:
[merge] r3233-3243 have been merged from RELENG_1_2.
Modified: trunk/OpenRTM-aist/src/ext/ssl/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/ext/ssl/Makefile.am 2018-03-28 05:04:53 UTC (rev 3277)
+++ trunk/OpenRTM-aist/src/ext/ssl/Makefile.am 2018-03-28 05:07:19 UTC (rev 3278)
@@ -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: trunk/OpenRTM-aist/src/lib/rtm/BufferBase.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/BufferBase.h 2018-03-28 05:04:53 UTC (rev 3277)
+++ trunk/OpenRTM-aist/src/lib/rtm/BufferBase.h 2018-03-28 05:07:19 UTC (rev 3278)
@@ -254,7 +254,7 @@
*
* @endif
*/
- virtual ReturnCode advanceWptr(long int n = 1) = 0;
+ virtual ReturnCode advanceWptr(long int n = 1, bool unlock_enable = true) = 0;
/*!
* @if jp
@@ -400,7 +400,7 @@
*
* @endif
*/
- virtual ReturnCode advanceRptr(long int n = 1) = 0;
+ virtual ReturnCode advanceRptr(long int n = 1, bool unlock_enable = true) = 0;
/*!
* @if jp
Modified: trunk/OpenRTM-aist/src/lib/rtm/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/Makefile.am 2018-03-28 05:04:53 UTC (rev 3277)
+++ trunk/OpenRTM-aist/src/lib/rtm/Makefile.am 2018-03-28 05:07:19 UTC (rev 3278)
@@ -242,8 +242,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
@@ -254,8 +254,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: trunk/OpenRTM-aist/src/lib/rtm/ManagerConfig.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ManagerConfig.h 2018-03-28 05:04:53 UTC (rev 3277)
+++ trunk/OpenRTM-aist/src/lib/rtm/ManagerConfig.h 2018-03-28 05:07:19 UTC (rev 3278)
@@ -263,10 +263,11 @@
*
* @brief ¥³¥Þ¥ó¥É°ú¿ô¤ò¥Ñ¡¼¥¹¤¹¤ë
*
- * - -f file : ¥³¥ó¥Õ¥£¥®¥å¥ì¡¼¥·¥ç¥ó¥Õ¥¡¥¤¥ë¤ò»ØÄꤹ¤ë¡£
- * - -l module : ¥í¡¼¥É¤¹¤ë¥â¥¸¥å¡¼¥ë¤ò»ØÄꤹ¤ë¡£(̤¼ÂÁõ)
- * - -o options: ¤½¤Î¾¥ª¥×¥·¥ç¥ó¤ò»ØÄꤹ¤ë¡£(̤¼ÂÁõ)
- * - -d : ¥Ç¥Õ¥©¥ë¥È¤Î¥³¥ó¥Õ¥£¥®¥å¥ì¡¼¥·¥ç¥ó¤ò»È¤¦¡£(̤¼ÂÁõ)
+ * - -a : ¥Þ¥Í¡¼¥¸¥ã¥µ¡¼¥Ó¥¹OFF
+ * - -f <file name> : ÀßÄê¥Õ¥¡¥¤¥ë¤Î»ØÄê
+ * - -o <option> ; ¥ª¥×¥·¥ç¥ó»ØÄê
+ * - -p <port number>: ¥Ý¡¼¥ÈÈÖ¹æ»ØÄê
+ * - -d : ¥Þ¥¹¥¿¡¼¥Þ¥Í¡¼¥¸¥ã»ØÄê
*
* @param argc ¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¿ô¤Î¿ô
* @param argv ¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¿ô
@@ -275,10 +276,11 @@
*
* @brief Parse the command arguments
*
- * - -f file : Specify the configuration file.
- * - -l module : Specify modules to be loaded. (Not implemented)
- * - -o options: Other options. (Not implemented)
- * - -d : Use default static configuration. (Not implemented)
+ * - -a : Disable manager service
+ * - -f <file name> : Specify a configuration file
+ * - -o <option> ; Specify options
+ * - -p <port number>: Specify a port number
+ * - -d : Run as the master manager
*
* @param argc Number of command line arguments
* @param argv The command line arguments
Modified: trunk/OpenRTM-aist/src/lib/rtm/RingBuffer.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/RingBuffer.h 2018-03-28 05:04:53 UTC (rev 3277)
+++ trunk/OpenRTM-aist/src/lib/rtm/RingBuffer.h 2018-03-28 05:07:19 UTC (rev 3278)
@@ -318,6 +318,7 @@
* ¤òÊÖ¤¹¡£
*
* @param n ½ñ¹þ¤ß¥Ý¥¤¥ó¥¿ + n ¤Î°ÌÃ֤Υݥ¤¥ó¥¿
+ * @param unlock_enable true¤Î¾ì¹ç¤Ë¥Ð¥Ã¥Õ¥¡¥¨¥ó¥×¥Æ¥£¤Î¥Ö¥í¥Ã¥¯¤ò²ò½ü¤¹¤ë
* @return BUFFER_OK: Àµ¾ï½ªÎ»
* PRECONDITION_NOT_MET: n > writable()
*
@@ -331,8 +332,14 @@
*
* @endif
*/
- virtual ReturnCode advanceWptr(long int n = 1)
+ virtual ReturnCode advanceWptr(long int n = 1, bool unlock_enable = true)
{
+ bool empty_ = false;
+ if(unlock_enable && n > 0)
+ {
+ Guard fguard(m_empty.mutex);
+ empty_ = empty();
+ }
// n > 0 :
// n satisfies n <= writable elements
// n <= m_length - m_fillcout
@@ -350,6 +357,16 @@
m_wpos = (m_wpos + n + m_length) % m_length;
m_fillcount += n;
m_wcount += n;
+
+ if(unlock_enable)
+ {
+ if(empty_)
+ {
+ Guard fguard(m_empty.mutex);
+ m_empty.cond.signal();
+ }
+ }
+
return ::RTC::BufferStatus::BUFFER_OK;
}
/*!
@@ -447,7 +464,7 @@
if (overwrite && !timedwrite) // "overwrite" mode
{
- advanceRptr();
+ advanceRptr(1,false);
}
else if (!overwrite && !timedwrite) // "do_nothing" mode
{
@@ -475,19 +492,9 @@
put(value);
- {
- Guard eguard(m_empty.mutex);
- if (empty())
- {
- // Guard eguard(m_empty.mutex);
- advanceWptr(1);
- m_empty.cond.signal();
- }
- else
- {
- advanceWptr(1);
- }
- }
+ advanceWptr(1);
+
+
return ::RTC::BufferStatus::BUFFER_OK;
}
@@ -578,6 +585,7 @@
* ¸½ºß¤ÎÆɤ߽Ф·°ÌÃ֤Υݥ¤¥ó¥¿¤ò n ¸Ä¿Ê¤á¤ë¡£
*
* @param n Æɤ߽Ф·¥Ý¥¤¥ó¥¿ + n ¤Î°ÌÃ֤Υݥ¤¥ó¥¿
+ * @param unlock_enable true¤Î¾ì¹ç¤Ë¥Ð¥Ã¥Õ¥¡¥Õ¥ë¤Î¥Ö¥í¥Ã¥¯¤ò²ò½ü¤¹¤ë
* @return BUFFER_OK: Àµ¾ï½ªÎ»
* BUFFER_ERROR: °Û¾ï½ªÎ»
*
@@ -591,8 +599,14 @@
*
* @endif
*/
- virtual ReturnCode advanceRptr(long int n = 1)
+ virtual ReturnCode advanceRptr(long int n = 1, bool unlock_enable = true)
{
+ bool full_ = false;
+ if(unlock_enable && n > 0)
+ {
+ Guard fguard(m_full.mutex);
+ full_ = full();
+ }
// n > 0 :
// n satisfies n <= readable elements
// n <= m_fillcout
@@ -608,6 +622,16 @@
m_rpos = (m_rpos + n + m_length) % m_length;
m_fillcount -= n;
+
+ if(unlock_enable)
+ {
+ if(full_)
+ {
+ Guard fguard(m_full.mutex);
+ m_full.cond.signal();
+ }
+ }
+
return ::RTC::BufferStatus::BUFFER_OK;
}
@@ -761,19 +785,8 @@
get(value);
- {
- Guard fguard(m_full.mutex);
- if (full())
- {
- // Guard fguard(m_full.mutex);
- advanceRptr(1);
- m_full.cond.signal();
- }
- else
- {
- advanceRptr(1);
- }
- }
+ advanceRptr(1);
+
return ::RTC::BufferStatus::BUFFER_OK;
}
Modified: trunk/OpenRTM-aist/src/lib/rtm/idl/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/idl/Makefile.am 2018-03-28 05:04:53 UTC (rev 3277)
+++ trunk/OpenRTM-aist/src/lib/rtm/idl/Makefile.am 2018-03-28 05:07:19 UTC (rev 3278)
@@ -234,8 +234,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
@@ -246,8 +246,8 @@
--version $(RTM_VERSION) \
--out $(win32_builddir)/rtm/idl/libRTCSkel_vc$${ver}.vcxproj \
--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_vc$${ver}.vcxproj ; \
done
Modified: trunk/OpenRTM-aist/src/lib/rtm/idl/libRTCSkel.vcproj.yaml
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/idl/libRTCSkel.vcproj.yaml 2018-03-28 05:04:53 UTC (rev 3277)
+++ trunk/OpenRTM-aist/src/lib/rtm/idl/libRTCSkel.vcproj.yaml 2018-03-28 05:07:19 UTC (rev 3278)
@@ -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: trunk/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep 2018-03-28 05:04:53 UTC (rev 3277)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep 2018-03-28 05:07:19 UTC (rev 3278)
@@ -5,7 +5,7 @@
libRTC: libcoil libRTCSkel
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: trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat.in
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat.in 2018-03-28 05:04:53 UTC (rev 3277)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat.in 2018-03-28 05:07:19 UTC (rev 3278)
@@ -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: trunk/OpenRTM-aist/win32/OpenRTM-aist/prepare_openrtm_inst.sh
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/prepare_openrtm_inst.sh 2018-03-28 05:04:53 UTC (rev 3277)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/prepare_openrtm_inst.sh 2018-03-28 05:07:19 UTC (rev 3278)
@@ -127,8 +127,6 @@
cp OpenRTM_bin_dir.wxsctrl $RUNTIME_DIR/bin/
cp $OPENRTM_DIR/etc/rtc.conf.sample $RUNTIME_DIR/etc/
-
- cp $OPENRTM_DIR/components/ComponentObserverConsumer.dll $RUNTIME_DIR/ext/sdo
}
copy_devel_files()
@@ -161,7 +159,6 @@
ORG_EX=$OPENRTM_DIR/examples/
DST_EX=$EXAMPLE_DIR/examples/C++
cp $OPENRTM_DIR/components/*.dll $EXAMPLE_DIR/examples/C++
- rm -f $EXAMPLEL_DIR/examples/C++/ComponentObserverConsumer.dll
cp $OPENRTM_DIR/components/*.exe $EXAMPLE_DIR/examples/C++
cp $ORG_EX/SimpleIO/rtc.conf $DST_EX/
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props 2018-03-28 05:04:53 UTC (rev 3277)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props 2018-03-28 05:07:19 UTC (rev 3278)
@@ -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: trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops 2018-03-28 05:04:53 UTC (rev 3277)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops 2018-03-28 05:07:19 UTC (rev 3278)
@@ -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%"
/>
openrtm-commit メーリングリストの案内