[mynewt-newt] branch master updated: mfg: Make external paths relative to project base

[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 7861c32  mfg: Make external paths relative to project base
7861c32 is described below

commit 7861c323c778cf6c29905dd8f7d2696deb0a1de9
Author: Christopher Collins <cc...@apache.org>
AuthorDate: Mon Mar 2 13:56:59 2020 -0800

    mfg: Make external paths relative to project base
    
    An mfgimage's "raw" section specifies files to embed in the generated
    binary.  Prior to this commit, paths were interpreted as relative to the
    mfgimage package directory.  Now, paths are considered relative to the
    project base.
---
 newt/mfg/build.go | 43 ++++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/newt/mfg/build.go b/newt/mfg/build.go
index 86e1199..e13b93c 100644
--- a/newt/mfg/build.go
+++ b/newt/mfg/build.go
@@ -25,10 +25,8 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
-	"path"
 	"path/filepath"
 	"sort"
-	"strings"
 
 	"github.com/apache/mynewt-artifact/errors"
 	"github.com/apache/mynewt-artifact/flash"
@@ -249,22 +247,35 @@ func newMfgBuildTarget(dt DecodedTarget,
 	}, nil
 }
 
-func newMfgBuildRaw(dr DecodedRaw,
-	fm flashmap.FlashMap, basePath string) (MfgBuildRaw, error) {
+func newMfgBuildRaw(dr DecodedRaw, fm flashmap.FlashMap) (MfgBuildRaw, error) {
+	checkFile := func(filename string) (string, int, error) {
+		abs, err := filepath.Abs(filename)
+		if err != nil {
+			return "", 0, util.FmtNewtError(
+				"failed to determine absolute path of file: path=%s", filename)
+		}
 
-	pathToBase := func(s string) string {
-		if !strings.HasPrefix(s, "/") {
-			s = basePath + "/" + s
+		st, err := os.Stat(abs)
+		if err != nil {
+			return "", 0, errors.Wrapf(err,
+				"failed to determine size of file \"%s\"", abs)
 		}
 
-		return filepath.Clean(s)
+		return abs, int(st.Size()), nil
 	}
 
-	filename := pathToBase(dr.Filename)
+	filename, filesize, err := checkFile(dr.Filename)
+	if err != nil {
+		return MfgBuildRaw{}, err
+	}
 
 	var extraFiles []string
 	for _, ef := range dr.ExtraFiles {
-		extraFiles = append(extraFiles, pathToBase(ef))
+		ename, _, err := checkFile(ef)
+		if err != nil {
+			return MfgBuildRaw{}, err
+		}
+		extraFiles = append(extraFiles, ename)
 	}
 
 	area, err := lookUpArea(fm, dr.Area)
@@ -272,16 +283,10 @@ func newMfgBuildRaw(dr DecodedRaw,
 		return MfgBuildRaw{}, err
 	}
 
-	st, err := os.Stat(filename)
-	if err != nil {
-		return MfgBuildRaw{}, errors.Wrapf(err,
-			"failed to determine size of file \"%s\"", filename)
-	}
-
 	return MfgBuildRaw{
-		Filename:      path.Clean(filename),
+		Filename:      filename,
 		Offset:        dr.Offset,
-		Size:          int(st.Size()),
+		Size:          filesize,
 		Area:          area,
 		ExtraFiles:    extraFiles,
 		ExtraManifest: dr.ExtraManifest,
@@ -439,7 +444,7 @@ func newMfgBuilder(basePkg *pkg.LocalPackage, dm DecodedMfg,
 	}
 
 	for _, dr := range dm.Raws {
-		mbr, err := newMfgBuildRaw(dr, bsp.FlashMap, basePkg.BasePath())
+		mbr, err := newMfgBuildRaw(dr, bsp.FlashMap)
 		if err != nil {
 			return mb, err
 		}