[openrtm-commit:02944] r779 - in trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java: resource/100/build/cmake1 resource/100/build/cmake2 src/jp/go/aist/rtm/rtcbuilder/java/template/java

[openrtm ＠ openrtm.org]

Author: ga
Date: 2017-12-02 20:00:05 +0900 (Sat, 02 Dec 2017)
New Revision: 779

Modified:
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/foo.sh
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/foo.sh
   trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/run.sh.vsl
Log:
Modified the shell script. #4378

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/foo.sh
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/foo.sh	2017-12-02 10:52:36 UTC (rev 778)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake1/foo.sh	2017-12-02 11:00:05 UTC (rev 779)
@@ -1,4 +1,13 @@
 #!/bin/sh
+get_classpath()
+{
+  FILE1=`ls ${RTM_JAVA_ROOT}/jar/OpenRTM*`
+  FILE2=`ls ${RTM_JAVA_ROOT}/jar/commons-cli*`
+  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:`dirname $0`/bin
+  echo ${CLASSPATH}
+}
 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."
@@ -5,6 +14,5 @@
     echo "Abort."
     exit 1
 fi
-export CLASSPATH=.:${RTM_JAVA_ROOT}/jar/OpenRTM-aist-1.2.0.jar:${RTM_JAVA_ROOT}/jar/commons-cli-1.1.jar
-cd `dirname $0`/bin
+export CLASSPATH=`get_classpath`
 java fooComp -f rtc.conf $*

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/foo.sh
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/foo.sh	2017-12-02 10:52:36 UTC (rev 778)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/resource/100/build/cmake2/foo.sh	2017-12-02 11:00:05 UTC (rev 779)
@@ -1,4 +1,13 @@
 #!/bin/sh
+get_classpath()
+{
+  FILE1=`ls ${RTM_JAVA_ROOT}/jar/OpenRTM*`
+  FILE2=`ls ${RTM_JAVA_ROOT}/jar/commons-cli*`
+  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:`dirname $0`/bin
+  echo ${CLASSPATH}
+}
 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."
@@ -5,6 +14,5 @@
     echo "Abort."
     exit 1
 fi
-export CLASSPATH=.:${RTM_JAVA_ROOT}/jar/OpenRTM-aist-1.2.0.jar:${RTM_JAVA_ROOT}/jar/commons-cli-1.1.jar
-cd `dirname $0`/bin
+export CLASSPATH=`get_classpath`
 java fooComp -f rtc.conf $*

Modified: trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/run.sh.vsl
===================================================================
--- trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/run.sh.vsl	2017-12-02 10:52:36 UTC (rev 778)
+++ trunk/rtmtools/jp.go.aist.rtm.rtcbuilder.java/src/jp/go/aist/rtm/rtcbuilder/java/template/java/run.sh.vsl	2017-12-02 11:00:05 UTC (rev 779)
@@ -1,4 +1,13 @@
 #!/bin/sh
+get_classpath()
+{
+  FILE1=`ls ${dol}{RTM_JAVA_ROOT}/jar/OpenRTM*`
+  FILE2=`ls ${dol}{RTM_JAVA_ROOT}/jar/commons-cli*`
+  FILE3=`ls ${dol}{RTM_JAVA_ROOT}/jar/jna-?.?.?.jar`
+  FILE4=`ls ${dol}{RTM_JAVA_ROOT}/jar/jna-platform-*.jar`
+  CLASSPATH=.:${dol}FILE1:${dol}FILE2:${dol}FILE3:${dol}FILE4:${dol}{RTM_JAVA_ROOT}/bin:`dirname ${dol}0`/bin
+  echo ${dol}{CLASSPATH}
+}
 if test "x${dol}RTM_JAVA_ROOT" = "x" ; then
     echo "Environment variable RTM_JAVA_ROOT is not set."
     echo "Please specify the OpenRTM-aist installation directory."
@@ -5,6 +14,5 @@
     echo "Abort."
     exit 1
 fi
-export CLASSPATH=.:${dol}{RTM_JAVA_ROOT}/jar/OpenRTM-aist-${rtcParam.rtmJavaVersion}.jar:${dol}{RTM_JAVA_ROOT}/jar/commons-cli-1.1.jar
-cd `dirname ${dol}0`/bin
+export CLASSPATH=`get_classpath`
 java ${rtcParam.name}Comp -f rtc.conf ${dol}*