[openrtm-commit:02923] r3078 - in trunk/OpenRTM-aist: . src/ext/ec/artlinux src/ext/ec/rtpreempt src/ext/logger/fluentbit_stream src/ext/sdo src/ext/sdo/logger win32/OpenRTM-aist win32/OpenRTM-aist/ext win32/OpenRTM-aist/ext/ec win32/OpenRTM-aist/ext/sdo
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 11月 17日 (金) 17:28:20 JST
Author: kawauchi
Date: 2017-11-17 17:28:20 +0900 (Fri, 17 Nov 2017)
New Revision: 3078
Modified:
trunk/OpenRTM-aist/configure.ac
trunk/OpenRTM-aist/src/ext/ec/artlinux/Makefile.am
trunk/OpenRTM-aist/src/ext/ec/rtpreempt/Makefile.am
trunk/OpenRTM-aist/src/ext/logger/fluentbit_stream/Makefile.am
trunk/OpenRTM-aist/src/ext/sdo/Makefile.am
trunk/OpenRTM-aist/src/ext/sdo/logger/Makefile.am
trunk/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep
trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/Makefile.am
trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/ec/Makefile.am
trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/Makefile.am
Log:
[incompat,->RELENG_1_2] Extension modules under src/ext have been added to dist packages. refs #4368
Modified: trunk/OpenRTM-aist/configure.ac
===================================================================
--- trunk/OpenRTM-aist/configure.ac 2017-11-17 06:34:44 UTC (rev 3077)
+++ trunk/OpenRTM-aist/configure.ac 2017-11-17 08:28:20 UTC (rev 3078)
@@ -1667,6 +1667,7 @@
src/ext/ec/logical_time/Makefile
src/ext/ec/logical_time/example/Makefile
src/ext/sdo/Makefile
+ src/ext/sdo/logger/Makefile
src/ext/sdo/observer/Makefile
src/ext/local_service/Makefile
src/ext/local_service/nameservice_file/Makefile
@@ -1713,11 +1714,16 @@
win32/OpenRTM-aist/examples/Throughput/Makefile
win32/OpenRTM-aist/examples/USBCamera/Makefile
win32/OpenRTM-aist/ext/Makefile
+ win32/OpenRTM-aist/ext/ec/artlinux/Makefile
win32/OpenRTM-aist/ext/ec/Makefile
win32/OpenRTM-aist/ext/ec/logical_time/Makefile
+ win32/OpenRTM-aist/ext/ec/rtpreempt/Makefile
win32/OpenRTM-aist/ext/local_service/Makefile
win32/OpenRTM-aist/ext/local_service/nameservice_file/Makefile
+ win32/OpenRTM-aist/ext/logger/Makefile
+ win32/OpenRTM-aist/ext/logger/fluentbit_stream/Makefile
win32/OpenRTM-aist/ext/sdo/Makefile
+ win32/OpenRTM-aist/ext/sdo/logger/Makefile
win32/OpenRTM-aist/ext/sdo/observer/Makefile
win32/OpenRTM-aist/utils/Makefile
win32/OpenRTM-aist/utils/rtc-template/Makefile
Modified: trunk/OpenRTM-aist/src/ext/ec/artlinux/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/ext/ec/artlinux/Makefile.am 2017-11-17 06:34:44 UTC (rev 3077)
+++ trunk/OpenRTM-aist/src/ext/ec/artlinux/Makefile.am 2017-11-17 08:28:20 UTC (rev 3078)
@@ -25,5 +25,7 @@
ArtExecutionContext_la_FLAGS = -L$(top_builddir)/src/lib/rtm/.lib
ArtExecutionContext_la_LIBADD = $(top_builddir)/src/lib/rtm/libRTC.la $(ARTLIB)
+EXTRA_DIST = rtc.conf.sample
+
clean-local:
rm -rf *~ *.o *.so
Modified: trunk/OpenRTM-aist/src/ext/ec/rtpreempt/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/ext/ec/rtpreempt/Makefile.am 2017-11-17 06:34:44 UTC (rev 3077)
+++ trunk/OpenRTM-aist/src/ext/ec/rtpreempt/Makefile.am 2017-11-17 08:28:20 UTC (rev 3078)
@@ -24,5 +24,7 @@
$(top_builddir)/src/lib/rtm/libRTC.la \
$(top_builddir)/src/lib/coil/lib/libcoil.la
+EXTRA_DIST = rtc.conf.sample
+
clean-local:
rm -rf *~ *.o *.so
Modified: trunk/OpenRTM-aist/src/ext/logger/fluentbit_stream/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/ext/logger/fluentbit_stream/Makefile.am 2017-11-17 06:34:44 UTC (rev 3077)
+++ trunk/OpenRTM-aist/src/ext/logger/fluentbit_stream/Makefile.am 2017-11-17 08:28:20 UTC (rev 3078)
@@ -61,6 +61,7 @@
$(top_builddir)/src/lib/rtm/libRTC.la \
$(top_builddir)/src/lib/coil/lib/libcoil.la
+EXTRA_DIST = fluentbit.conf
clean-local:
rm -rf *~ *.o *.so
Modified: trunk/OpenRTM-aist/src/ext/sdo/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/ext/sdo/Makefile.am 2017-11-17 06:34:44 UTC (rev 3077)
+++ trunk/OpenRTM-aist/src/ext/sdo/Makefile.am 2017-11-17 08:28:20 UTC (rev 3078)
@@ -7,6 +7,6 @@
AUTOMAKE_OPTIONS = 1.4
-SUBDIRS = observer
+SUBDIRS = logger observer
Modified: trunk/OpenRTM-aist/src/ext/sdo/logger/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/ext/sdo/logger/Makefile.am 2017-11-17 06:34:44 UTC (rev 3077)
+++ trunk/OpenRTM-aist/src/ext/sdo/logger/Makefile.am 2017-11-17 08:28:20 UTC (rev 3078)
@@ -42,11 +42,15 @@
LOGGER_DIST_SRC = LoggerConsumer.cpp
LOGGER_NODIST_SRC = $(IDL_SOURCES:.idl=Stub.cpp)
+LOGGER_NOWIN_SRC = $(IDL_SOURCES:.idl=Stub.cpp)
LOGGER_SRC = $(LOGGER_DIST_SRC) $(LOGGER_NODIST_SRC)
+LOGGER_WIN_SRC = $(LOGGER_DIST_SRC) $(LOGGER_NOWIN_SRC)
LOGGER_DIST_H = $(LOGGER_DIST_SRC:.cpp=.h)
LOGGER_NODIST_H = $(LOGGER_NODIST_SRC:.cpp=.h)
+LOGGER_NOWIN_H = $(LOGGER_NOWIN_SRC:.cpp=.h)
LOGGER_H = $(LOGGER_DIST_H) $(LOGGER_NODIST_H)
+LOGGER_WIN_H = $(LOGGER_DIST_H) $(LOGGER_NOWIN_H)
#------------------------------------------------------------
# Object list
@@ -89,9 +93,43 @@
echo $(ALL_SRC) > src.lst
echo $(EXTRA_DIST) > other.lst
-dist-hook: lst
+#------------------------------------------------------------
+# Visual Studio Project
+#------------------------------------------------------------
+win32_builddir=$(top_builddir)/win32/OpenRTM-aist/ext/sdo/logger
+PROJNAME=LoggerConsumer
+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 $(LOGGER_WIN_SRC) \
+ --header $(LOGGER_WIN_H)
+ 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 $(LOGGER_WIN_SRC) \
+ --header $(LOGGER_WIN_H) ; \
+ qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc$${ver}.vcxproj ; \
+ done
+
+dist-hook: lst vcproj
+
+
clean_objs:
rm -f $(OBJS)
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep 2017-11-17 06:34:44 UTC (rev 3077)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep 2017-11-17 08:28:20 UTC (rev 3078)
@@ -42,3 +42,4 @@
Analyzer_testComp: libcoil libRTCSkel libRTC
Throughput: libcoil libRTCSkel libRTC
ThroughputComp: libcoil libRTCSkel libRTC
+LoggerConsumer: libcoil libRTCSkel libRTC
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/Makefile.am 2017-11-17 06:34:44 UTC (rev 3077)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/Makefile.am 2017-11-17 08:28:20 UTC (rev 3078)
@@ -4,7 +4,7 @@
##
## $Id$
##---------------------------------------------------------------------------
-SUBDIRS = ec local_service sdo .
+SUBDIRS = ec local_service logger sdo .
clean-local:
rm -f *~
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/ec/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/ec/Makefile.am 2017-11-17 06:34:44 UTC (rev 3077)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/ec/Makefile.am 2017-11-17 08:28:20 UTC (rev 3078)
@@ -4,7 +4,7 @@
##
## $Id$
##---------------------------------------------------------------------------
-SUBDIRS = logical_time .
+SUBDIRS = artlinux logical_time rtpreempt .
clean-local:
rm -f *~
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/Makefile.am 2017-11-17 06:34:44 UTC (rev 3077)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/Makefile.am 2017-11-17 08:28:20 UTC (rev 3078)
@@ -4,7 +4,7 @@
##
## $Id: Makefile.am 1680 2010-01-17 15:12:59Z n-ando $
##---------------------------------------------------------------------------
-SUBDIRS = observer .
+SUBDIRS = observer logger .
clean-local:
rm -f *~
More information about the openrtm-commit
mailing list