Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
Rosjava Bootstrap Gradle
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CeTI
ROS
ROS Java Packages
Rosjava Bootstrap Gradle
Commits
84c95fbb
Commit
84c95fbb
authored
11 years ago
by
Daniel Stonier
Browse files
Options
Downloads
Patches
Plain Diff
bugfix catkin tree generator, always take latest version of a package.
parent
5bd664d2
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
gradle_plugins/src/main/groovy/org/ros/gradle_plugins/CatkinPlugin.groovy
+8
-2
8 additions, 2 deletions
...rc/main/groovy/org/ros/gradle_plugins/CatkinPlugin.groovy
with
8 additions
and
2 deletions
gradle_plugins/src/main/groovy/org/ros/gradle_plugins/CatkinPlugin.groovy
+
8
−
2
View file @
84c95fbb
...
...
@@ -86,12 +86,18 @@ class CatkinPackages {
def
generate
()
{
if
(
this
.
pkgs
.
size
()
==
0
)
{
println
(
"Catkin plugin is generating the catkin package tree..."
)
this
.
workspaces
.
each
{
workspace
->
def
manifestTree
=
project
.
fileTree
(
dir:
workspace
,
include:
'**/package.xml'
)
manifestTree
.
each
{
file
->
def
pkg
=
new
CatkinPackage
(
file
)
this
.
pkgs
.
put
(
pkg
.
name
,
pkg
)
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
+
"]"
)
this
.
pkgs
[
pkg
.
name
]
=
pkg
}
}
else
{
this
.
pkgs
.
put
(
pkg
.
name
,
pkg
)
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment