Support for new repo layout: fw/platforms -> platforms

Maintains compatibility with old layout.

CL: mos: Support for new repo layout: fw/platforms -> platforms

PUBLISHED_FROM=72ed329a5c67e7dd98d1bad529e26b72f1d968b1

Author: Deomid Ryabkov

mos/build_local.go

@@ -240,7 +240,6 @@ func buildLocal2(ctx context.Context, bParams *buildParams, clean bool) (err err
 
 	var errs error
 	for k, v := range map[string]string{
-		"MGOS_PATH":      dockerMgosPath,
 		"PLATFORM":       manifest.Platform,
 		"BUILD_DIR":      objsDirDocker,
 		"FW_DIR":         fwDirDocker,
@@ -278,9 +277,9 @@ func buildLocal2(ctx context.Context, bParams *buildParams, clean bool) (err err
 		return errors.Trace(err)
 	}
 
+	makeFilePath := moscommon.GetPlatformMakefilePath(fp.MosDirEffective, manifest.Platform)
 	makeVarsFileSupported := false
-	if data, err := ioutil.ReadFile(
-		moscommon.GetPlatformMakefilePath(fp.MosDirEffective, manifest.Platform)); err == nil {
+	if data, err := ioutil.ReadFile(makeFilePath); err == nil {
 		makeVarsFileSupported = bytes.Contains(data, []byte("MGOS_VARS_FILE"))
 	}
 
@@ -317,6 +316,8 @@ func buildLocal2(ctx context.Context, bParams *buildParams, clean bool) (err err
 		mp.addMountPoint(fp.MosDirEffective, dockerMgosPath)
 		mp.addMountPoint(fp.MosDirEffective, ourutil.GetPathForDocker(fp.MosDirEffective))
 
+		manifest.BuildVars["MGOS_PATH"] = ourutil.GetPathForDocker(fp.MosDirEffective)
+
 		// Mount build dir
 		mp.addMountPoint(buildDirAbs, ourutil.GetPathForDocker(buildDirAbs))
 
@@ -396,6 +397,7 @@ func buildLocal2(ctx context.Context, bParams *buildParams, clean bool) (err err
 
 		makeArgs, err := getMakeArgs(
 			filepath.ToSlash(fmt.Sprintf("%s%s", dockerAppPath, appSubdir)),
+			makeFilePath,
 			bParams.BuildTarget,
 			buildDirAbs,
 			manifest,
@@ -420,7 +422,14 @@ func buildLocal2(ctx context.Context, bParams *buildParams, clean bool) (err err
 
 		manifest.BuildVars["MGOS_PATH"] = fp.MosDirEffective
 
-		makeArgs, err := getMakeArgs(appPath, bParams.BuildTarget, buildDirAbs, manifest, makeVarsFileSupported)
+		makeArgs, err := getMakeArgs(
+			appPath,
+			makeFilePath,
+			bParams.BuildTarget,
+			buildDirAbs,
+			manifest,
+			makeVarsFileSupported,
+		)
 		if err != nil {
 			return errors.Trace(err)
 		}
@@ -468,7 +477,7 @@ func isInDockerToolbox() bool {
 	return os.Getenv("DOCKER_HOST") != ""
 }
 
-func getMakeArgs(dir, target, buildDirAbs string, manifest *build.FWAppManifest, makeVarsFileSupported bool) ([]string, error) {
+func getMakeArgs(dir, makeFilePath, target, buildDirAbs string, manifest *build.FWAppManifest, makeVarsFileSupported bool) ([]string, error) {
 	j := *buildParalellism
 	if j == 0 {
 		j = runtime.NumCPU()
@@ -489,10 +498,7 @@ func getMakeArgs(dir, target, buildDirAbs string, manifest *build.FWAppManifest,
 	makeArgs := []string{
 		"-j", fmt.Sprintf("%d", j),
 		"-C", dir,
-		// NOTE that we use path instead of filepath, because it'll run in a docker
-		// container, and thus will use Linux path separator
-		"-f", ourutil.GetPathForDocker(moscommon.GetPlatformMakefilePath(
-			manifest.BuildVars["MGOS_PATH"], manifest.BuildVars["PLATFORM"])),
+		"-f", ourutil.GetPathForDocker(makeFilePath),
 		target,
 	}
 

mos/common/paths.go

@@ -2,6 +2,7 @@ package moscommon
 
 import (
 	"fmt"
+	"os"
 	"path/filepath"
 
 	flag "github.com/spf13/pflag"
@@ -46,7 +47,23 @@ func GetFilesystemStagingDir(buildDir string) string {
 }
 
 func GetPlatformMakefilePath(mosDir, platform string) string {
-	return filepath.Join(mosDir, "fw", "platforms", platform, "Makefile.build")
+	// New repo layout introduced on 2019/04/29, current release is 2.13.1.
+	oldPath := filepath.Join(mosDir, "fw", "platforms", platform, "Makefile.build")
+	newPath := filepath.Join(mosDir, "platforms", platform, "Makefile.build")
+	if _, err := os.Stat(newPath); err == nil {
+		return newPath
+	}
+	return oldPath
+}
+
+func GetSdkVersionFile(mosDir, platform string) string {
+	// New repo layout introduced on 2019/04/29, current release is 2.13.1.
+	oldPath := filepath.Join(mosDir, "fw", "platforms", platform, "sdk.version")
+	newPath := filepath.Join(mosDir, "platforms", platform, "sdk.version")
+	if _, err := os.Stat(newPath); err == nil {
+		return newPath
+	}
+	return oldPath
 }
 
 func GetBuildCtxFilePath(buildDir string) string {
@@ -104,7 +121,3 @@ func GetBinaryLibFilePath(buildDir, name, variant, version string) string {
 	}
 	return filepath.Join(bld, fmt.Sprintf("lib%s-%s-%s.a", name, variant, version))
 }
-
-func GetSdkVersionFile(mosDir, platform string) string {
-	return filepath.Join(mosDir, "fw", "platforms", platform, "sdk.version")
-}

mos/manifest_parser/manifest_parser.go

@@ -1618,10 +1618,10 @@ func globify(srcPaths []string, globs []string) (sources []string, dirs []string
 }
 
 func getAllSupportedPlatforms(mosDir string) ([]string, error) {
-	paths, err := filepath.Glob(moscommon.GetSdkVersionFile(mosDir, "*"))
-	if err != nil {
-		return nil, errors.Trace(err)
-	}
+	// New repo layout introduced on 2019/04/29, current release is 2.13.1.
+	pathsOld, _ := filepath.Glob(filepath.Join(mosDir, "fw", "platforms", "*", "sdk.version"))
+	pathsNew, _ := filepath.Glob(filepath.Join(mosDir, "platforms", "*", "sdk.version"))
+	paths := append(pathsOld, pathsNew...)
 
 	ret := []string{}