[openrtm-commit:01007] r426 - trunk/rtmtools

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2013-02-16 01:35:34 +0900 (Sat, 16 Feb 2013)
New Revision: 426

Modified:
   trunk/rtmtools/make_packages
   trunk/rtmtools/openrtp
Log:
openrtp/make_packages script updated. Now 1) Java installation is ignored, 2) Mac OS X support updated, 3) some bugs are fixed.

Modified: trunk/rtmtools/make_packages
===================================================================
--- trunk/rtmtools/make_packages	2013-02-15 16:33:00 UTC (rev 425)
+++ trunk/rtmtools/make_packages	2013-02-15 16:35:34 UTC (rev 426)
@@ -108,11 +108,11 @@
          org.eclipse.xsd.sdk.feature.group"
 
 # Language package information
-true ${LANGPACK_URL:="http://sourceforge.jp/projects/mergedoc/svn/view/trunk/Pleiades/build/pleiades.zip?view=co&root=mergedoc"}
-#true ${LANGPACK_URL:="http://jaist.dl.sourceforge.jp/blancofw/56316/NLpackja-eclipse-SDK-3.8.0-blancofw20120628.zip"}
-true ${LANGPACK_FILE_NAME:="pleiades.zip"}
-#true ${LANGPACK_FILE_NAME:="NLpackja-eclipse-SDK-3.8.0-blancofw20120628.zip"}
-true ${PLEIADES:="YES"}
+#true ${LANGPACK_URL:="http://sourceforge.jp/projects/mergedoc/svn/view/trunk/Pleiades/build/pleiades.zip?view=co&root=mergedoc"}
+true ${LANGPACK_URL:="http://jaist.dl.sourceforge.jp/blancofw/56316/NLpackja-eclipse-SDK-3.8.0-blancofw20120628.zip"}
+#true ${LANGPACK_FILE_NAME:="pleiades.zip"}
+true ${LANGPACK_FILE_NAME:="NLpackja-eclipse-SDK-3.8.0-blancofw20120628.zip"}
+#true ${PLEIADES:="YES"}
 # openrtp tool information
 HERE=`pwd`
 true ${OPENRTP_SITE:="file:${HERE}/sitetool/openrtp_site"}
@@ -335,6 +335,15 @@
             return 0
         fi
     done
+
+    chmod 755 openrtp
+    if test "x$os" = "xLINUX" ; then
+        cp openrtp $WORK_DIR/eclipse/
+    elif test "x$os" = "xMACOS" ; then
+        cp openrtp $WORK_DIR/eclipse/Eclipse.app/Contents/MacOS/
+        info="$WORK_DIR/eclipse/Eclipse.app/Contents/Info.plist"
+        sed -i -e 's/<string>eclipse<\/string>/<string>openrtp<\/string>/g' $info
+    fi
 }
 
 #------------------------------------------------------------
@@ -447,9 +456,9 @@
 
         echo "Applying langpack: Activating pleiades plugin."
         pleiades_jar="plugins/jp.sourceforge.mergedoc.pleiades/pleiades.jar"
-        if test "x$OS" = "xMACOS" ; then
-            echo "javaagent:../../../$pleiades_jar" \
-                >> $WORK_DIR/Eclipse.app/Contents/MacOS/eclipse.ini
+        if test "x$os" = "xMACOS" ; then
+            echo "-javaagent:../../../$pleiades_jar" \
+                >> $WORK_DIR/eclipse/Eclipse.app/Contents/MacOS/eclipse.ini
         else
             echo "-javaagent:$pleiades_jar" \
                 >> $WORK_DIR/eclipse/eclipse.ini

Modified: trunk/rtmtools/openrtp
===================================================================
--- trunk/rtmtools/openrtp	2013-02-15 16:33:00 UTC (rev 425)
+++ trunk/rtmtools/openrtp	2013-02-15 16:35:34 UTC (rev 426)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # RTM_ROOT
 #
@@ -19,7 +19,12 @@
 # functions
 #============================================================
 SCRIPT_NAME=$(basename $0)
-SCRIPT_DIR=$(dirname $0)
+tmp=$(readlink $0)
+if test "x$tmp" = "x" ; then
+    SCRIPT_DIR=$(dirname $0)
+else
+    SCRIPT_DIR=$(dirname $tmp)
+fi
 DEBUG=""
 debug_echo () {
     if test "x$DEBUG" = "xTRUE"; then
@@ -53,7 +58,7 @@
             echo "Please install OpenRTM-aist (C++) and set RTM_ROOT"
             echo "  ex. export RTM_ROOT=/usr/include/openrtm-1.1/"
             echo ""
-            exit 1
+            return 1
         fi
     fi
 
@@ -67,7 +72,7 @@
         echo " If /usr/include/openrtm-1.1/rtm/idl/BasicDataType.idl exists,"
         echo " RTM_ROOT should be /usr/include/openrtm-1.1"
         echo ""
-        exit 1
+        return 1
     fi
     debug_echo "Result: RTM_ROOT = " $RTM_ROOT
     export RTM_ROOT=$RTM_ROOT
@@ -143,7 +148,7 @@
             echo "Please install OpenRTM-aist (Java) and set RTM_JAVA_ROOT"
             echo "  ex. export RTM_JAVA_ROOT=/usr/include/openrtm-1.1/"
             echo ""
-            exit 1
+            return 1
         fi
     fi
 
@@ -154,10 +159,11 @@
         echo "Please set RTM_JAVA_ROOT correctly."
         echo "  ex. export RTM_JAVA_ROOT=/usr/include/openrtm-1.1/"
         echo ""
-        exit 1
+        return 1
     fi
     debug_echo "Result: RTM_JAVA_ROOT = " $RTM_JAVA_ROOT
     export RTM_JAVA_ROOT=$RTM_JAVA_ROOT
+    return 0
 }
 
 #------------------------------------------------------------
@@ -196,14 +202,15 @@
 
     if test "x$openrtm_jar" = "x" ; then
         debug_echo "jar file not found"
-        echo "No OpenRTM-aist installation found. Aborting."
-        exit 1
+        echo "No OpenRTM-aist (Java)installation found."
+        return 1
     fi
     debug_echo "jar file found: " $openrtm_jar
 
     RTM_JAVA_ROOT=`dirname $openrtm_jar | sed -e 's/\/jar$//'`
     debug_echo "RTM_JAVA_ROOT: " $RTM_JAVA_ROOT
-    
+    return 0
+
 }
 
 #------------------------------------------------------------
@@ -226,7 +233,7 @@
         echo "If /usr/lib/OpenRTM-aist/1.0/jar/OpenRTM-1.0.0.jar exists,"
         echo "RTM_JAVA_ROOT should be /usr/lib/OpenRTM-aist/1.0"
         echo ""
-        exit 1
+        return 1
     fi
     return 0
 }
@@ -241,9 +248,10 @@
 echo "  RTM_ROOT     : " $RTM_ROOT
 echo "  RTM_JAVA_ROOT: " $RTM_JAVA_ROOT
 
-if test ! -x $SCRIPT_DIR/eclipse ; then
+cd $SCRIPT_DIR
+if test ! -x eclipse ; then
     echo "No eclipse executable found. Aborting."
     exit 1
 fi
 export GDK_NATIVE_WINDOWS=1
-$SCRIPT_DIR/eclipse $*
+./eclipse $*