[openrtm-commit:03025] r3150 - in branches/RELENG_1_2/OpenRTM-aist: . win32/OpenRTM-aist win32/OpenRTM-aist/examples

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2017-12-15 13:40:54 +0900 (Fri, 15 Dec 2017)
New Revision: 3150

Removed:
   branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/Analyzer/
Modified:
   branches/RELENG_1_2/OpenRTM-aist/configure.ac
   branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep
   branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/Makefile.am
   branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/example.yaml
Log:
[merge,cancel] win32/Analyzer sample has been removed. r3042
[compat,->RELENG_1_2] Analyzer sample has been added in windows source package.  refs #4202


Modified: branches/RELENG_1_2/OpenRTM-aist/configure.ac
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/configure.ac	2017-12-14 06:16:45 UTC (rev 3149)
+++ branches/RELENG_1_2/OpenRTM-aist/configure.ac	2017-12-15 04:40:54 UTC (rev 3150)
@@ -1702,7 +1702,6 @@
 	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: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep	2017-12-14 06:16:45 UTC (rev 3149)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/OpenRTM-aist.sln.dep	2017-12-15 04:40:54 UTC (rev 3150)
@@ -36,10 +36,6 @@
 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
 Throughput: libcoil libRTCSkel libRTC
 ThroughputComp: libcoil libRTCSkel libRTC
 LoggerConsumer: libcoil libRTCSkel libRTC

Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/Makefile.am	2017-12-14 06:16:45 UTC (rev 3149)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/Makefile.am	2017-12-15 04:40:54 UTC (rev 3150)
@@ -4,7 +4,7 @@
 ##
 ## $Id$
 ##---------------------------------------------------------------------------
-SUBDIRS = Analyzer Composite ConfigSample ExtTrigger LTTSample SimpleIO SeqIO SimpleService Throughput USBCamera .
+SUBDIRS = Composite ConfigSample ExtTrigger LTTSample SimpleIO SeqIO SimpleService Throughput USBCamera .
 
 clean-local:
 	rm -f *~

Modified: branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/example.yaml
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/example.yaml	2017-12-14 06:16:45 UTC (rev 3149)
+++ branches/RELENG_1_2/OpenRTM-aist/win32/OpenRTM-aist/examples/example.yaml	2017-12-15 04:40:54 UTC (rev 3150)
@@ -125,24 +125,6 @@
       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
     - Id: ThroughputComp.exe
       ShortName: Through.exe
       Name: ThroughputComp.exe