Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
ROS Java Build Tools
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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CeTI
ROS
ROS Java Packages
ROS Java Build Tools
Commits
263c53e7
Commit
263c53e7
authored
10 years ago
by
Daniel Stonier
Browse files
Options
Downloads
Patches
Plain Diff
support variable length list for indexing message packages.
parent
5f5ae8db
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/rosjava_build_tools/catkin.py
+4
-4
4 additions, 4 deletions
src/rosjava_build_tools/catkin.py
with
4 additions
and
4 deletions
src/rosjava_build_tools/catkin.py
+
4
−
4
View file @
263c53e7
...
@@ -27,12 +27,12 @@ def has_build_depend_on_message_generation(package):
...
@@ -27,12 +27,12 @@ def has_build_depend_on_message_generation(package):
return
'
message_generation
'
in
[
d
.
name
for
d
in
package
.
build_depends
]
return
'
message_generation
'
in
[
d
.
name
for
d
in
package
.
build_depends
]
def
index_message_package_dependencies_from_local_environment
(
package_name
=
None
,
package_paths
=
None
):
def
index_message_package_dependencies_from_local_environment
(
package_name
_list
=
[]
,
package_paths
=
None
):
'''
'''
Returns a topologically sorted list of message packages that can
Returns a topologically sorted list of message packages that can
be used for sequencing builds of packages.
be used for sequencing builds of packages.
@param package_name : sort dependencies for th
is
package only (defaults to all
packages if None is given
)
@param package_name
_list
: sort dependencies for th
ese
package
s
only (defaults to all
if empty
)
@param package_paths : a python list of ros workspaces (defaults to ROS_PACKAGE_PATH if None is given)
@param package_paths : a python list of ros workspaces (defaults to ROS_PACKAGE_PATH if None is given)
@return dict mapping relative path to a catkin_pkg.Package
@return dict mapping relative path to a catkin_pkg.Package
'''
'''
...
@@ -47,8 +47,8 @@ def index_message_package_dependencies_from_local_environment(package_name=None,
...
@@ -47,8 +47,8 @@ def index_message_package_dependencies_from_local_environment(package_name=None,
for
package_path
,
package
in
catkin_pkg
.
packages
.
find_packages
(
path
).
items
():
for
package_path
,
package
in
catkin_pkg
.
packages
.
find_packages
(
path
).
items
():
all_packages
[
package
.
name
]
=
(
package_path
,
package
)
all_packages
[
package
.
name
]
=
(
package_path
,
package
)
if
has_build_depend_on_message_generation
(
package
):
if
has_build_depend_on_message_generation
(
package
):
if
package_name
is
not
None
:
if
package_name
_list
:
if
package
_
name
==
package
.
name
:
if
package
.
name
in
package
_
name
_list
:
message_packages
[
package
.
name
]
=
(
package_path
,
package
)
message_packages
[
package
.
name
]
=
(
package_path
,
package
)
else
:
else
:
message_packages
[
package
.
name
]
=
(
package_path
,
package
)
message_packages
[
package
.
name
]
=
(
package_path
,
package
)
...
...
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