updated extension template build system

10 files changed, 70 insertions, 66 deletions

diff --git a/README b/README
index 06a2112..8d692ef 100644
--- a/README
+++ b/README
@@ -1,4 +1 @@
-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
+Template directory for gnunet extensions written in Java.
diff --git a/bin/gnunet-ext b/bin/gnunet-ext
index 8b9a826..f63f077 100755
--- a/bin/gnunet-ext
+++ b/bin/gnunet-ext
@@ -4,8 +4,7 @@
 
 BASEDIR=`dirname $0`/..
 
-source $BASEDIR/envcfg
-CP="$BASEDIR/build/:$BASEDIR/lib/*:$GNUNET_JAVA_CLASSPATH:$GNUNET_JAVA_DEPS/*"
+CP="$BASEDIR/build-gradle/libs/*:$GNJ_HOME/*:$GNJ_DEPS/*"
 
 java -ea -cp "$CP" org.gnunet.ext.MyExt "$@"
 
diff --git a/bin/gnunet-greeting b/bin/gnunet-greeting
index b814b53..087cc76 100755
--- a/bin/gnunet-greeting
+++ b/bin/gnunet-greeting
@@ -4,7 +4,7 @@
 
 BASEDIR=`dirname $0`/..
 
-source $BASEDIR/envcfg
+CP="$BASEDIR/build-gradle/libs/*:$GNJ_HOME/*:$GNJ_DEPS/*"
 
-java -ea -cp "$BASEDIR/build/:$BASEDIR/lib/*:$GNUNET_JAVA_CLASSPATH:$GNUNET_JAVA_DEPS/*" org.gnunet.ext.GreetingClient "$@"
+java -ea -cp $CP org.gnunet.ext.GreetingClient "$@"
 
diff --git a/bin/gnunet-service-greeting b/bin/gnunet-service-greeting
index 7b2dede..e9c7c1e 100755
--- a/bin/gnunet-service-greeting
+++ b/bin/gnunet-service-greeting
@@ -4,7 +4,7 @@
 
 BASEDIR=`dirname $0`/..
 
-source $BASEDIR/envcfg
+CP="$BASEDIR/build-gradle/libs/*:$GNJ_HOME/*:$GNJ_DEPS/*"
 
-java -ea -cp "$BASEDIR/build/:$BASEDIR/lib/*:$GNUNET_JAVA_CLASSPATH:$GNUNET_JAVA_DEPS/*" org.gnunet.ext.GreetingService "$@"
+java -ea -cp "$CP" org.gnunet.ext.GreetingService "$@"
 
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..c789821
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,61 @@
+/*
+ buildfile for gradle (http://gradle.org/)
+*/
+
+apply plugin: 'java'
+
+buildDir = "$projectDir/build-gradle"
+
+if (null == System.getenv('GNJ_HOME')) {
+  throw new InvalidUserDataException('environment variable GNJ_HOME not set')
+}
+
+if (null == System.getenv('GNJ_DEPS')) {
+  throw new InvalidUserDataException('environment variable GNJ_DEPS not set')
+}
+
+repositories {
+  flatDir {
+    dirs "$System.env.GNJ_HOME", "$System.env.GNJ_DEPS"
+  }
+}
+
+dependencies {
+  compile name: 'gnunet-java'
+  compile name: 'guava', version: '12.0'
+}
+
+sourceSets {
+  main {
+    java {
+      srcDir 'src'
+    }
+    resources {
+      srcDir 'src'
+    }
+  }
+  test {
+    java {
+      srcDir 'test'
+    }
+    resources {
+      srcDir 'test'
+    }
+  }
+}
+
+compileJava.options.debugOptions.debugLevel = "source,lines,vars"
+
+/*
+TODO: should we really use the compile task for this?
+*/
+task msgtypes (type: JavaCompile) {
+  description = "Updates the index of GNUnet message types known to gnunet-java."
+  classpath = project.sourceSets.main.runtimeClasspath
+  source = files(project.sourceSets.main.allJava)
+  options.setCompilerArgs(["-processor", "org.gnunet.construct.MessageIdAnnotationProcessor",
+                           "-proc:only",
+                           "-s", "src"])
+  destinationDir = file("$buildDir/classes/main/")
+}
+
diff --git a/config/greeting.conf b/config/greeting.conf
index d4a01c5..86c93c3 100644
--- a/config/greeting.conf
+++ b/config/greeting.conf
@@ -1,3 +1,4 @@
+# this is an example configuration for the greeting service
 [greeting]
 PORT = 3001
 HOSTNAME = localhost
diff --git a/envcfg b/envcfg
deleted file mode 100755
index ae5e782..0000000
--- a/envcfg
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# location the the gnunet-java-jar
-#GNUNET_JAVA_CLASSPATH=      # e.g. /home/<your-name>/gnunet-java/gnunet-java.jar
-GNUNET_JAVA_CLASSPATH="/home/dold/svn/gnunet-java/gnunet-java.jar"
-
-# location of gnunet-java's lib directory
-#GNUNET_JAVA_DEPS=      # e.g. /home/<your-name>/gnunet-java/lib/
-GNUNET_JAVA_DEPS="/home/dold/svn/gnunet-java/lib/"
diff --git a/src/org/gnunet/ext/GreetingService.java b/src/org/gnunet/ext/GreetingService.java
index 4c917e6..ea68671 100644
--- a/src/org/gnunet/ext/GreetingService.java
+++ b/src/org/gnunet/ext/GreetingService.java
@@ -28,8 +28,8 @@ public class GreetingService {
 
             @Override
             public void run() {
-                final String bannedStr = getConfiguration().getValueString("greeting", "BANNED");
-                final String banMessage = getConfiguration().getValueString("greeting", "BAN_MESSAGE");
+                final String bannedStr = getConfiguration().getValueString("greeting", "BANNED").or("");
+                final String banMessage = getConfiguration().getValueString("greeting", "BAN_MESSAGE").or("banned");
                 final List<String> banned;
                 if (bannedStr != null) {
                     banned = Arrays.asList(bannedStr.split(";"));
diff --git a/tools/build b/tools/build
deleted file mode 100755
index 3ca8a76..0000000
--- a/tools/build
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-# environment variables:
-# $JFLAGS: additional flags passed to the java compiler
-
-BASEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
-
-source $BASEDIR/envcfg
-
-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 $CLASSPATH  -d $BASEDIR/build/ $SOURCES
-
-cd "$BASEDIR/src/"
-
-# collect resources from src/ and copy to build/
-find "." \( -name "*.txt" -o -name "*.properties" \) \
-    -exec cp --parents '{}' "../build" \;
diff --git a/tools/update-msgtypes b/tools/update-msgtypes
deleted file mode 100755
index a294ce5..0000000
--- a/tools/update-msgtypes
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-BASEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
-SOURCES=$( mktemp "/tmp/gnunet-java-sources-XXX" )
-
-source $BASEDIR/envcfg
-
-CP="$BASEDIR/build/:$BASEDIR/lib/*:$GNUNET_JAVA_CLASSPATH:$GNUNET_JAVA_DEPS/*"
-
-# collect all source files
-find $BASEDIR/src/ $BASEDIR/test/ -name "*.java" > $SOURCES
-
-# run annotation processor
-javac -cp $CP -processor org.gnunet.construct.MessageIdAnnotationProcessor -proc:only -s src @$SOURCES
-
-if [ $? ] ; then
-    rm $SOURCES
-else
-    exit 1
-fi