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/03/10 20:21:06 UTC
[3/4] incubator-mynewt-newt git commit: Don't verify target until it
needs to be used.
Don't verify target until it needs to be used.
This fixes problems for new targets that weren't fully populated yet.
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/85b2ef99
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/tree/85b2ef99
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/diff/85b2ef99
Branch: refs/heads/develop
Commit: 85b2ef9910877cb5987079485a78a3413821fcfb
Parents: 46ad0a2
Author: Christopher Collins <cc...@gmail.com>
Authored: Thu Mar 10 11:19:54 2016 -0800
Committer: Christopher Collins <cc...@gmail.com>
Committed: Thu Mar 10 11:19:54 2016 -0800
----------------------------------------------------------------------
newt/builder/build.go | 23 +++++++++--------------
newt/target/target.go | 33 +++++++++++++++++++++++++++++----
2 files changed, 38 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/85b2ef99/newt/builder/build.go
----------------------------------------------------------------------
diff --git a/newt/builder/build.go b/newt/builder/build.go
index fe87ab1..aa85c17 100644
--- a/newt/builder/build.go
+++ b/newt/builder/build.go
@@ -405,20 +405,13 @@ func (b *Builder) PrepBuild() error {
}
func (b *Builder) Build() error {
- if b.target.App() == nil {
- if b.target.AppName == "" {
- return util.NewNewtError("App package not specified by target " +
- "(target.app)")
- } else {
- return util.NewNewtError("App package not found: " +
- b.target.AppName)
- }
+ if err := b.target.Validate(true); err != nil {
+ return err
}
// Populate the package and feature sets and calculate the base compiler
// flags.
- err := b.PrepBuild()
- if err != nil {
+ if err := b.PrepBuild(); err != nil {
return err
}
@@ -426,14 +419,12 @@ func (b *Builder) Build() error {
// don't currently check this.
for _, bpkg := range b.Packages {
- err = b.buildPackage(bpkg)
- if err != nil {
+ if err := b.buildPackage(bpkg); err != nil {
return err
}
}
- err = b.link(b.AppElfPath())
- if err != nil {
+ if err := b.link(b.AppElfPath()); err != nil {
return err
}
@@ -441,6 +432,10 @@ func (b *Builder) Build() error {
}
func (b *Builder) Test(p *pkg.LocalPackage) error {
+ if err := b.target.Validate(false); err != nil {
+ return err
+ }
+
// Seed the builder with the package under test.
testBpkg := b.AddPackage(p)
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/85b2ef99/newt/target/target.go
----------------------------------------------------------------------
diff --git a/newt/target/target.go b/newt/target/target.go
index 96eeb6b..098530e 100644
--- a/newt/target/target.go
+++ b/newt/target/target.go
@@ -85,10 +85,6 @@ func (target *Target) Load(basePkg *pkg.LocalPackage) error {
target.AppName = target.Vars["target.app"]
target.BuildProfile = target.Vars["target.build_profile"]
- if target.BspName == "" {
- return util.NewNewtError("Target does not specify a BSP package " +
- "(target.bsp)")
- }
if target.BuildProfile == "" {
target.BuildProfile = DEFAULT_BUILD_PROFILE
}
@@ -102,6 +98,35 @@ func (target *Target) Load(basePkg *pkg.LocalPackage) error {
return nil
}
+func (target *Target) Validate(appRequired bool) error {
+ if target.BspName == "" {
+ return util.NewNewtError("Target does not specify a BSP package " +
+ "(target.bsp)")
+ }
+ bsp := target.resolvePackageName(target.BspName)
+ if bsp.Type() != pkg.PACKAGE_TYPE_BSP {
+ return util.FmtNewtError("bsp package (%s) is not of "+
+ "type bsp; type is: %s\n", bsp.Name(),
+ pkg.PackageTypeNames[bsp.Type()])
+ }
+
+ if appRequired {
+ if target.AppName == "" {
+ return util.NewNewtError("Target does not specify an app " +
+ "package (target.bsp)")
+ }
+
+ app := target.resolvePackageName(target.AppName)
+ if app.Type() != pkg.PACKAGE_TYPE_APP {
+ return util.FmtNewtError("target.app package (%s) is not of "+
+ "type app; type is: %s\n", app.Name(),
+ pkg.PackageTypeNames[app.Type()])
+ }
+ }
+
+ return nil
+}
+
func (target *Target) Package() *pkg.LocalPackage {
return target.basePkg
}