[GNUnet-SVN] r32996 - in gnunet-java-ext: . src/main/java/org/gnunet/construct

[gnunet]

Author: dold
Date: 2014-04-09 16:14:02 +0200 (Wed, 09 Apr 2014)
New Revision: 32996

Modified:
   gnunet-java-ext/build.gradle
   gnunet-java-ext/src/main/java/org/gnunet/construct/MsgMap.txt
Log:
fix message type generation

Modified: gnunet-java-ext/build.gradle
===================================================================
--- gnunet-java-ext/build.gradle        2014-04-09 11:55:05 UTC (rev 32995)
+++ gnunet-java-ext/build.gradle        2014-04-09 14:14:02 UTC (rev 32996)
@@ -23,16 +23,24 @@
 
 compileJava.options.debugOptions.debugLevel = "source,lines,vars"
 
-task msgtypes (type: JavaCompile) {
+
+task createResourcesDir << {
+  def myDir = new File('src/main/resources')  
+  myDir.mkdirs()
+}
+
+task msgtypes (type: JavaCompile, dependsOn: 'createResourcesDir') {
   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"])
+                           // generated "source" files should resources, tell 
the annotation processor!
+                           "-s", "src/main/resources"])
   destinationDir = file("$buildDir/classes/main/")
 }
 
+
 task copyDeps(type: Copy) {
   into "$projectDir/lib"
   from configurations.runtime

Modified: gnunet-java-ext/src/main/java/org/gnunet/construct/MsgMap.txt
===================================================================
--- gnunet-java-ext/src/main/java/org/gnunet/construct/MsgMap.txt       
2014-04-09 11:55:05 UTC (rev 32995)
+++ gnunet-java-ext/src/main/java/org/gnunet/construct/MsgMap.txt       
2014-04-09 14:14:02 UTC (rev 32996)
@@ -1,4 +1,4 @@
+org.gnunet.util.GnunetMessage$Body|42001=org.gnunet.ext.GreetingRequestMessage
 org.gnunet.util.GnunetMessage$Body|42003=org.gnunet.ext.GreetingBannedMessage
 org.gnunet.util.GnunetMessage$Body|42002=org.gnunet.ext.GreetingResponseMessage
-org.gnunet.util.GnunetMessage$Body|42001=org.gnunet.ext.GreetingRequestMessage
-# generated 2012/08/29 02:16:37
+# generated 2014/04/09 16:10:16