You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2016/11/10 22:38:57 UTC
[45/50] incubator-mynewt-newt git commit: newt - Fix issues with
bsp.yml paths.
newt - Fix issues with bsp.yml paths.
There are two fixes here:
1. Assume relative paths are relative to the repo base dir. Previously,
this was the package base dir.
2. Add the local repo's name to the repo name map. This allows absolute
repo paths to refer to the local repo by name (e.g., you can use
"@apache-mynewt-core/..." when building within the core repo).
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/commit/dd34193d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/tree/dd34193d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/diff/dd34193d
Branch: refs/heads/master
Commit: dd34193d3c31c5d87161343f160981fb8833c23f
Parents: 6434dad
Author: Christopher Collins <cc...@apache.org>
Authored: Wed Nov 9 14:40:30 2016 -0800
Committer: Christopher Collins <cc...@apache.org>
Committed: Wed Nov 9 14:43:03 2016 -0800
----------------------------------------------------------------------
newt/interfaces/interfaces.go | 1 +
newt/pkg/bsp_package.go | 4 ++--
newt/project/project.go | 10 +++++++---
3 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/dd34193d/newt/interfaces/interfaces.go
----------------------------------------------------------------------
diff --git a/newt/interfaces/interfaces.go b/newt/interfaces/interfaces.go
index 602c8bb..08e7e7e 100644
--- a/newt/interfaces/interfaces.go
+++ b/newt/interfaces/interfaces.go
@@ -31,6 +31,7 @@ type PackageType int
type RepoInterface interface {
Name() string
IsLocal() bool
+ Path() string
}
type VersionReqInterface interface {
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/dd34193d/newt/pkg/bsp_package.go
----------------------------------------------------------------------
diff --git a/newt/pkg/bsp_package.go b/newt/pkg/bsp_package.go
index d381da3..572255c 100644
--- a/newt/pkg/bsp_package.go
+++ b/newt/pkg/bsp_package.go
@@ -52,7 +52,7 @@ func (bsp *BspPackage) resolvePathSetting(
if val == "" {
return "", nil
}
- path, err := proj.ResolvePath(bsp.BasePath(), val)
+ path, err := proj.ResolvePath(bsp.Repo().Path(), val)
if err != nil {
return "", util.PreNewtError(err,
"BSP \"%s\" specifies invalid %s setting",
@@ -84,7 +84,7 @@ func (bsp *BspPackage) resolveLinkerScriptSetting(
// Read each linker script from the list.
for _, val := range vals {
- path, err := proj.ResolvePath(bsp.BasePath(), val)
+ path, err := proj.ResolvePath(bsp.Repo().Path(), val)
if err != nil {
return nil, util.PreNewtError(err,
"BSP \"%s\" specifies invalid %s setting",
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/dd34193d/newt/project/project.go
----------------------------------------------------------------------
diff --git a/newt/project/project.go b/newt/project/project.go
index 45f7405..ae2c0e5 100644
--- a/newt/project/project.go
+++ b/newt/project/project.go
@@ -149,8 +149,12 @@ func (proj *Project) Repos() map[string]*repo.Repo {
}
func (proj *Project) FindRepo(rname string) *repo.Repo {
- r, _ := proj.repos[rname]
- return r
+ if rname == repo.REPO_NAME_LOCAL {
+ return proj.LocalRepo()
+ } else {
+ r, _ := proj.repos[rname]
+ return r
+ }
}
func (proj *Project) LocalRepo() *repo.Repo {
@@ -459,7 +463,7 @@ func (proj *Project) loadConfig() error {
return err
}
- proj.repos[r.Name()] = r
+ proj.repos[proj.name] = r
proj.localRepo = r
for _, ignDir := range ignoreSearchDirs {
r.AddIgnoreDir(ignDir)