[openrtm-commit:03007] r1083 - trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts

[openrtm ＠ openrtm.org]

Author: t-katami
Date: 2017-12-12 11:22:09 +0900 (Tue, 12 Dec 2017)
New Revision: 1083

Modified:
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/rtcd_java
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/rtcd_java.sh
Log:
[compat,bugfix,->RELENG_1_2] Fixed the bug. refs #4388

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/rtcd_java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/rtcd_java	2017-12-12 01:03:56 UTC (rev 1082)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/rtcd_java	2017-12-12 02:22:09 UTC (rev 1083)
@@ -1,6 +1,33 @@
 #!/bin/sh
+#
+# The script to start the RTC.
 
-if test "x$RTM_JAVA_ROOT" = "x" ; then
+#######################################
+# Gets CLASSPATH for OpenRTM
+# Arguments:
+#   None
+# Returns:
+#   CLASSPATH
+#######################################
+get_classpath()
+{
+  local file1
+  file1=$(ls ${RTM_JAVA_ROOT}/jar/OpenRTM*)
+  local file2
+  file2=$(ls ${RTM_JAVA_ROOT}/jar/commons-cli*)
+  local file3
+  file3=$(ls ${RTM_JAVA_ROOT}/jar/jna-?.?.?.jar)
+  local file4
+  file4=$(ls ${RTM_JAVA_ROOT}/jar/jna-platform-*.jar)
+  local file5
+  file5=$(ls ${RTM_JAVA_ROOT}/jar/rtcd.jar)
+  local class_path
+  class_path=.:${file1}:${file2}:${file3}:${file4}:${file5}:${RTM_JAVA_ROOT}/bin
+  echo ${class_path}
+}
+
+
+if test "x${RTM_JAVA_ROOT}" = "x" ; then
     echo "Environment variable RTM_JAVA_ROOT is not set."
     echo "Please specify the OpenRTM-aist installation directory."
     echo "Abort."
@@ -7,10 +34,8 @@
     exit 1
 fi
 
-export CLASSPATH=.:$RTM_JAVA_ROOT/jar/OpenRTM-aist-1.0.0.jar:$RTM_JAVA_ROOT/jar/commons-cli-1.1.jar:$RTM_JAVA_ROOT/jar/rtcd.jar
+export CLASSPATH=$(get_classpath)
 
-rtcdpath=`which rtcd_java`
-#java -jar $RTM_JAVA_ROOT/jar/rtcd.jar -f $(dirname $rtcdpath)/rtcd_java.conf ${1+"$@"}
-java rtcd.rtcd -f $(dirname $rtcdpath)/rtcd_java.conf ${1+"$@"}
+java rtcd.rtcd -f ./rtcd_java.conf ${1+"$@"}
 
 

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/rtcd_java.sh
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/rtcd_java.sh	2017-12-12 01:03:56 UTC (rev 1082)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/RTMExamples_scripts/rtcd_java.sh	2017-12-12 02:22:09 UTC (rev 1083)
@@ -1,6 +1,33 @@
 #!/bin/sh
+#
+# The script to start the RTC.
 
-if test "x$RTM_JAVA_ROOT" = "x" ; then
+#######################################
+# Gets CLASSPATH for OpenRTM
+# Arguments:
+#   None
+# Returns:
+#   CLASSPATH
+#######################################
+get_classpath()
+{
+  local file1
+  file1=$(ls ${RTM_JAVA_ROOT}/jar/OpenRTM*)
+  local file2
+  file2=$(ls ${RTM_JAVA_ROOT}/jar/commons-cli*)
+  local file3
+  file3=$(ls ${RTM_JAVA_ROOT}/jar/jna-?.?.?.jar)
+  local file4
+  file4=$(ls ${RTM_JAVA_ROOT}/jar/jna-platform-*.jar)
+  local file5
+  file5=$(ls ${RTM_JAVA_ROOT}/jar/rtcd.jar)
+  local class_path
+  class_path=.:${file1}:${file2}:${file3}:${file4}:${file5}:${RTM_JAVA_ROOT}/bin
+  echo ${class_path}
+}
+
+
+if test "x${RTM_JAVA_ROOT}" = "x" ; then
     echo "Environment variable RTM_JAVA_ROOT is not set."
     echo "Please specify the OpenRTM-aist installation directory."
     echo "Abort."
@@ -7,8 +34,8 @@
     exit 1
 fi
 
-. ./search_classpath.func
-export CLASSPATH=`get_classpath`
-java -jar $RTM_JAVA_ROOT/jar/rtcd.jar ${1+"$@"}
+export CLASSPATH=$(get_classpath)
 
+java rtcd.rtcd -f ./rtcd_java.conf ${1+"$@"}
 
+