Merge pull request #45 from talregev/indigo

fix bug in Catkin packeges.

Author: stonier

build.gradle

@@ -14,9 +14,7 @@
  * the License.
  */
 
-task wrapper(type: Wrapper) {
-  gradleVersion = '2.2.1'
-}
+apply from: project.file('gradle.gradle')
 
 allprojects {
   group="org.ros.rosjava_bootstrap"

buildscript.gradle

@@ -15,38 +15,35 @@
  */
 
 rootProject.buildscript {
-  String rosMavenPath = System.getenv("ROS_MAVEN_PATH")
-  String rosMavenRepository = System.getenv("ROS_MAVEN_REPOSITORY")
-
-  repositories {
-    if (rosMavenPath != null) {
-      rosMavenPath.tokenize(":").each { path ->
+    String rosMavenPath = System.getenv("ROS_MAVEN_PATH")
+    String rosMavenRepository = System.getenv("ROS_MAVEN_REPOSITORY")
+    repositories {
+        if (rosMavenPath != null) {
+            rosMavenPath.tokenize(":").each { path ->
+                maven {
+                    // We can't use uri() here because we aren't running inside something
+                    // that implements the Script interface.
+                    url "file:${path}"
+                }
+            }
+        }
         maven {
-          // We can't use uri() here because we aren't running inside something
-          // that implements the Script interface.
-          url "file:${path}"
+            url "http://repository.springsource.com/maven/bundles/release"
         }
-      }
-    }
-    maven {
-      url "http://repository.springsource.com/maven/bundles/release"
-    }
-    maven {
-      url "http://repository.springsource.com/maven/bundles/external"
+        maven {
+            url "http://repository.springsource.com/maven/bundles/external"
+        }
+        if (rosMavenRepository != null) {
+            maven {
+                url rosMavenRepository
+            }
+        }
+        maven {
+            url "https://github.com/rosjava/rosjava_mvn_repo/raw/master"
+        }
+        mavenCentral()
     }
-    if (rosMavenRepository != null) {
-      maven {
-        url rosMavenRepository
-      }
-    } else {
-      maven {
-        url "https://github.com/rosjava/rosjava_mvn_repo/raw/master"
-      }
+    dependencies {
+        classpath "org.ros.rosjava_bootstrap:gradle_plugins:[0.2,0.3)"
     }
-    mavenCentral()
-  }
-
-  dependencies {
-    classpath "org.ros.rosjava_bootstrap:gradle_plugins:[0.2,0.3)"
-  }
 }

gradle.gradle

@@ -0,0 +1,5 @@
+task wrapper(type: Wrapper) {
+    gradleVersion = '2.2.1'
+}
+
+

gradle_plugins/src/main/groovy/org/ros/gradle_plugins/CatkinPlugin.groovy

@@ -93,7 +93,7 @@ class CatkinPackages {
         def manifestTree = project.fileTree(dir: workspace,
                                             include: "**/package.xml")
         manifestTree.each { file -> 
-          def pkg = new CatkinPackage(file)
+          def pkg = new CatkinPackage(project, file)
           if(this.pkgs.containsKey(pkg.name)) {
             if(this.pkgs[pkg.name].version < pkg.version) {
               println("Catkin generate tree: replacing older version of " + pkg.name + "[" + this.pkgs[pkg.name].version + "->" + pkg.version + "]") 

maven.gradle

@@ -0,0 +1,35 @@
+rootProject.allprojects {
+    String rosMavenPath = System.getenv("ROS_MAVEN_PATH")
+    String rosMavenRepository = System.getenv("ROS_MAVEN_REPOSITORY")
+    repositories {
+        if (rosMavenPath != null) {
+            rosMavenPath.tokenize(":").each { path ->
+                //noinspection GroovyAssignabilityCheck
+                maven {
+                    // We can't use uri() here because we aren't running inside something
+                    // that implements the Script interface.
+                    url "file:${path}"
+                }
+            }
+        }
+        //noinspection GroovyAssignabilityCheck
+        maven {
+            url "http://repository.springsource.com/maven/bundles/release"
+        }
+        //noinspection GroovyAssignabilityCheck
+        maven {
+            url "http://repository.springsource.com/maven/bundles/external"
+        }
+        if (rosMavenRepository != null) {
+            //noinspection GroovyAssignabilityCheck
+            maven {
+                url rosMavenRepository
+            }
+        }
+        //noinspection GroovyAssignabilityCheck
+        maven {
+            url "https://github.com/rosjava/rosjava_mvn_repo/raw/master"
+        }
+        mavenCentral()
+    }
+}