[openrtm-commit:02866] r3053 - in trunk/OpenRTM-aist: . examples/Throughput win32/OpenRTM-aist win32/OpenRTM-aist/examples win32/OpenRTM-aist/examples/Throughput

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2017-10-12 15:58:46 +0900 (Thu, 12 Oct 2017)
New Revision: 3053

Added:
   trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/Throughput/
   trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/Throughput/Makefile.am
Modified:
   trunk/OpenRTM-aist/configure.ac
   trunk/OpenRTM-aist/examples/Throughput/Makefile.am
   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] Throughput sample has been added in windows source package.  refs #4222

Modified: trunk/OpenRTM-aist/configure.ac
===================================================================
--- trunk/OpenRTM-aist/configure.ac	2017-10-12 02:27:26 UTC (rev 3052)
+++ trunk/OpenRTM-aist/configure.ac	2017-10-12 06:58:46 UTC (rev 3053)
@@ -1710,6 +1710,7 @@
 	win32/OpenRTM-aist/examples/SimpleIO/Makefile
 	win32/OpenRTM-aist/examples/SeqIO/Makefile
 	win32/OpenRTM-aist/examples/SimpleService/Makefile
+	win32/OpenRTM-aist/examples/Throughput/Makefile
 	win32/OpenRTM-aist/examples/USBCamera/Makefile
 	win32/OpenRTM-aist/ext/Makefile
 	win32/OpenRTM-aist/ext/ec/Makefile

Modified: trunk/OpenRTM-aist/examples/Throughput/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/examples/Throughput/Makefile.am	2017-10-12 02:27:26 UTC (rev 3052)
+++ trunk/OpenRTM-aist/examples/Throughput/Makefile.am	2017-10-12 06:58:46 UTC (rev 3053)
@@ -68,7 +68,7 @@
 #------------------------------------------------------------
 # Visual Studio Project
 #------------------------------------------------------------
-win32_builddir=$(top_builddir)/win32/OpenRTM-aist/examples/SimpleIO
+win32_builddir=$(top_builddir)/win32/OpenRTM-aist/examples/Throughput
 
 vcproj: vc9proj vcxproj
 

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep	2017-10-12 02:27:26 UTC (rev 3052)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep	2017-10-12 06:58:46 UTC (rev 3053)
@@ -40,3 +40,5 @@
 AnalyzerComp: libcoil libRTCSkel libRTC
 Analyzer_test: libcoil libRTCSkel libRTC
 Analyzer_testComp: libcoil libRTCSkel libRTC
+Throughput: libcoil libRTCSkel libRTC
+ThroughputComp: libcoil libRTCSkel libRTC

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/Makefile.am	2017-10-12 02:27:26 UTC (rev 3052)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/Makefile.am	2017-10-12 06:58:46 UTC (rev 3053)
@@ -4,7 +4,7 @@
 ##
 ## $Id$
 ##---------------------------------------------------------------------------
-SUBDIRS = Analyzer Composite ConfigSample ExtTrigger LTTSample SimpleIO SeqIO SimpleService USBCamera .
+SUBDIRS = Analyzer Composite ConfigSample ExtTrigger LTTSample SimpleIO SeqIO SimpleService Throughput USBCamera .
 
 clean-local:
 	rm -f *~

Added: trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/Throughput/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/Throughput/Makefile.am	                        (rev 0)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/Throughput/Makefile.am	2017-10-12 06:58:46 UTC (rev 3053)
@@ -0,0 +1,21 @@
+## -*- Makefile -*-
+##---------------------------------------------------------------------------
+## Makefile.am for win32/OpenRTM-aist/examples/Throughput
+##
+## $Id: Makefile.am 3041 2017-09-15 14:49:04Z n-ando $
+##---------------------------------------------------------------------------
+clean-local:
+	rm -rf Debug Release
+	rm -rf *~ *.cpp *.h *.idl *.conf
+	rm -rf *.vcproj *.vcxproj *.user *.ncb *.suo
+	rm -rf Throughput ThroughputComp
+
+src:
+	cp -p $(top_srcdir)/examples/Throughput/*.cpp .
+	cp -p $(top_srcdir)/examples/Throughput/*.h .
+	cp -p $(top_srcdir)/examples/Throughput/*.conf .
+	qkc -O- -ms *.cpp
+	qkc -O- -ms *.h
+	qkc -O- -ms *.conf
+
+dist-hook: src

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/example.yaml
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/example.yaml	2017-10-12 02:27:26 UTC (rev 3052)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/example.yaml	2017-10-12 06:58:46 UTC (rev 3053)
@@ -143,4 +143,14 @@
       ShortName: Anlytest.dll
       Name: Analyzer_test.dll
       Source: ..\\examples\\Analyzer\\Analyzer_test\\Release\\Analyzer_test.dll
+    - Id: ThroughputComp.exe
+      ShortName: Through.exe
+      Name: ThroughputComp.exe
+      Source: ..\\examples\\Throughput\\ThroughputComp\\Release\\ThroughputComp.exe
+      Shortcut: true
+    - Id: Throughputdll
+      ShortName: Through .dll
+      Name: Throughput.dll
+      Source: ..\\examples\\Throughput\\Throughput\\Release\\Throughput.dll
+      Source: ..\\examples\\Analyzer\\Analyzer\\Release\\Throughput.dll