[GNUnet-SVN] r21100 - in gnunet-java-ext: . bin tools

[gnunet]

Author: dold
Date: 2012-04-23 09:42:45 +0200 (Mon, 23 Apr 2012)
New Revision: 21100

Modified:
   gnunet-java-ext/README
   gnunet-java-ext/bin/gnunet-ext
   gnunet-java-ext/tools/build
Log:
fix


Modified: gnunet-java-ext/README
===================================================================
--- gnunet-java-ext/README      2012-04-23 07:42:34 UTC (rev 21099)
+++ gnunet-java-ext/README      2012-04-23 07:42:45 UTC (rev 21100)
@@ -1 +1,4 @@
 Template directory for gnunet extensions.
+
+tools/build: script to build the extension, if it adheres to the default 
folder structure
+tools/update-msgtypes: extract a mapping from message IDs to java classes from 
the source code

Modified: gnunet-java-ext/bin/gnunet-ext
===================================================================
--- gnunet-java-ext/bin/gnunet-ext      2012-04-23 07:42:34 UTC (rev 21099)
+++ gnunet-java-ext/bin/gnunet-ext      2012-04-23 07:42:45 UTC (rev 21100)
@@ -4,7 +4,7 @@
 
 BASEDIR=`dirname $0`/..
 
-source $BASEDIR/extcfg.sh
+source $BASEDIR/envcfg
 
 java -ea -cp 
"$BASEDIR/build/:$BASEDIR/lib/*:$GNUNET_JAVA_CLASSPATH:$GNUNET_JAVA_DEPS/*" 
org.gnunet.ext.MyExt "$@"
 

Modified: gnunet-java-ext/tools/build
===================================================================
--- gnunet-java-ext/tools/build 2012-04-23 07:42:34 UTC (rev 21099)
+++ gnunet-java-ext/tools/build 2012-04-23 07:42:45 UTC (rev 21100)
@@ -5,16 +5,18 @@
 
 BASEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
 
+source $BASEDIR/envcfg
 
-source $BASEDIR/extcfg.sh
+CLASSPATH="$BASEDIR/build/:$BASEDIR/lib/*:$GNUNET_JAVA_CLASSPATH:$GNUNET_JAVA_DEPS"
 
+echo "using classpath $CLASSPATH"
 
 # collect all source files
 SOURCES=`find "$BASEDIR/src/" "$BASEDIR/test/" -name "*.java"`
 
 mkdir -p $BASEDIR/build
 
-javac $JFLAGS -cp 
"$BASEDIR/build/:$BASEDIR/lib/*:$GNUNET_JAVA_CLASSPATH:$GNUNET_JAVA_DEPS" -d 
$BASEDIR/build/ $SOURCES
+javac $JFLAGS -cp $CLASSPATH  -d $BASEDIR/build/ $SOURCES
 
 cd "$BASEDIR/src/"