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 02:54:20 UTC

[3/3] incubator-mynewt-newt git commit: Reprocess all packages when a new supported feature is discovered.

Reprocess all packages when a new supported feature is discovered.


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/fb0d66f9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/tree/fb0d66f9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/diff/fb0d66f9

Branch: refs/heads/develop
Commit: fb0d66f93cec3cdcd466fe648e602d139ace7481
Parents: de548fd
Author: Christopher Collins <cc...@gmail.com>
Authored: Wed Mar 9 17:53:40 2016 -0800
Committer: Christopher Collins <cc...@gmail.com>
Committed: Wed Mar 9 17:53:40 2016 -0800

----------------------------------------------------------------------
 newt/builder/build.go        | 15 +++++++++++++--
 newt/builder/buildpackage.go | 14 +++++++++-----
 2 files changed, 22 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/fb0d66f9/newt/builder/build.go
----------------------------------------------------------------------
diff --git a/newt/builder/build.go b/newt/builder/build.go
index 5a9a822..ba0d274 100644
--- a/newt/builder/build.go
+++ b/newt/builder/build.go
@@ -106,12 +106,23 @@ func (b *Builder) loadDeps() error {
 	for {
 		reprocess := false
 		for _, bpkg := range b.Packages {
-			resolved, err := bpkg.Resolve(b)
+			newFeatures, err := bpkg.Resolve(b)
 			if err != nil {
 				return err
 			}
 
-			if !resolved {
+			if newFeatures {
+				// A new supported feature was discovered.  It is impossible to
+				// determine what new dependency and API requirements are
+				// generated as a result.  All packages need to be reprocessed.
+				for _, bpkg := range b.Packages {
+					bpkg.depsResolved = false
+					bpkg.apisSatisfied = false
+				}
+				reprocess = true
+				break
+			}
+			if !bpkg.depsResolved || !bpkg.apisSatisfied {
 				reprocess = true
 			}
 		}

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/fb0d66f9/newt/builder/buildpackage.go
----------------------------------------------------------------------
diff --git a/newt/builder/buildpackage.go b/newt/builder/buildpackage.go
index f12b9a4..cfebdce 100644
--- a/newt/builder/buildpackage.go
+++ b/newt/builder/buildpackage.go
@@ -294,13 +294,17 @@ func (bpkg *BuildPackage) privateIncludeDirs(b *Builder) []string {
 
 // Attempts to resolve all of a build package's dependencies, identities, APIs,
 // and required APIs.  This function should be called repeatedly until the
-// package is fully resolved.
+// package is fully resolved.  If a new supported feature is discovered by this
+// function, all pacakges need to be reprocessed from scratch.
 //
-// @return bool                 true if the package is fully resolved;
-//                              false if another call is required.
+// @return bool                 true if one or more new features was discovered
+//                              false if no new features were discovered
 func (bpkg *BuildPackage) Resolve(b *Builder) (bool, error) {
+	newFeatures := false
 	if !bpkg.depsResolved {
-		features, newFeatures := bpkg.loadFeatures(b)
+		var features map[string]bool
+
+		features, newFeatures = bpkg.loadFeatures(b)
 		newDeps, err := bpkg.loadDeps(b, features)
 		if err != nil {
 			return false, err
@@ -313,7 +317,7 @@ func (bpkg *BuildPackage) Resolve(b *Builder) (bool, error) {
 		bpkg.satisfyApis(b)
 	}
 
-	return bpkg.depsResolved && bpkg.apisSatisfied, nil
+	return newFeatures, nil
 }
 
 func (bp *BuildPackage) Init(pkg *pkg.LocalPackage) {