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/12/09 19:23:26 UTC
[4/4] incubator-mynewt-newt git commit: newt - Rename "test link" to
"tentative link"
newt - Rename "test link" to "tentative link"
The word "test" was ambiguous:
* Tentative link
* Unit test
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/81d7347e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/tree/81d7347e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/diff/81d7347e
Branch: refs/heads/develop
Commit: 81d7347e84547ce4e4e60e51c5974f9b1ab027ad
Parents: 8aa98e5
Author: Christopher Collins <cc...@apache.org>
Authored: Fri Dec 9 11:08:19 2016 -0800
Committer: Christopher Collins <cc...@apache.org>
Committed: Fri Dec 9 11:14:51 2016 -0800
----------------------------------------------------------------------
newt/builder/build.go | 4 ++--
newt/builder/paths.go | 2 +-
newt/builder/targetbuild.go | 12 ++++++------
3 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/81d7347e/newt/builder/build.go
----------------------------------------------------------------------
diff --git a/newt/builder/build.go b/newt/builder/build.go
index af6a791..546de34 100644
--- a/newt/builder/build.go
+++ b/newt/builder/build.go
@@ -475,8 +475,8 @@ func (b *Builder) KeepLink(
return nil
}
-func (b *Builder) TestLink(linkerScripts []string) error {
- if err := b.link(b.AppTempElfPath(), linkerScripts, nil); err != nil {
+func (b *Builder) TentativeLink(linkerScripts []string) error {
+ if err := b.link(b.AppTentativeElfPath(), linkerScripts, nil); err != nil {
return err
}
return nil
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/81d7347e/newt/builder/paths.go
----------------------------------------------------------------------
diff --git a/newt/builder/paths.go b/newt/builder/paths.go
index 78e6229..0307099 100644
--- a/newt/builder/paths.go
+++ b/newt/builder/paths.go
@@ -127,7 +127,7 @@ func (b *Builder) ArchivePath(bpkg *BuildPackage) string {
return b.PkgBinDir(bpkg) + "/" + filepath.Base(bpkg.Name()) + ".a"
}
-func (b *Builder) AppTempElfPath() string {
+func (b *Builder) AppTentativeElfPath() string {
return b.PkgBinDir(b.appPkg) + "/" + filepath.Base(b.appPkg.Name()) +
"_tmp.elf"
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/81d7347e/newt/builder/targetbuild.go
----------------------------------------------------------------------
diff --git a/newt/builder/targetbuild.go b/newt/builder/targetbuild.go
index 37c06eb..9cfc0fd 100644
--- a/newt/builder/targetbuild.go
+++ b/newt/builder/targetbuild.go
@@ -302,8 +302,8 @@ func (t *TargetBuilder) PrepBuild() error {
}
func (t *TargetBuilder) buildLoader() error {
- /* Link the app as a test (using the normal single image linker script) */
- if err := t.AppBuilder.TestLink(t.bspPkg.LinkerScripts); err != nil {
+ /* Tentatively link the app (using the normal single image linker script) */
+ if err := t.AppBuilder.TentativeLink(t.bspPkg.LinkerScripts); err != nil {
return err
}
@@ -318,8 +318,8 @@ func (t *TargetBuilder) buildLoader() error {
return err
}
- /* perform a test link of the loader */
- if err := t.LoaderBuilder.TestLink(t.bspPkg.LinkerScripts); err != nil {
+ /* Tentatively link the loader */
+ if err := t.LoaderBuilder.TentativeLink(t.bspPkg.LinkerScripts); err != nil {
return err
}
@@ -409,7 +409,7 @@ func (t *TargetBuilder) RelinkLoader() (error, map[string]bool,
}
/* fetch the symbol list from the app temporary elf */
- err, appElfSym := t.AppBuilder.ParseObjectElf(t.AppBuilder.AppTempElfPath())
+ err, appElfSym := t.AppBuilder.ParseObjectElf(t.AppBuilder.AppTentativeElfPath())
if err != nil {
return err, nil, nil
}
@@ -421,7 +421,7 @@ func (t *TargetBuilder) RelinkLoader() (error, map[string]bool,
}
err, loaderElfSym := t.LoaderBuilder.ParseObjectElf(
- t.LoaderBuilder.AppTempElfPath())
+ t.LoaderBuilder.AppTentativeElfPath())
if err != nil {
return err, nil, nil
}