Repository: incubator-mynewt-newt Updated Branches: refs/heads/develop b50f18caf -> b0a50a688
MYNEWT-577 newt - Windows paths broken again We were stripping the wrong base path from each source path. I am not sure why this only caused problems in Windows. I would have expected this bug to affect all OSes. 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/b0a50a68 Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/tree/b0a50a68 Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/diff/b0a50a68 Branch: refs/heads/develop Commit: b0a50a688d497b6bce46b4e61c6e361533609711 Parents: b50f18c Author: Christopher Collins <[email protected]> Authored: Mon Jan 30 11:22:55 2017 -0800 Committer: Christopher Collins <[email protected]> Committed: Mon Jan 30 11:22:55 2017 -0800 ---------------------------------------------------------------------- newt/toolchain/compiler.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/b0a50a68/newt/toolchain/compiler.go ---------------------------------------------------------------------- diff --git a/newt/toolchain/compiler.go b/newt/toolchain/compiler.go index 566cc87..d2e484c 100644 --- a/newt/toolchain/compiler.go +++ b/newt/toolchain/compiler.go @@ -359,7 +359,7 @@ func (c *Compiler) depsString() string { } func (c *Compiler) dstFilePath(srcPath string) string { - relSrcPath := strings.TrimPrefix(filepath.ToSlash(srcPath), c.srcDir+"/") + relSrcPath := strings.TrimPrefix(filepath.ToSlash(srcPath), c.baseDir+"/") relDstPath := strings.TrimSuffix(relSrcPath, filepath.Ext(srcPath)) dstPath := fmt.Sprintf("%s/%s", c.dstDir, relDstPath) return dstPath
