Skip to content

Add support for devel workspaces #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dhananjaysathe wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Add support for devel workspaces #37

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4c757d8
add architecture flag, allow for go pkgs to be installed from catkin
hendrik-skubch Aug 21, 2017
2ceec33
golang1.6
hendrik-skubch Aug 22, 2017
7d82f57
clean message, redirect stderr to stdout as catkin will note it as wa…
hendrik-skubch Oct 13, 2017
43ad766
Merge pull request #1 from rapyuta/hs_redirect_stderr
hendrik-skubch Oct 13, 2017
8b5e868
Merge branch 'upstream'
dhananjaysathe Sep 30, 2020
8fcc95f
Add support for using a devel installed packages and messages that ar…
dhananjaysathe Sep 30, 2020
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
33 changes: 19 additions & 14 deletions gengo/context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,30 +30,35 @@ func findPackages(pkgType string, rosPkgPaths []string) (map[string]string, erro
if err != nil {
continue
}
generateMsgs(p, pkgType, pkgs)
for _, f := range files {
if !f.IsDir() {
continue
}
pkgPath := filepath.Join(p, f.Name())
if isRosPackage(pkgPath) {
pkgName := filepath.Base(pkgPath)
msgPath := filepath.Join(pkgPath, pkgType)
msgPaths, err := filepath.Glob(msgPath + fmt.Sprintf("/*.%s", pkgType))
if err != nil {
continue
}
for _, m := range msgPaths {
basename := filepath.Base(m)
rootname := basename[:len(basename)-len(pkgType)-1]
fullname := pkgName + "/" + rootname
pkgs[fullname] = m
}
}
generateMsgs(pkgPath, pkgType, pkgs)
}
}
return pkgs, nil
}

func generateMsgs(pkgPath, pkgType string, pkgs map[string]string) {
if isRosPackage(pkgPath) {
pkgName := filepath.Base(pkgPath)
msgPath := filepath.Join(pkgPath, pkgType)
msgPaths, err := filepath.Glob(msgPath + fmt.Sprintf("/*.%s", pkgType))
if err != nil {
return
}
for _, m := range msgPaths {
basename := filepath.Base(m)
rootname := basename[:len(basename)-len(pkgType)-1]
fullname := pkgName + "/" + rootname
pkgs[fullname] = m
}
}
}

func findAllMessages(rosPkgPaths []string) (map[string]string, error) {
return findPackages("msg", rosPkgPaths)
}
Expand Down