[openrtm-commit:02109] r2801 - in trunk/OpenRTM-aist: . examples/ExtTrigger win32/OpenRTM-aist win32/OpenRTM-aist/examples win32/OpenRTM-aist/examples/ExtTrigger
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2016年 11月 16日 (水) 16:50:37 JST
Author: kawauchi
Date: 2016-11-16 16:50:37 +0900 (Wed, 16 Nov 2016)
New Revision: 2801
Added:
trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/ExtTrigger/
trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/ExtTrigger/Makefile.am
trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/ExtTrigger/Makefile.in
Modified:
trunk/OpenRTM-aist/configure.ac
trunk/OpenRTM-aist/examples/ExtTrigger/ConnectorComp.cpp
trunk/OpenRTM-aist/examples/ExtTrigger/Makefile.am
trunk/OpenRTM-aist/examples/ExtTrigger/run.sh
trunk/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep
trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/Makefile.am
trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/example.yaml
Log:
[compat,->RELENG_1_2] ExtTrigger sample has been added in windows source package. refs #3709
Modified: trunk/OpenRTM-aist/configure.ac
===================================================================
--- trunk/OpenRTM-aist/configure.ac 2016-11-15 09:37:34 UTC (rev 2800)
+++ trunk/OpenRTM-aist/configure.ac 2016-11-16 07:50:37 UTC (rev 2801)
@@ -1690,6 +1690,7 @@
win32/OpenRTM-aist/examples/Makefile
win32/OpenRTM-aist/examples/Composite/Makefile
win32/OpenRTM-aist/examples/ConfigSample/Makefile
+ win32/OpenRTM-aist/examples/ExtTrigger/Makefile
win32/OpenRTM-aist/examples/LTTSample/Makefile
win32/OpenRTM-aist/examples/SimpleIO/Makefile
win32/OpenRTM-aist/examples/SeqIO/Makefile
Modified: trunk/OpenRTM-aist/examples/ExtTrigger/ConnectorComp.cpp
===================================================================
--- trunk/OpenRTM-aist/examples/ExtTrigger/ConnectorComp.cpp 2016-11-15 09:37:34 UTC (rev 2800)
+++ trunk/OpenRTM-aist/examples/ExtTrigger/ConnectorComp.cpp 2016-11-16 07:50:37 UTC (rev 2801)
@@ -62,7 +62,8 @@
int main (int argc, char** argv)
{
int _argc(0);
- char** _argv(0);
+ char** _argv;
+ _argv = 0;
std::string subs_type;
std::string period;
@@ -154,7 +155,7 @@
// connect ports
ConnectorProfile prof;
- prof.connector_id = "";
+ prof.connector_id = CORBA::string_dup("");
prof.name = CORBA::string_dup("connector0");
prof.ports.length(2);
prof.ports[0] = pin[(CORBA::ULong)0];
Modified: trunk/OpenRTM-aist/examples/ExtTrigger/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/examples/ExtTrigger/Makefile.am 2016-11-15 09:37:34 UTC (rev 2800)
+++ trunk/OpenRTM-aist/examples/ExtTrigger/Makefile.am 2016-11-16 07:50:37 UTC (rev 2801)
@@ -19,23 +19,23 @@
sourcedir = $(exampledir)/src/ExtTrigger
# Standalone RTCs
-example_PROGRAMS = ConsoleInCompExt ConsoleOutCompExt ConnectorCompExt
+example_PROGRAMS = ExtConsoleInComp ExtConsoleOutComp ExtConnectorComp
example_DATA = rtc.conf
-ConsoleInCompExt_SOURCES = ConsoleInComp.cpp ConsoleIn.cpp ConsoleIn.h
-ConsoleInCompExt_LDADD = $(top_builddir)/src/lib/rtm/libRTC.la \
+ExtConsoleInComp_SOURCES = ConsoleInComp.cpp ConsoleIn.cpp ConsoleIn.h
+ExtConsoleInComp_LDADD = $(top_builddir)/src/lib/rtm/libRTC.la \
$(top_builddir)/src/lib/coil/lib/libcoil.la
-ConsoleInCompExt_LDFLAGS = -L$(top_builddir)/src/lib/rtm/.libs
+ExtConsoleInComp_LDFLAGS = -L$(top_builddir)/src/lib/rtm/.libs
-ConsoleOutCompExt_SOURCES = ConsoleOutComp.cpp ConsoleOut.cpp ConsoleOut.h
-ConsoleOutCompExt_LDADD = $(top_builddir)/src/lib/rtm/libRTC.la \
+ExtConsoleOutComp_SOURCES = ConsoleOutComp.cpp ConsoleOut.cpp ConsoleOut.h
+ExtConsoleOutComp_LDADD = $(top_builddir)/src/lib/rtm/libRTC.la \
$(top_builddir)/src/lib/coil/lib/libcoil.la
-ConsoleOutCompExt_LDFLAGS = -L$(top_builddir)/src/lib/rtm/.libs
+ExtConsoleOutComp_LDFLAGS = -L$(top_builddir)/src/lib/rtm/.libs
-ConnectorCompExt_SOURCES = ConnectorComp.cpp
-ConnectorCompExt_LDADD = $(top_builddir)/src/lib/rtm/libRTC.la \
+ExtConnectorComp_SOURCES = ConnectorComp.cpp
+ExtConnectorComp_LDADD = $(top_builddir)/src/lib/rtm/libRTC.la \
$(top_builddir)/src/lib/coil/lib/libcoil.la
-ConnectorCompExt_LDFLAGS = -L$(top_builddir)/src/lib/rtm/.libs
+ExtConnectorComp_LDFLAGS = -L$(top_builddir)/src/lib/rtm/.libs
# Example sources
source_DATA = $(ALL_SRC) $(EXTRA_DIST)
@@ -79,7 +79,7 @@
$(top_builddir)/build/vcprojtool.py vcproj \
--type EXE \
--vcversion "8.00" \
- --projectname "ConsoleInComp" \
+ --projectname "ExtConsoleInComp" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleIn_vc8.vcproj \
--yaml ../rtc.vcproj.yaml \
@@ -89,7 +89,7 @@
$(top_builddir)/build/vcprojtool.py vcproj \
--type DLL \
--vcversion "8.00" \
- --projectname "ConsoleIn" \
+ --projectname "ExtConsoleIn" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleInDll_vc8.vcproj \
--yaml ../rtcdll.vcproj.yaml \
@@ -99,7 +99,7 @@
$(top_builddir)/build/vcprojtool.py vcproj \
--type EXE \
--vcversion "8.00" \
- --projectname "ConsoleOutComp" \
+ --projectname "ExtConsoleOutComp" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleOut_vc8.vcproj \
--yaml ../rtc.vcproj.yaml \
@@ -109,19 +109,27 @@
$(top_builddir)/build/vcprojtool.py vcproj \
--type DLL \
--vcversion "8.00" \
- --projectname "ConsoleOut" \
+ --projectname "ExtConsoleOut" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleOutDll_vc8.vcproj \
--yaml ../rtcdll.vcproj.yaml \
--source ConsoleOut.cpp \
--header ConsoleOut.h
qkc -O- -sm $(win32_builddir)/ConsoleOutDll_vc8.vcproj
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --type EXE \
+ --vcversion "8.00" \
+ --projectname "ExtConnectorComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConnectorComp_vc8.vcproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source ConnectorComp.cpp
vc9proj:
$(top_builddir)/build/vcprojtool.py vcproj \
--type EXE \
--vcversion "9.00" \
- --projectname "ConsoleInComp" \
+ --projectname "ExtConsoleInComp" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleIn_vc9.vcproj \
--yaml ../rtc.vcproj.yaml \
@@ -131,7 +139,7 @@
$(top_builddir)/build/vcprojtool.py vcproj \
--type DLL \
--vcversion "9.00" \
- --projectname "ConsoleIn" \
+ --projectname "ExtConsoleIn" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleInDll_vc9.vcproj \
--yaml ../rtcdll.vcproj.yaml \
@@ -141,7 +149,7 @@
$(top_builddir)/build/vcprojtool.py vcproj \
--type EXE \
--vcversion "9.00" \
- --projectname "ConsoleOutComp" \
+ --projectname "ExtConsoleOutComp" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleOut_vc9.vcproj \
--yaml ../rtc.vcproj.yaml \
@@ -151,183 +159,223 @@
$(top_builddir)/build/vcprojtool.py vcproj \
--type DLL \
--vcversion "9.00" \
- --projectname "ConsoleOut" \
+ --projectname "ExtConsoleOut" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleOutDll_vc9.vcproj \
--yaml ../rtcdll.vcproj.yaml \
--source ConsoleOut.cpp \
--header ConsoleOut.h
qkc -O- -sm $(win32_builddir)/ConsoleOutDll_vc9.vcproj
+ $(top_builddir)/build/vcprojtool.py vcproj \
+ --type EXE \
+ --vcversion "9.00" \
+ --projectname "ExtConnectorComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConnectorComp_vc9.vcproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source ConnectorComp.cpp
vc10proj:
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type EXE \
--vcversion "10.00" \
- --projectname "ConsoleInComp" \
+ --projectname "ExtConsoleInComp" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleIn_vc10.vcxproj \
- --yaml ../rtc.vcxproj.yaml \
+ --yaml ../rtc.vcproj.yaml \
--source ConsoleIn.cpp ConsoleInComp.cpp \
--header ConsoleIn.h
qkc -O- -sm $(win32_builddir)/ConsoleIn_vc10.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "10.00" \
- --projectname "ConsoleIn" \
+ --projectname "ExtConsoleIn" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleInDll_vc10.vcxproj \
- --yaml ../rtcdll.vcxproj.yaml \
+ --yaml ../rtcdll.vcproj.yaml \
--source ConsoleIn.cpp \
--header ConsoleIn.h
qkc -O- -sm $(win32_builddir)/ConsoleInDll_vc10.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type EXE \
--vcversion "10.00" \
- --projectname "ConsoleOutComp" \
+ --projectname "ExtConsoleOutComp" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleOut_vc10.vcxproj \
- --yaml ../rtc.vcxproj.yaml \
+ --yaml ../rtc.vcproj.yaml \
--source ConsoleOut.cpp ConsoleOutComp.cpp \
--header ConsoleOut.h
qkc -O- -sm $(win32_builddir)/ConsoleOut_vc10.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "10.00" \
- --projectname "ConsoleOut" \
+ --projectname "ExtConsoleOut" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleOutDll_vc10.vcxproj \
- --yaml ../rtcdll.vcxproj.yaml \
+ --yaml ../rtcdll.vcproj.yaml \
--source ConsoleOut.cpp \
--header ConsoleOut.h
qkc -O- -sm $(win32_builddir)/ConsoleOutDll_vc10.vcxproj
-
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "10.00" \
+ --projectname "ExtConnectorComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConnectorComp_vc10.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source ConnectorComp.cpp
+
vc11proj:
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type EXE \
--vcversion "11.00" \
- --projectname "ConsoleInComp" \
+ --projectname "ExtConsoleInComp" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleIn_vc11.vcxproj \
- --yaml ../rtc.vcxproj.yaml \
+ --yaml ../rtc.vcproj.yaml \
--source ConsoleIn.cpp ConsoleInComp.cpp \
--header ConsoleIn.h
qkc -O- -sm $(win32_builddir)/ConsoleIn_vc11.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "11.00" \
- --projectname "ConsoleIn" \
+ --projectname "ExtConsoleIn" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleInDll_vc11.vcxproj \
- --yaml ../rtcdll.vcxproj.yaml \
+ --yaml ../rtcdll.vcproj.yaml \
--source ConsoleIn.cpp \
--header ConsoleIn.h
qkc -O- -sm $(win32_builddir)/ConsoleInDll_vc11.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type EXE \
--vcversion "11.00" \
- --projectname "ConsoleOutComp" \
+ --projectname "ExtConsoleOutComp" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleOut_vc11.vcxproj \
- --yaml ../rtc.vcxproj.yaml \
+ --yaml ../rtc.vcproj.yaml \
--source ConsoleOut.cpp ConsoleOutComp.cpp \
--header ConsoleOut.h
qkc -O- -sm $(win32_builddir)/ConsoleOut_vc11.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "11.00" \
- --projectname "ConsoleOut" \
+ --projectname "ExtConsoleOut" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleOutDll_vc11.vcxproj \
- --yaml ../rtcdll.vcxproj.yaml \
+ --yaml ../rtcdll.vcproj.yaml \
--source ConsoleOut.cpp \
--header ConsoleOut.h
qkc -O- -sm $(win32_builddir)/ConsoleOutDll_vc11.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "11.00" \
+ --projectname "ExtConnectorComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConnectorComp_vc11.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source ConnectorComp.cpp
vc12proj:
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type EXE \
--vcversion "12.00" \
- --projectname "ConsoleInComp" \
+ --projectname "ExtConsoleInComp" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleIn_vc12.vcxproj \
- --yaml ../rtc.vcxproj.yaml \
+ --yaml ../rtc.vcproj.yaml \
--source ConsoleIn.cpp ConsoleInComp.cpp \
--header ConsoleIn.h
qkc -O- -sm $(win32_builddir)/ConsoleIn_vc12.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "12.00" \
- --projectname "ConsoleIn" \
+ --projectname "ExtConsoleIn" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleInDll_vc12.vcxproj \
- --yaml ../rtcdll.vcxproj.yaml \
+ --yaml ../rtcdll.vcproj.yaml \
--source ConsoleIn.cpp \
--header ConsoleIn.h
qkc -O- -sm $(win32_builddir)/ConsoleInDll_vc12.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type EXE \
--vcversion "12.00" \
- --projectname "ConsoleOutComp" \
+ --projectname "ExtConsoleOutComp" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleOut_vc12.vcxproj \
- --yaml ../rtc.vcxproj.yaml \
+ --yaml ../rtc.vcproj.yaml \
--source ConsoleOut.cpp ConsoleOutComp.cpp \
--header ConsoleOut.h
qkc -O- -sm $(win32_builddir)/ConsoleOut_vc12.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "12.00" \
- --projectname "ConsoleOut" \
+ --projectname "ExtConsoleOut" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleOutDll_vc12.vcxproj \
- --yaml ../rtcdll.vcxproj.yaml \
+ --yaml ../rtcdll.vcproj.yaml \
--source ConsoleOut.cpp \
--header ConsoleOut.h
qkc -O- -sm $(win32_builddir)/ConsoleOutDll_vc12.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "12.00" \
+ --projectname "ExtConnectorComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConnectorComp_vc12.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source ConnectorComp.cpp
vc14proj:
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type EXE \
--vcversion "14.00" \
- --projectname "ConsoleInComp" \
+ --projectname "ExtConsoleInComp" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleIn_vc14.vcxproj \
- --yaml ../rtc.vcxproj.yaml \
+ --yaml ../rtc.vcproj.yaml \
--source ConsoleIn.cpp ConsoleInComp.cpp \
--header ConsoleIn.h
qkc -O- -sm $(win32_builddir)/ConsoleIn_vc14.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "14.00" \
- --projectname "ConsoleIn" \
+ --projectname "ExtConsoleIn" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleInDll_vc14.vcxproj \
- --yaml ../rtcdll.vcxproj.yaml \
+ --yaml ../rtcdll.vcproj.yaml \
--source ConsoleIn.cpp \
--header ConsoleIn.h
qkc -O- -sm $(win32_builddir)/ConsoleInDll_vc14.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type EXE \
--vcversion "14.00" \
- --projectname "ConsoleOutComp" \
+ --projectname "ExtConsoleOutComp" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleOut_vc14.vcxproj \
- --yaml ../rtc.vcxproj.yaml \
+ --yaml ../rtc.vcproj.yaml \
--source ConsoleOut.cpp ConsoleOutComp.cpp \
--header ConsoleOut.h
qkc -O- -sm $(win32_builddir)/ConsoleOut_vc14.vcxproj
$(top_builddir)/build/vcxprojtool.py vcxproj \
--type DLL \
--vcversion "14.00" \
- --projectname "ConsoleOut" \
+ --projectname "ExtConsoleOut" \
--version $(RTM_VERSION) \
--out $(win32_builddir)/ConsoleOutDll_vc14.vcxproj \
- --yaml ../rtcdll.vcxproj.yaml \
+ --yaml ../rtcdll.vcproj.yaml \
--source ConsoleOut.cpp \
--header ConsoleOut.h
qkc -O- -sm $(win32_builddir)/ConsoleOutDll_vc14.vcxproj
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type EXE \
+ --vcversion "14.00" \
+ --projectname "ExtConnectorComp" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/ConnectorComp_vc14.vcxproj \
+ --yaml ../rtc.vcproj.yaml \
+ --source ConnectorComp.cpp
-dist-hook: lst
+dist-hook: lst vcproj
clean-local:
rm -f \
Modified: trunk/OpenRTM-aist/examples/ExtTrigger/run.sh
===================================================================
--- trunk/OpenRTM-aist/examples/ExtTrigger/run.sh 2016-11-15 09:37:34 UTC (rev 2800)
+++ trunk/OpenRTM-aist/examples/ExtTrigger/run.sh 2016-11-16 07:50:37 UTC (rev 2801)
@@ -44,11 +44,11 @@
echo 'exec_cxt.periodic.type: ExtTrigExecutionContext' >> ./rtc.conf
echo 'exec_cxt.periodic.rate: 1000' >> ./rtc.conf
-$term -e ./ConsoleInCompExt &
-$term -e ./ConsoleOutCompExt &
+$term -e ./ExtConsoleInComp &
+$term -e ./ExtConsoleOutComp &
sleep 5
-./ConnectorCompExt
+./ExtConnectorComp
#sleep 10
#nspid=`ps -ax | grep 9876 | awk '{print $1}'`
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep 2016-11-15 09:37:34 UTC (rev 2800)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep 2016-11-16 07:50:37 UTC (rev 2801)
@@ -30,3 +30,8 @@
LogicalTimeTriggeredEC: libcoil libRTC
LTTSample: libcoil libRTC
LTTSampleComp: libcoil libRTC
+ExtConsoleIn: libcoil libRTC
+ExtConsoleInComp: libcoil libRTC
+ExtConsoleOut: libcoil libRTC
+ExtConsoleOutComp: libcoil libRTC
+ExtConnectorComp: libcoil libRTC
Added: trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/ExtTrigger/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/ExtTrigger/Makefile.am (rev 0)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/ExtTrigger/Makefile.am 2016-11-16 07:50:37 UTC (rev 2801)
@@ -0,0 +1,20 @@
+## -*- Makefile -*-
+##---------------------------------------------------------------------------
+## Makefile.am for win32/OpenRTM-aist/examples/ExtTrigger
+##
+## $Id: Makefile.am 2556 2014-04-09 17:05:15Z n-ando $
+##---------------------------------------------------------------------------
+clean-local:
+ rm -rf Debug Release
+ rm -rf *~ *.cpp *.h *.idl rtc.conf
+ rm -rf *.vcproj *.vcxproj *.user *.ncb *.suo
+ rm -rf ExtConnectorComp ExtConsoleIn ExtConsoleInComp ExtConsoleOut ExtConsoleOutComp
+
+src:
+ cp -p $(top_srcdir)/examples/ExtTrigger/*.cpp .
+ cp -p $(top_srcdir)/examples/ExtTrigger/*.h .
+ cp -p $(top_srcdir)/examples/ExtTrigger/rtc.conf .
+ qkc -O- -ms *.cpp
+ qkc -O- -ms *.h
+
+dist-hook: src
Property changes on: trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/ExtTrigger/Makefile.am
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/ExtTrigger/Makefile.in
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/ExtTrigger/Makefile.in (rev 0)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/ExtTrigger/Makefile.in 2016-11-16 07:50:37 UTC (rev 2801)
@@ -0,0 +1,495 @@
+# Makefile.in generated by automake 1.15 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+ false; \
+ elif test -n '$(MAKE_HOST)'; then \
+ true; \
+ elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+ true; \
+ else \
+ false; \
+ fi; \
+}
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = win32/OpenRTM-aist/examples/ExtTrigger
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/libtool.m4 $(top_srcdir)/openrtm.m4 \
+ $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/lib/rtm/config_rtc.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+ARTLIB = @ARTLIB@
+ARTLINUX = @ARTLINUX@
+AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+COSNAMES = @COSNAMES@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DOCS = @DOCS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GREP = @GREP@
+IDLC = @IDLC@
+IDL_FLAGS = @IDL_FLAGS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LDSO = @LDSO@
+LDSOLIBS = @LDSOLIBS@
+LDSOOPTS = @LDSOOPTS@
+LIBOBJS = @LIBOBJS@
+LIBRARY = @LIBRARY@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+ORB = @ORB@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PYTHON_FLAGS = @PYTHON_FLAGS@
+RANLIB = @RANLIB@
+RTM_DESCRIPTION = @RTM_DESCRIPTION@
+RTM_MAJOR_VERSION = @RTM_MAJOR_VERSION@
+RTM_MINOR_VERSION = @RTM_MINOR_VERSION@
+RTM_REVISION_NUM = @RTM_REVISION_NUM@
+RTM_SHORT_VERSION = @RTM_SHORT_VERSION@
+RTM_VERSION = @RTM_VERSION@
+RTPREEMPTEC = @RTPREEMPTEC@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SOEXT = @SOEXT@
+STRIP = @STRIP@
+TARGET = @TARGET@
+UNITTEST = @UNITTEST@
+VERSION = @VERSION@
+WRAPPERS = @WRAPPERS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+coil_includedir = @coil_includedir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+rtm_datadir = @rtm_datadir@
+rtm_docdir = @rtm_docdir@
+rtm_ecdir = @rtm_ecdir@
+rtm_exampledir = @rtm_exampledir@
+rtm_idldir = @rtm_idldir@
+rtm_includedir = @rtm_includedir@
+rtm_libdir = @rtm_libdir@
+rtm_rtcdir = @rtm_rtcdir@
+rtm_rtmdir = @rtm_rtmdir@
+rtm_sdodir = @rtm_sdodir@
+rtm_svcdir = @rtm_svcdir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+subdirs = @subdirs@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu win32/OpenRTM-aist/examples/ExtTrigger/Makefile'; \
+ $(am__cd) $(top_srcdir) && \
+ $(AUTOMAKE) --gnu win32/OpenRTM-aist/examples/ExtTrigger/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d "$(distdir)/$$file"; then \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+ test -f "$(distdir)/$$file" \
+ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$(top_distdir)" distdir="$(distdir)" \
+ dist-hook
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ clean-local cscopelist-am ctags-am dist-hook distclean \
+ distclean-generic distclean-libtool distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+ uninstall-am
+
+.PRECIOUS: Makefile
+
+clean-local:
+ rm -rf Debug Release
+ rm -rf *~ *.cpp *.h *.idl rtc.conf
+ rm -rf *.vcproj *.vcxproj *.user *.ncb *.suo
+ rm -rf ExtConnectorComp ExtConsoleIn ExtConsoleInComp ExtConsoleOut ExtConsoleOutComp
+
+src:
+ cp -p $(top_srcdir)/examples/ExtTrigger/*.cpp .
+ cp -p $(top_srcdir)/examples/ExtTrigger/*.h .
+ cp -p $(top_srcdir)/examples/ExtTrigger/rtc.conf .
+ qkc -O- -ms *.cpp
+ qkc -O- -ms *.h
+
+dist-hook: src
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/Makefile.am 2016-11-15 09:37:34 UTC (rev 2800)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/Makefile.am 2016-11-16 07:50:37 UTC (rev 2801)
@@ -4,7 +4,7 @@
##
## $Id$
##---------------------------------------------------------------------------
-SUBDIRS = Composite ConfigSample LTTSample SimpleIO SeqIO SimpleService USBCamera .
+SUBDIRS = Composite ConfigSample ExtTrigger LTTSample SimpleIO SeqIO SimpleService USBCamera .
wxs:
cp -p *.yaml ../installer/
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/example.yaml
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/example.yaml 2016-11-15 09:37:34 UTC (rev 2800)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/example.yaml 2016-11-16 07:50:37 UTC (rev 2801)
@@ -110,4 +110,19 @@
ShortName: Sens.dll
Name: Sensor.dll
Source: ..\\examples\\Composite\\Sensor\\Release\\Sensor.dll
+ - Id: ExtConnectorComp.exe
+ ShortName: ExtConnect.exe
+ Name: ExtConnectorComp.exe
+ Source: ..\\examples\\ExtTrigger\\ConnectorComp\\Release\\ExtConnectorComp.exe
+ Shortcut: true
+ - Id: ExtConsoleInComp.exe
+ ShortName: ExtConsIn.exe
+ Name: ExtConsoleInComp.exe
+ Source: ..\\examples\\ExtTrigger\\ConsoleInComp\\Release\\ExtConsoleInComp.exe
+ Shortcut: true
+ - Id: ExtConsoleOutComp.exe
+ ShortName: ExtConsOut.exe
+ Name: ExtConsoleOutComp.exe
+ Source: ..\\examples\\ExtTrigger\\ConsoleOutComp\\Release\\ExtConsoleOutComp.exe
+ Shortcut: true
More information about the openrtm-commit
mailing list