update for rosjava_bootstrap

README.md

@@ -16,8 +16,7 @@ This doesn't work exactly though because it doesn't pull in the full classpath.
         def generateSourcesTask = p.tasks.create("generateSources", JavaExec)
         generateSourcesTask.description = "Generate sources for " + pkg.name
         generateSourcesTask.outputs.dir(p.file(generatedSourcesDir))
-        /* generateSourcesTask.args = new ArrayList<String>([generatedSourcesDir, pkg.name]) */
-        generateSourcesTask.args = new ArrayList<String>([generatedSourcesDir, '--package-path=' + pkg.directory, pkg.name])
+        generateSourcesTask.args = new ArrayList<String>(['--output-path', generatedSourcesDir, '--package-path', pkg.directory, '--package-names', pkg.name])
         generateSourcesTask.classpath = p.configurations.runtime
         generateSourcesTask.main = 'org.ros.internal.message.GenerateInterfaces'
         p.tasks.compileJava.source generateSourcesTask.outputs.files

package.xml

@@ -1,6 +1,6 @@
 <package>
   <name>genjava</name>
-  <version>0.3.3</version>
+  <version>0.3.4</version>
   <description>
     Java ROS message and service generators.
   </description>

src/genjava/templates/genjava_project/build.gradle.in

@@ -49,7 +49,7 @@ ext {
 task generateSources (type: JavaExec) {
     description = "Generate sources for %(project_name)s"
     outputs.dir(file(generated_sources_directory))
-    args = new ArrayList<String>([generated_sources_directory, '--package-path=%(pkg_directory)s', '%(project_name)s'])
+    args = new ArrayList<String>(['--output-path', generated_sources_directory, '--package-path' ,'%(pkg_directory)s', '--package-names' ,'%(project_name)s'])
     classpath = configurations.runtime
     main = 'org.ros.internal.message.GenerateInterfaces'
     tasks.compileJava.source outputs.files
@@ -61,6 +61,7 @@ dependencies {
 }
 
 jar {
+    from sourceSets.main.output.classesDir
     manifest = osgiManifest {
         classesDir = sourceSets.main.output.classesDir
         classpath = configurations.runtime