[mynewt-newt] branch master updated: Include project base in mfg paths

[cc...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ccollins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-newt.git


The following commit(s) were added to refs/heads/master by this push:
     new e3b4e00  Include project base in mfg paths
e3b4e00 is described below

commit e3b4e00790923c6bdbbda573792fa42acc41f4d8
Author: Christopher Collins <cc...@apache.org>
AuthorDate: Wed Oct 30 10:27:24 2019 -0700

    Include project base in mfg paths
    
    The functions in mfg/paths.go were inconsistent.  Some of them returned
    an absolute path including the project base; others were relative to the
    project base.
    
    This commit resolves the inconsistency by making all paths in this
    file absolute.
---
 newt/mfg/emit.go  | 31 ++++++++++++++-----------------
 newt/mfg/paths.go | 32 ++++++++++++++++----------------
 2 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/newt/mfg/emit.go b/newt/mfg/emit.go
index 0093665..498bfb1 100644
--- a/newt/mfg/emit.go
+++ b/newt/mfg/emit.go
@@ -223,28 +223,26 @@ func (me *MfgEmitter) calcCpEntriesTarget(mt MfgEmitTarget, idx int) []CpEntry {
 
 	var binTo string
 	if mt.IsBoot {
-		binTo = MfgTargetBinPath(idx)
+		binTo = MfgTargetBinPath(me.Name, idx)
 	} else {
-		binTo = MfgTargetImgPath(idx)
+		binTo = MfgTargetImgPath(me.Name, idx)
 	}
 
 	entry := CpEntry{
 		From: mt.BinPath,
-		To:   MfgBinDir(me.Name) + "/" + binTo,
+		To:   binTo,
 	}
 	entries = append(entries, entry)
 
 	entry = CpEntry{
 		From: mt.ElfPath,
-		To: MfgBinDir(me.Name) + "/" +
-			MfgTargetElfPath(idx),
+		To:   MfgTargetElfPath(me.Name, idx),
 	}
 	entries = append(entries, entry)
 
 	entry = CpEntry{
 		From: mt.ManifestPath,
-		To: MfgBinDir(me.Name) + "/" +
-			MfgTargetManifestPath(idx),
+		To:   MfgTargetManifestPath(me.Name, idx),
 	}
 	entries = append(entries, entry)
 
@@ -254,8 +252,7 @@ func (me *MfgEmitter) calcCpEntriesTarget(mt MfgEmitTarget, idx int) []CpEntry {
 func (me *MfgEmitter) calcCpEntriesRaw(mr MfgEmitRaw, idx int) []CpEntry {
 	entry := CpEntry{
 		From: mr.Filename,
-		To: MfgBinDir(me.Name) + "/" +
-			MfgRawBinPath(idx),
+		To:   MfgRawBinPath(me.Name, idx),
 	}
 
 	return []CpEntry{entry}
@@ -327,11 +324,11 @@ func (me *MfgEmitter) convertHexImages() ([]string, error) {
 	for i, mt := range me.Targets {
 		var binPath, hexPath string
 		if mt.IsBoot {
-			binPath = MfgBinDir(me.Name) + "/" + MfgTargetBinPath(i)
+			binPath = MfgTargetBinPath(me.Name, i)
 		} else {
-			binPath = MfgBinDir(me.Name) + "/" + MfgTargetImgPath(i)
+			binPath = MfgTargetImgPath(me.Name, i)
 		}
-		hexPath = MfgBinDir(me.Name) + "/" + MfgTargetHexPath(i)
+		hexPath = MfgTargetHexPath(me.Name, i)
 
 		err := me.Compiler.ConvertBinToHex(binPath, hexPath, mt.Offset)
 		if err != nil {
@@ -372,17 +369,17 @@ func (me *MfgEmitter) emitManifest() ([]byte, error) {
 	for i, t := range me.Targets {
 		mmt := manifest.MfgManifestTarget{
 			Name:         t.Name,
-			ManifestPath: MfgTargetManifestPath(i),
+			ManifestPath: MfgTargetManifestPath(me.Name, i),
 			Offset:       t.Offset,
 			Extra:        t.ExtraManifest,
 		}
 
 		if t.IsBoot {
-			mmt.BinPath = MfgTargetBinPath(i)
+			mmt.BinPath = MfgTargetBinPath(me.Name, i)
 		} else {
-			mmt.ImagePath = MfgTargetImgPath(i)
+			mmt.ImagePath = MfgTargetImgPath(me.Name, i)
 		}
-		mmt.HexPath = MfgTargetHexPath(i)
+		mmt.HexPath = MfgTargetHexPath(me.Name, i)
 
 		mm.Targets = append(mm.Targets, mmt)
 	}
@@ -394,7 +391,7 @@ func (me *MfgEmitter) emitManifest() ([]byte, error) {
 			Filename: strings.TrimPrefix(r.Filename, basePath+"/"),
 			Offset:   r.Offset,
 			Size:     r.Size,
-			BinPath:  MfgRawBinPath(i),
+			BinPath:  MfgRawBinPath(me.Name, i),
 			Extra:    r.ExtraManifest,
 		}
 
diff --git a/newt/mfg/paths.go b/newt/mfg/paths.go
index 027ea23..a4684ba 100644
--- a/newt/mfg/paths.go
+++ b/newt/mfg/paths.go
@@ -45,34 +45,34 @@ func MfgManifestPath(mfgPkgName string) string {
 	return MfgBinDir(mfgPkgName) + "/" + mfg.MANIFEST_FILENAME
 }
 
-func MfgTargetDir(targetNum int) string {
-	return fmt.Sprintf("targets/%d", targetNum)
+func MfgTargetDir(mfgPkgName string, targetNum int) string {
+	return fmt.Sprintf("%s/targets/%d", MfgBinDir(mfgPkgName), targetNum)
 }
 
-func MfgRawDir(rawNum int) string {
-	return fmt.Sprintf("raws/%d", rawNum)
+func MfgRawDir(mfgPkgName string, rawNum int) string {
+	return fmt.Sprintf("%s/raws/%d", MfgBinDir(mfgPkgName), rawNum)
 }
 
-func MfgTargetBinPath(targetNum int) string {
-	return fmt.Sprintf("%s/binary.bin", MfgTargetDir(targetNum))
+func MfgTargetBinPath(mfgPkgName string, targetNum int) string {
+	return fmt.Sprintf("%s/binary.bin", MfgTargetDir(mfgPkgName, targetNum))
 }
 
-func MfgTargetImgPath(targetNum int) string {
-	return fmt.Sprintf("%s/image.img", MfgTargetDir(targetNum))
+func MfgTargetImgPath(mfgPkgName string, targetNum int) string {
+	return fmt.Sprintf("%s/image.img", MfgTargetDir(mfgPkgName, targetNum))
 }
 
-func MfgTargetHexPath(targetNum int) string {
-	return fmt.Sprintf("%s/image.hex", MfgTargetDir(targetNum))
+func MfgTargetHexPath(mfgPkgName string, targetNum int) string {
+	return fmt.Sprintf("%s/image.hex", MfgTargetDir(mfgPkgName, targetNum))
 }
 
-func MfgTargetElfPath(targetNum int) string {
-	return fmt.Sprintf("%s/elf.elf", MfgTargetDir(targetNum))
+func MfgTargetElfPath(mfgPkgName string, targetNum int) string {
+	return fmt.Sprintf("%s/elf.elf", MfgTargetDir(mfgPkgName, targetNum))
 }
 
-func MfgTargetManifestPath(targetNum int) string {
-	return fmt.Sprintf("%s/manifest.json", MfgTargetDir(targetNum))
+func MfgTargetManifestPath(mfgPkgName string, targetNum int) string {
+	return fmt.Sprintf("%s/manifest.json", MfgTargetDir(mfgPkgName, targetNum))
 }
 
-func MfgRawBinPath(rawNum int) string {
-	return fmt.Sprintf("%s/raw.bin", MfgRawDir(rawNum))
+func MfgRawBinPath(mfgPkgName string, rawNum int) string {
+	return fmt.Sprintf("%s/raw.bin", MfgRawDir(mfgPkgName, rawNum))
 }