[openrtm-commit:02938] r1077 - branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts

openrtm @ openrtm.org openrtm @ openrtm.org
2017年 11月 28日 (火) 17:47:17 JST


Author: kawauchi
Date: 2017-11-28 17:47:17 +0900 (Tue, 28 Nov 2017)
New Revision: 1077

Modified:
   branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/AutoTestIn.sh
   branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/AutoTestOut.sh
   branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/Composite.sh
   branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/ConsoleIn.sh
   branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/ConsoleOut.sh
   branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/ExtConsoleIn.sh
   branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/ExtConsoleOut.sh
   branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/MyServiceConsumer.sh
   branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/MyServiceProvider.sh
   branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/SeqIn.sh
   branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/SeqOut.sh
   branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/TopicConssoleIn.sh
   branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/TopicConssoleOut.sh
   branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/search_classpath.func
Log:
[merge] r1075-1076 have been merged from trunk.

Modified: branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/AutoTestIn.sh
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/AutoTestIn.sh	2017-11-28 07:47:15 UTC (rev 1076)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/AutoTestIn.sh	2017-11-28 08:47:17 UTC (rev 1077)
@@ -6,7 +6,7 @@
     echo "Abort."
     exit 1
 fi
-
+cd `dirname $0`
 . ./search_classpath.func
 export CLASSPATH=`get_classpath`
 java RTMExamples.AutoTest.AutoTestInComp -f RTMExamples/AutoTest/rtc.conf ${1+"$@"}

Modified: branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/AutoTestOut.sh
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/AutoTestOut.sh	2017-11-28 07:47:15 UTC (rev 1076)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/AutoTestOut.sh	2017-11-28 08:47:17 UTC (rev 1077)
@@ -6,7 +6,7 @@
     echo "Abort."
     exit 1
 fi
-
+cd `dirname $0`
 . ./search_classpath.func
 export CLASSPATH=`get_classpath`
 java RTMExamples.AutoTest.AutoTestOutComp -f RTMExamples/AutoTest/rtc.conf ${1+"$@"}

Modified: branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/Composite.sh
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/Composite.sh	2017-11-28 07:47:15 UTC (rev 1076)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/Composite.sh	2017-11-28 08:47:17 UTC (rev 1077)
@@ -6,7 +6,7 @@
     echo "Abort."
     exit 1
 fi
-
+cd `dirname $0`
 . ./search_classpath.func
 export CLASSPATH=`get_classpath`
 java RTMExamples.Composite.Composite -f RTMExamples/Composite/rtc.conf ${1+"$@"}

Modified: branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/ConsoleIn.sh
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/ConsoleIn.sh	2017-11-28 07:47:15 UTC (rev 1076)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/ConsoleIn.sh	2017-11-28 08:47:17 UTC (rev 1077)
@@ -6,7 +6,7 @@
     echo "Abort."
     exit 1
 fi
-
+cd `dirname $0`
 . ./search_classpath.func
 export CLASSPATH=`get_classpath`
 java RTMExamples.SimpleIO.ConsoleInComp -f RTMExamples/SimpleIO/rtc.conf ${1+"$@"}

Modified: branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/ConsoleOut.sh
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/ConsoleOut.sh	2017-11-28 07:47:15 UTC (rev 1076)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/ConsoleOut.sh	2017-11-28 08:47:17 UTC (rev 1077)
@@ -6,8 +6,7 @@
     echo "Abort."
     exit 1
 fi
-
-
+cd `dirname $0`
 . ./search_classpath.func
 export CLASSPATH=`get_classpath`
 java RTMExamples.SimpleIO.ConsoleOutComp -f RTMExamples/SimpleIO/rtc.conf ${1+"$@"}

Modified: branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/ExtConsoleIn.sh
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/ExtConsoleIn.sh	2017-11-28 07:47:15 UTC (rev 1076)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/ExtConsoleIn.sh	2017-11-28 08:47:17 UTC (rev 1077)
@@ -6,7 +6,7 @@
     echo "Abort."
     exit 1
 fi
-
+cd `dirname $0`
 . ./search_classpath.func
 export CLASSPATH=`get_classpath`
 java RTMExamples.ExtTrigger.ConsoleInComp -f RTMExamples/ExtTrigger/rtc.conf ${1+"$@"}

Modified: branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/ExtConsoleOut.sh
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/ExtConsoleOut.sh	2017-11-28 07:47:15 UTC (rev 1076)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/ExtConsoleOut.sh	2017-11-28 08:47:17 UTC (rev 1077)
@@ -6,7 +6,7 @@
     echo "Abort."
     exit 1
 fi
-
+cd `dirname $0`
 . ./search_classpath.func
 export CLASSPATH=`get_classpath`
 java RTMExamples.ExtTrigger.ConsoleOutComp -f RTMExamples/ExtTrigger/rtc.conf ${1+"$@"}

Modified: branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/MyServiceConsumer.sh
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/MyServiceConsumer.sh	2017-11-28 07:47:15 UTC (rev 1076)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/MyServiceConsumer.sh	2017-11-28 08:47:17 UTC (rev 1077)
@@ -6,7 +6,7 @@
     echo "Abort."
     exit 1
 fi
-
+cd `dirname $0`
 . ./search_classpath.func
 export CLASSPATH=`get_classpath`
 java RTMExamples.SimpleService.MyServiceConsumerComp -f RTMExamples/SimpleService/rtc.conf ${1+"$@"}

Modified: branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/MyServiceProvider.sh
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/MyServiceProvider.sh	2017-11-28 07:47:15 UTC (rev 1076)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/MyServiceProvider.sh	2017-11-28 08:47:17 UTC (rev 1077)
@@ -6,7 +6,7 @@
     echo "Abort."
     exit 1
 fi
-
+cd `dirname $0`
 . ./search_classpath.func
 export CLASSPATH=`get_classpath`
 java RTMExamples.SimpleService.MyServiceProviderComp -f RTMExamples/SimpleService/rtc.conf ${1+"$@"}

Modified: branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/SeqIn.sh
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/SeqIn.sh	2017-11-28 07:47:15 UTC (rev 1076)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/SeqIn.sh	2017-11-28 08:47:17 UTC (rev 1077)
@@ -6,7 +6,7 @@
     echo "Abort."
     exit 1
 fi
-
+cd `dirname $0`
 . ./search_classpath.func
 export CLASSPATH=`get_classpath`
 java RTMExamples.SeqIO.SeqInComp -f RTMExamples/SeqIO/rtc.conf ${1+"$@"}

Modified: branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/SeqOut.sh
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/SeqOut.sh	2017-11-28 07:47:15 UTC (rev 1076)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/SeqOut.sh	2017-11-28 08:47:17 UTC (rev 1077)
@@ -6,7 +6,7 @@
     echo "Abort."
     exit 1
 fi
-
+cd `dirname $0`
 . ./search_classpath.func
 export CLASSPATH=`get_classpath`
 java RTMExamples.SeqIO.SeqOutComp -f RTMExamples/SeqIO/rtc.conf ${1+"$@"}

Modified: branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/TopicConssoleIn.sh
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/TopicConssoleIn.sh	2017-11-28 07:47:15 UTC (rev 1076)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/TopicConssoleIn.sh	2017-11-28 08:47:17 UTC (rev 1077)
@@ -6,7 +6,7 @@
     echo "Abort."
     exit 1
 fi
-
+cd `dirname $0`
 . ./search_classpath.func
 export CLASSPATH=`get_classpath`
 java RTMExamples.TopicTest.ConsoleInComp -f RTMExamples/TopicTest/rtc.conf ${1+"$@"}

Modified: branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/TopicConssoleOut.sh
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/TopicConssoleOut.sh	2017-11-28 07:47:15 UTC (rev 1076)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/TopicConssoleOut.sh	2017-11-28 08:47:17 UTC (rev 1077)
@@ -6,7 +6,7 @@
     echo "Abort."
     exit 1
 fi
-
+cd `dirname $0`
 . ./search_classpath.func
 export CLASSPATH=`get_classpath`
 java RTMExamples.TopicTest.ConsoleOutComp -f RTMExamples/TopicTest/rtc.conf ${1+"$@"}

Modified: branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/search_classpath.func
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/search_classpath.func	2017-11-28 07:47:15 UTC (rev 1076)
+++ branches/RELENG_1_2/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/search_classpath.func	2017-11-28 08:47:17 UTC (rev 1077)
@@ -2,6 +2,8 @@
 {
   FILE1=`ls ${RTM_JAVA_ROOT}/jar/OpenRTM*`
   FILE2=`ls ${RTM_JAVA_ROOT}/jar/commons-cli*`
-  CLASSPATH=.:$FILE1:$FILE2
+  FILE3=`ls ${RTM_JAVA_ROOT}/jar/jna-?.?.?.jar`
+  FILE4=`ls ${RTM_JAVA_ROOT}/jar/jna-platform-*.jar`
+  CLASSPATH=.:$FILE1:$FILE2:$FILE3:$FILE4:${RTM_JAVA_ROOT}/bin
   echo ${CLASSPATH}
 }



More information about the openrtm-commit mailing list