[openrtm-commit:02828] r3042 - in trunk/OpenRTM-aist: . examples/Analyzer win32/OpenRTM-aist win32/OpenRTM-aist/examples win32/OpenRTM-aist/examples/Analyzer

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2017-09-15 14:58:00 +0900 (Fri, 15 Sep 2017)
New Revision: 3042

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

Modified: trunk/OpenRTM-aist/configure.ac
===================================================================
--- trunk/OpenRTM-aist/configure.ac	2017-09-06 09:38:11 UTC (rev 3041)
+++ trunk/OpenRTM-aist/configure.ac	2017-09-15 05:58:00 UTC (rev 3042)
@@ -1701,6 +1701,7 @@
 	win32/OpenRTM-aist/docs/Makefile
 	win32/OpenRTM-aist/build/Makefile
 	win32/OpenRTM-aist/examples/Makefile
+	win32/OpenRTM-aist/examples/Analyzer/Makefile
 	win32/OpenRTM-aist/examples/Composite/Makefile
 	win32/OpenRTM-aist/examples/ConfigSample/Makefile
 	win32/OpenRTM-aist/examples/ExtTrigger/Makefile

Modified: trunk/OpenRTM-aist/examples/Analyzer/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/examples/Analyzer/Makefile.am	2017-09-06 09:38:11 UTC (rev 3041)
+++ trunk/OpenRTM-aist/examples/Analyzer/Makefile.am	2017-09-15 05:58:00 UTC (rev 3042)
@@ -80,7 +80,7 @@
 #------------------------------------------------------------
 # Visual Studio Project
 #------------------------------------------------------------
-win32_builddir=$(top_builddir)/win32/OpenRTM-aist/examples/SimpleIO
+win32_builddir=$(top_builddir)/win32/OpenRTM-aist/examples/Analyzer
 
 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-09-06 09:38:11 UTC (rev 3041)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep	2017-09-15 05:58:00 UTC (rev 3042)
@@ -36,3 +36,7 @@
 ExtConsoleOut: libcoil libRTCSkel libRTC
 ExtConsoleOutComp: libcoil libRTCSkel libRTC
 ExtConnectorComp: libcoil libRTCSkel libRTC
+Analyzer: libcoil libRTCSkel libRTC
+AnalyzerComp: libcoil libRTCSkel libRTC
+Analyzer_test: libcoil libRTCSkel libRTC
+Analyzer_testComp: libcoil libRTCSkel libRTC

Added: trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/Analyzer/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/Analyzer/Makefile.am	                        (rev 0)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/Analyzer/Makefile.am	2017-09-15 05:58:00 UTC (rev 3042)
@@ -0,0 +1,21 @@
+## -*- Makefile -*-
+##---------------------------------------------------------------------------
+## Makefile.am for win32/OpenRTM-aist/examples/Analyzer
+##
+## $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 Analyzer AnalyzerComp Analyzer_test Analyzer_testComp
+
+src:
+	cp -p $(top_srcdir)/examples/Analyzer/*.cpp .
+	cp -p $(top_srcdir)/examples/Analyzer/*.h .
+	cp -p $(top_srcdir)/examples/Analyzer/*.conf .
+	qkc -O- -ms *.cpp
+	qkc -O- -ms *.h
+	qkc -O- -ms *.conf
+
+dist-hook: src

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/Makefile.am	2017-09-06 09:38:11 UTC (rev 3041)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/Makefile.am	2017-09-15 05:58:00 UTC (rev 3042)
@@ -4,7 +4,7 @@
 ##
 ## $Id$
 ##---------------------------------------------------------------------------
-SUBDIRS = Composite ConfigSample ExtTrigger LTTSample SimpleIO SeqIO SimpleService USBCamera .
+SUBDIRS = Analyzer Composite ConfigSample ExtTrigger LTTSample SimpleIO SeqIO SimpleService USBCamera .
 
 clean-local:
 	rm -f *~

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/example.yaml
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/example.yaml	2017-09-06 09:38:11 UTC (rev 3041)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/example.yaml	2017-09-15 05:58:00 UTC (rev 3042)
@@ -125,4 +125,22 @@
       Name: ExtConsoleOutComp.exe
       Source: ..\\examples\\ExtTrigger\\ConsoleOutComp\\Release\\ExtConsoleOutComp.exe
       Shortcut: true
+    - Id: AnalyzerComp.exe
+      ShortName: Anly.exe
+      Name: AnalyzerComp.exe
+      Source: ..\\examples\\Analyzer\\AnalyzerComp\\Release\\AnalyzerComp.exe
+      Shortcut: true
+    - Id: Analyzer_testComp.exe
+      ShortName: Anlytest.exe
+      Name: Analyzer_testComp.exe
+      Source: ..\\examples\\Analyzer\\Analyzer_testComp\\Release\\Analyzer_testComp.exe
+      Shortcut: true
+    - Id: Analyzer.dll
+      ShortName: Anly.dll
+      Name: Analyzer.dll
+      Source: ..\\examples\\Analyzer\\Analyzer\\Release\\Analyzer.dll
+    - Id: Analyzer_test.dll
+      ShortName: Anlytest.dll
+      Name: Analyzer_test.dll
+      Source: ..\\examples\\Analyzer\\Analyzer_test\\Release\\Analyzer_test.dll