You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ma...@apache.org on 2016/09/06 23:12:35 UTC
incubator-mynewt-newt git commit: MYNEWT-309;
search all directories in repository for packages. Top-level ignores
can be added to project.yml file.
Repository: incubator-mynewt-newt
Updated Branches:
refs/heads/develop fa79d0c57 -> 45479e436
MYNEWT-309; search all directories in repository for packages.
Top-level ignores can be added to project.yml file.
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/45479e43
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/tree/45479e43
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/diff/45479e43
Branch: refs/heads/develop
Commit: 45479e436888fa611165580bbd9e1dc9d2fd6f3e
Parents: fa79d0c
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Tue Sep 6 16:10:09 2016 -0700
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Tue Sep 6 16:10:09 2016 -0700
----------------------------------------------------------------------
newt/project/project.go | 77 ++++++++++++++++++++++++++++++--------------
newt/repo/repo.go | 14 ++++++++
2 files changed, 67 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/45479e43/newt/project/project.go
----------------------------------------------------------------------
diff --git a/newt/project/project.go b/newt/project/project.go
index a5575d1..fc6fb00 100644
--- a/newt/project/project.go
+++ b/newt/project/project.go
@@ -22,6 +22,7 @@ package project
import (
"bufio"
"fmt"
+ "io/ioutil"
"os"
"path"
"strings"
@@ -30,6 +31,7 @@ import (
"mynewt.apache.org/newt/newt/downloader"
"mynewt.apache.org/newt/newt/interfaces"
+ "mynewt.apache.org/newt/newt/newtutil"
"mynewt.apache.org/newt/newt/pkg"
"mynewt.apache.org/newt/newt/repo"
"mynewt.apache.org/newt/util"
@@ -40,17 +42,9 @@ var globalProject *Project = nil
const PROJECT_FILE_NAME = "project.yml"
-var PackageSearchDirs []string = []string{
- "apps/",
- "compiler/",
- "drivers/",
- "fs/",
- "libs/",
- "net/",
- "hw/",
- "project/",
- "targets/",
- "sys/",
+var ignoreSearchDirs []string = []string{
+ "bin",
+ "repos",
}
type Project struct {
@@ -69,9 +63,6 @@ type Project struct {
localRepo *repo.Repo
- // Package search directories for this project
- packageSearchDirs []string
-
v *viper.Viper
}
@@ -164,10 +155,6 @@ func (proj *Project) LocalRepo() *repo.Repo {
return proj.localRepo
}
-func (proj *Project) PackageSearchDirs() []string {
- return proj.packageSearchDirs
-}
-
func (proj *Project) upgradeCheck(r *repo.Repo, vers *repo.Version,
force bool) (bool, error) {
rdesc, err := r.GetRepoDesc()
@@ -438,8 +425,12 @@ func (proj *Project) loadConfig() error {
if err != nil {
return err
}
+
proj.repos[r.Name()] = r
proj.localRepo = r
+ for _, ignDir := range ignoreSearchDirs {
+ r.AddIgnoreDir(ignDir)
+ }
rstrs := v.GetStringSlice("project.repositories")
for _, repoName := range rstrs {
@@ -448,9 +439,22 @@ func (proj *Project) loadConfig() error {
}
}
- pkgDirs := v.GetStringSlice("project.pkg_dirs")
- if len(pkgDirs) > 0 {
- proj.packageSearchDirs = append(proj.packageSearchDirs, pkgDirs...)
+ ignoreDirs := v.GetStringSlice("project.ignore_top_dirs")
+ for _, ignDir := range ignoreDirs {
+ repoName, dirName, err := newtutil.ParsePackageString(ignDir)
+ if err != nil {
+ return err
+ }
+ if repoName == "" {
+ r = proj.LocalRepo()
+ } else {
+ r = proj.FindRepo(repoName)
+ }
+ if r == nil {
+ return util.NewNewtError(
+ fmt.Sprintf("ignore_dirs: unknown repo %s", repoName))
+ }
+ r.AddIgnoreDir(dirName)
}
return nil
@@ -463,7 +467,6 @@ func (proj *Project) Init(dir string) error {
interfaces.SetProject(proj)
proj.repos = map[string]*repo.Repo{}
- proj.packageSearchDirs = PackageSearchDirs
// Load Project configuration
if err := proj.loadConfig(); err != nil {
@@ -505,6 +508,29 @@ func findProjectDir(dir string) (string, error) {
return dir, nil
}
+func (proj *Project) repoDirList(repo *repo.Repo) ([]string, error) {
+ list := []string{}
+
+ dirList, err := ioutil.ReadDir(repo.Path())
+ if err != nil {
+ return list, util.NewNewtError(err.Error())
+ }
+ for _, dirEnt := range dirList {
+ if !dirEnt.IsDir() {
+ continue
+ }
+ name := dirEnt.Name()
+ if strings.HasPrefix(name, ".") {
+ continue
+ }
+ if repo.IgnoreDir(name) {
+ continue
+ }
+ list = append(list, name)
+ }
+ return list, nil
+}
+
func (proj *Project) loadPackageList() error {
proj.packages = interfaces.PackageList{}
@@ -512,9 +538,12 @@ func (proj *Project) loadPackageList() error {
// packages / store them in the project package list.
repos := proj.Repos()
for name, repo := range repos {
+ searchDirs, err := proj.repoDirList(repo)
+ if err != nil {
+ continue
+ }
log.Debugf("Loading packages in repository %s", repo.Path())
- list, err := pkg.ReadLocalPackages(repo, repo.Path(),
- proj.PackageSearchDirs())
+ list, err := pkg.ReadLocalPackages(repo, repo.Path(), searchDirs)
if err != nil {
return err
}
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-newt/blob/45479e43/newt/repo/repo.go
----------------------------------------------------------------------
diff --git a/newt/repo/repo.go b/newt/repo/repo.go
index da34fe4..4994f85 100644
--- a/newt/repo/repo.go
+++ b/newt/repo/repo.go
@@ -46,6 +46,7 @@ type Repo struct {
versreq []interfaces.VersionReqInterface
rdesc *RepoDesc
deps []*RepoDependency
+ ignDirs []string
updated bool
}
@@ -72,6 +73,19 @@ func (rd *RepoDependency) Name() string {
return rd.name
}
+func (r *Repo) AddIgnoreDir(ignDir string) {
+ r.ignDirs = append(r.ignDirs, ignDir)
+}
+
+func (r *Repo) IgnoreDir(dir string) bool {
+ for _, idir := range r.ignDirs {
+ if idir == dir {
+ return true
+ }
+ }
+ return false
+}
+
func NewRepoDependency(rname string, verstr string) (*RepoDependency, error) {
var err error