Skip to content
This repository was archived by the owner on Jan 14, 2023. It is now read-only.

fixed message generation for local build #62

Open
wants to merge 1 commit into
base: kinetic
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ bin
*.iml
.idea
local.properties
/.nb-gradle/
3 changes: 0 additions & 3 deletions buildscript.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@ rootProject.buildscript {
url rosMavenRepository
}
}
maven {
url "https://github.com/rosjava/rosjava_mvn_repo/raw/master"
}
jcenter()
}
dependencies {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,17 +58,21 @@ class CatkinPlugin implements Plugin<Project> {
}
setTasks()
}
def void setTasks() {
project.task('catkinPackageInfo') << {
println("CatkinPlugin is happy, you should be too.")
println("Catkin Workspaces........." + project.catkin.workspaces)
println("Catkin Packages")
project.catkin.packages.each { pkg ->
print pkg.value.toString()
}
}
}

def void setTasks() {
project.task('catkinPackageInfo') << {
println("CatkinPlugin is happy, you should be too.")
println("Catkin Workspaces........." + project.catkin.workspaces)
println("Catkin Packages")
project.catkin.packages.each { pkg ->
print pkg.value.toString()
}
}
}

}


class CatkinPluginExtension {
CatkinPackage pkg
List<String> workspaces
Expand All @@ -90,8 +94,7 @@ class CatkinPackages {
void generate() {
if (pkgs.size() == 0) {
workspaces.each { workspace ->
def manifestTree = project.fileTree(dir: workspace,
include: "**/package.xml")
def manifestTree = project.fileTree(dir: workspace, include: "**/package.xml")
manifestTree.each { file ->
def pkg = new CatkinPackage(project, file)
if(this.pkgs.containsKey(pkg.name)) {
Expand Down Expand Up @@ -146,7 +149,7 @@ class CatkinPackages {
generateSourcesTask.description = "Generate sources for " + pkg.name
generateSourcesTask.outputs.dir(project.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 = project.configurations.runtime
generateSourcesTask.main = "org.ros.internal.message.GenerateInterfaces"
project.tasks.compileJava.source generateSourcesTask.outputs.files
Expand Down
1 change: 1 addition & 0 deletions message_generation/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ dependencies {
compile 'org.apache.commons:com.springsource.org.apache.commons.io:1.4.0'
compile 'commons-pool:commons-pool:1.6'
compile 'org.apache.commons:com.springsource.org.apache.commons.lang:2.4.0'
compile group: 'args4j', name: 'args4j', version: '2.0.16'
compile project(':gradle_plugins')
testCompile 'junit:junit:4.8.2'
}
Expand Down
Loading