Skip to content
Snippets Groups Projects
Commit 450d2ea9 authored by Daniel Stonier's avatar Daniel Stonier
Browse files

Merge pull request #45 from talregev/indigo

fix bug in Catkin packeges.
parents 5e5f779b 743e9801
Branches
Tags
No related merge requests found
......@@ -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"
......
......@@ -17,7 +17,6 @@
rootProject.buildscript {
String rosMavenPath = System.getenv("ROS_MAVEN_PATH")
String rosMavenRepository = System.getenv("ROS_MAVEN_REPOSITORY")
repositories {
if (rosMavenPath != null) {
rosMavenPath.tokenize(":").each { path ->
......@@ -38,14 +37,12 @@ rootProject.buildscript {
maven {
url rosMavenRepository
}
} else {
}
maven {
url "https://github.com/rosjava/rosjava_mvn_repo/raw/master"
}
}
mavenCentral()
}
dependencies {
classpath "org.ros.rosjava_bootstrap:gradle_plugins:[0.2,0.3)"
}
......
task wrapper(type: Wrapper) {
gradleVersion = '2.2.1'
}
......@@ -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 + "]")
......
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()
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment