[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r26870 - in gnunet-java-ext: . bin config src/org/gnunet/ex
From: |
gnunet |
Subject: |
[GNUnet-SVN] r26870 - in gnunet-java-ext: . bin config src/org/gnunet/ext |
Date: |
Sun, 14 Apr 2013 21:09:29 +0200 |
Author: dold
Date: 2013-04-14 21:09:29 +0200 (Sun, 14 Apr 2013)
New Revision: 26870
Added:
gnunet-java-ext/build.gradle
Removed:
gnunet-java-ext/envcfg
gnunet-java-ext/tools/
Modified:
gnunet-java-ext/README
gnunet-java-ext/bin/gnunet-ext
gnunet-java-ext/bin/gnunet-greeting
gnunet-java-ext/bin/gnunet-service-greeting
gnunet-java-ext/config/greeting.conf
gnunet-java-ext/src/org/gnunet/ext/GreetingService.java
Log:
updated extension template build system
Modified: gnunet-java-ext/README
===================================================================
--- gnunet-java-ext/README 2013-04-14 18:45:55 UTC (rev 26869)
+++ gnunet-java-ext/README 2013-04-14 19:09:29 UTC (rev 26870)
@@ -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.
Modified: gnunet-java-ext/bin/gnunet-ext
===================================================================
--- gnunet-java-ext/bin/gnunet-ext 2013-04-14 18:45:55 UTC (rev 26869)
+++ gnunet-java-ext/bin/gnunet-ext 2013-04-14 19:09:29 UTC (rev 26870)
@@ -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 "$@"
Modified: gnunet-java-ext/bin/gnunet-greeting
===================================================================
--- gnunet-java-ext/bin/gnunet-greeting 2013-04-14 18:45:55 UTC (rev 26869)
+++ gnunet-java-ext/bin/gnunet-greeting 2013-04-14 19:09:29 UTC (rev 26870)
@@ -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 "$@"
Modified: gnunet-java-ext/bin/gnunet-service-greeting
===================================================================
--- gnunet-java-ext/bin/gnunet-service-greeting 2013-04-14 18:45:55 UTC (rev
26869)
+++ gnunet-java-ext/bin/gnunet-service-greeting 2013-04-14 19:09:29 UTC (rev
26870)
@@ -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 "$@"
Added: gnunet-java-ext/build.gradle
===================================================================
--- gnunet-java-ext/build.gradle (rev 0)
+++ gnunet-java-ext/build.gradle 2013-04-14 19:09:29 UTC (rev 26870)
@@ -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/")
+}
+
Modified: gnunet-java-ext/config/greeting.conf
===================================================================
--- gnunet-java-ext/config/greeting.conf 2013-04-14 18:45:55 UTC (rev
26869)
+++ gnunet-java-ext/config/greeting.conf 2013-04-14 19:09:29 UTC (rev
26870)
@@ -1,3 +1,4 @@
+# this is an example configuration for the greeting service
[greeting]
PORT = 3001
HOSTNAME = localhost
Deleted: gnunet-java-ext/envcfg
===================================================================
--- gnunet-java-ext/envcfg 2013-04-14 18:45:55 UTC (rev 26869)
+++ gnunet-java-ext/envcfg 2013-04-14 19:09:29 UTC (rev 26870)
@@ -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/"
Modified: gnunet-java-ext/src/org/gnunet/ext/GreetingService.java
===================================================================
--- gnunet-java-ext/src/org/gnunet/ext/GreetingService.java 2013-04-14
18:45:55 UTC (rev 26869)
+++ gnunet-java-ext/src/org/gnunet/ext/GreetingService.java 2013-04-14
19:09:29 UTC (rev 26870)
@@ -28,8 +28,8 @@
@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(";"));
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r26870 - in gnunet-java-ext: . bin config src/org/gnunet/ext,
gnunet <=