[openrtm-commit:01872] r595 - trunk/rtmtools

[openrtm ＠ openrtm.org]

Author: ga
Date: 2016-03-25 19:59:21 +0900 (Fri, 25 Mar 2016)
New Revision: 595

Modified:
   trunk/rtmtools/build_all
   trunk/rtmtools/build_plugins
Log:


Modified: trunk/rtmtools/build_all
===================================================================
--- trunk/rtmtools/build_all	2016-03-20 11:45:34 UTC (rev 594)
+++ trunk/rtmtools/build_all	2016-03-25 10:59:21 UTC (rev 595)
@@ -91,7 +91,7 @@
     jp.go.aist.rtm.systemeditor.nl1"
 
 # Eclipse search directories
-ECLIPSE_DIRS="$HOME/eclipse ../ ../../ ../../ $HOME /usr/lib/ /usr/share"
+ECLIPSE_DIRS="$PWD/../eclipse $HOME/eclipse $HOME /usr/lib/ /usr/share"
 
 #============================================================
 # functions
@@ -175,6 +175,7 @@
             edir=`dirname $e`
             if test -f $edir/eclipse.ini && test -d $edir/plugins ; then
                 export ECLIPSE_HOME="$edir"
+                echo "eclipse found. set ECLIPSE_HOME=$ECLIPSE_HOME."
                 return 0
             fi
         done

Modified: trunk/rtmtools/build_plugins
===================================================================
--- trunk/rtmtools/build_plugins	2016-03-20 11:45:34 UTC (rev 594)
+++ trunk/rtmtools/build_plugins	2016-03-25 10:59:21 UTC (rev 595)
@@ -257,6 +257,7 @@
 do_ant()
 {
     target=$TARGET
+    echo "Do ant target=$TARGET libs=$LIBS"
     for project in $PROJECTS; do
         if test -d $project; then
             echo "- Starting ant build of project: $project"
@@ -320,6 +321,7 @@
 echo "PROJECT_VERSION: $PROJECT_VERSION"
 echo "------------------------------------------------------------"
 
+#LIBS="-lib ../lib -lib $ECLIPSE_HOME/plugins"
 LIBS="-lib ../lib -lib ../lib/a4e-2137 -lib ../lib/a4e-2137/libs -lib $ECLIPSE_HOME/plugins"
 
 cleanup_jardir