diff -Nru mos-latest-202206142237+2d81566~impish0/cli/build.go mos-latest-202206192006+4d2161f~impish0/cli/build.go --- mos-latest-202206142237+2d81566~impish0/cli/build.go 2022-06-15 01:14:50.000000000 +0000 +++ mos-latest-202206192006+4d2161f~impish0/cli/build.go 2022-06-25 21:04:29.000000000 +0000 @@ -468,22 +468,6 @@ return ret } -func absPathSlice(slice []string) ([]string, error) { - ret := make([]string, len(slice)) - for i, v := range slice { - var err error - if !filepath.IsAbs(v) { - ret[i], err = filepath.Abs(v) - if err != nil { - return nil, errors.Trace(err) - } - } else { - ret[i] = v - } - } - return ret, nil -} - // manifest_parser.ComponentProvider implementation {{{ type compProviderReal struct { bParams *build.BuildParams diff -Nru mos-latest-202206142237+2d81566~impish0/cli/build_local.go mos-latest-202206192006+4d2161f~impish0/cli/build_local.go --- mos-latest-202206142237+2d81566~impish0/cli/build_local.go 2022-06-15 01:14:51.000000000 +0000 +++ mos-latest-202206192006+4d2161f~impish0/cli/build_local.go 2022-06-25 21:04:29.000000000 +0000 @@ -83,6 +83,29 @@ return strings.Join(append(cflags), " ") } +func absPathSlice(slice []string, checkExist bool) ([]string, error) { + var ret []string + for _, v := range slice { + var err error + if !filepath.IsAbs(v) { + v, err = filepath.Abs(v) + if err != nil { + return nil, errors.Trace(err) + } + } + add := true + if checkExist { + if _, err := os.Stat(v); err != nil { + add = false + } + } + if add { + ret = append(ret, v) + } + } + return ret, nil +} + func buildLocal2(ctx context.Context, bParams *build.BuildParams) (err error) { gitinst := mosgit.NewOurGit(nil) @@ -160,9 +183,7 @@ // Fine case build.ManifestTypeLib: bParams.BuildTarget = moscommon.GetOrigLibArchiveFilePath(buildDir, manifest.Platform) - if manifest.Platform == "esp32" { - *buildCmdExtra = append(*buildCmdExtra, "MGOS_MAIN_COMPONENT=moslib") - } + *buildCmdExtra = append(*buildCmdExtra, "MGOS_MAIN_COMPONENT=moslib") default: return errors.Errorf("invalid project type: %q", manifest.Type) } @@ -208,37 +229,37 @@ } } - appSources, err := absPathSlice(manifest.Sources) + appSources, err := absPathSlice(manifest.Sources, false /* checkExist */) if err != nil { return errors.Trace(err) } - appIncludes, err := absPathSlice(manifest.Includes) + appIncludes, err := absPathSlice(manifest.Includes, true /* checkExist */) if err != nil { return errors.Trace(err) } - appFSFiles, err := absPathSlice(manifest.Filesystem) + appFSFiles, err := absPathSlice(manifest.Filesystem, false /* checkExist */) if err != nil { return errors.Trace(err) } - appBinLibs, err := absPathSlice(manifest.BinaryLibs) + appBinLibs, err := absPathSlice(manifest.BinaryLibs, true /* checkExist */) if err != nil { return errors.Trace(err) } - appSourceDirs, err := absPathSlice(fp.AppSourceDirs) + appSourceDirs, err := absPathSlice(fp.AppSourceDirs, true /* checkExist */) if err != nil { return errors.Trace(err) } - appFSDirs, err := absPathSlice(fp.AppFSDirs) + appFSDirs, err := absPathSlice(fp.AppFSDirs, true /* checkExist */) if err != nil { return errors.Trace(err) } - appBinLibDirs, err := absPathSlice(fp.AppBinLibDirs) + appBinLibDirs, err := absPathSlice(fp.AppBinLibDirs, true /* checkExist */) if err != nil { return errors.Trace(err) } diff -Nru mos-latest-202206142237+2d81566~impish0/cli/common/paths.go mos-latest-202206192006+4d2161f~impish0/cli/common/paths.go --- mos-latest-202206142237+2d81566~impish0/cli/common/paths.go 2022-06-15 01:14:51.000000000 +0000 +++ mos-latest-202206192006+4d2161f~impish0/cli/common/paths.go 2022-06-25 21:04:29.000000000 +0000 @@ -82,7 +82,7 @@ // 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 { + if _, err := os.Stat(newPath); err == nil || platform == "*" { return newPath } return oldPath diff -Nru mos-latest-202206142237+2d81566~impish0/cli/manifest_parser/bindata.go mos-latest-202206192006+4d2161f~impish0/cli/manifest_parser/bindata.go --- mos-latest-202206142237+2d81566~impish0/cli/manifest_parser/bindata.go 2022-06-15 01:14:53.000000000 +0000 +++ mos-latest-202206192006+4d2161f~impish0/cli/manifest_parser/bindata.go 2022-06-25 21:04:32.000000000 +0000 @@ -155,6 +155,21 @@ build_vars: ESP_IDF_EXTRA_COMPONENTS: "" ESP_IDF_SDKCONFIG_OPTS: "" + - when: mos.platform == "esp32c3" + apply: + build_vars: + ESP_IDF_EXTRA_COMPONENTS: "" + ESP_IDF_SDKCONFIG_OPTS: "" + - when: mos.platform == "esp32s2" + apply: + build_vars: + ESP_IDF_EXTRA_COMPONENTS: "" + ESP_IDF_SDKCONFIG_OPTS: "" + - when: mos.platform == "esp32s3" + apply: + build_vars: + ESP_IDF_EXTRA_COMPONENTS: "" + ESP_IDF_SDKCONFIG_OPTS: "" `) func dataRoot_manifestYmlBytes() ([]byte, error) { @@ -167,7 +182,7 @@ return nil, err } - info := bindataFileInfo{name: "data/root_manifest.yml", size: 197, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "data/root_manifest.yml", size: 608, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff -Nru mos-latest-202206142237+2d81566~impish0/cli/manifest_parser/data/root_manifest.yml mos-latest-202206192006+4d2161f~impish0/cli/manifest_parser/data/root_manifest.yml --- mos-latest-202206142237+2d81566~impish0/cli/manifest_parser/data/root_manifest.yml 2022-06-15 01:14:53.000000000 +0000 +++ mos-latest-202206192006+4d2161f~impish0/cli/manifest_parser/data/root_manifest.yml 2022-06-25 21:04:32.000000000 +0000 @@ -9,3 +9,18 @@ build_vars: ESP_IDF_EXTRA_COMPONENTS: "" ESP_IDF_SDKCONFIG_OPTS: "" + - when: mos.platform == "esp32c3" + apply: + build_vars: + ESP_IDF_EXTRA_COMPONENTS: "" + ESP_IDF_SDKCONFIG_OPTS: "" + - when: mos.platform == "esp32s2" + apply: + build_vars: + ESP_IDF_EXTRA_COMPONENTS: "" + ESP_IDF_SDKCONFIG_OPTS: "" + - when: mos.platform == "esp32s3" + apply: + build_vars: + ESP_IDF_EXTRA_COMPONENTS: "" + ESP_IDF_SDKCONFIG_OPTS: "" diff -Nru mos-latest-202206142237+2d81566~impish0/cli/manifest_parser/manifest_parser.go mos-latest-202206192006+4d2161f~impish0/cli/manifest_parser/manifest_parser.go --- mos-latest-202206142237+2d81566~impish0/cli/manifest_parser/manifest_parser.go 2022-06-15 01:14:53.000000000 +0000 +++ mos-latest-202206192006+4d2161f~impish0/cli/manifest_parser/manifest_parser.go 2022-06-25 21:04:32.000000000 +0000 @@ -77,8 +77,6 @@ coreLibName = "core" coreLibLocation = "https://github.com/mongoose-os-libs/core" - - supportedPlatforms = "cc3200 cc3220 esp32 esp8266 rs14100 stm32 ubuntu" ) var ( @@ -2004,7 +2002,11 @@ } func getAllSupportedPlatforms(mosDir string) ([]string, error) { - ret := strings.Split(supportedPlatforms, " ") + var ret []string + sdkVersionFiles, _ := filepath.Glob(moscommon.GetSdkVersionFile(mosDir, "*")) + for _, p := range sdkVersionFiles { + ret = append(ret, filepath.Base(filepath.Dir(p))) + } sort.Strings(ret) return ret, nil } diff -Nru mos-latest-202206142237+2d81566~impish0/debian/changelog mos-latest-202206192006+4d2161f~impish0/debian/changelog --- mos-latest-202206142237+2d81566~impish0/debian/changelog 2022-06-15 01:17:00.000000000 +0000 +++ mos-latest-202206192006+4d2161f~impish0/debian/changelog 2022-06-25 21:06:24.000000000 +0000 @@ -1,8 +1,8 @@ -mos-latest (202206142237+2d81566~impish0) impish; urgency=low +mos-latest (202206192006+4d2161f~impish0) impish; urgency=low * Auto build. - -- Cesanta Bot Wed, 15 Jun 2022 01:17:00 +0000 + -- Cesanta Bot Sat, 25 Jun 2022 21:06:24 +0000 mos-latest (1.0-0) xenial; urgency=medium diff -Nru mos-latest-202206142237+2d81566~impish0/debian/git-build-recipe.manifest mos-latest-202206192006+4d2161f~impish0/debian/git-build-recipe.manifest --- mos-latest-202206142237+2d81566~impish0/debian/git-build-recipe.manifest 2022-06-15 01:17:00.000000000 +0000 +++ mos-latest-202206192006+4d2161f~impish0/debian/git-build-recipe.manifest 2022-06-25 21:06:24.000000000 +0000 @@ -1,4 +1,4 @@ -# git-build-recipe format 0.4 deb-version 202206142237+2d81566~impish0 -/src git-commit:2d815665e4d8a1e53c7386747f9c510652d8fd79 +# git-build-recipe format 0.4 deb-version 202206192006+4d2161f~impish0 +/src git-commit:4d2161f7294eaca31f445e1e09d5e463e114afa6 merge deb-latest https://github.com/mongoose-os/mos.git git-commit:e4fc3d376151b310d43ef9783d266346369489fd run rsync -a /src/vendor/ vendor/