Skip to content

Commit

Permalink
Merge pull request #6 from zimmski/allow-to-set-build-tags
Browse files Browse the repository at this point in the history
Allow to set build tags
  • Loading branch information
kisielk committed Aug 14, 2015
2 parents d678387 + 0bab4e8 commit 14d7ad1
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 13 deletions.
30 changes: 18 additions & 12 deletions match.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,13 @@ import (
"strings"
)

var buildContext = build.Default
var DefaultContext = Context{
BuildContext: build.Default,
}

type Context struct {
BuildContext build.Context
}

// matchPattern(pattern)(name) reports whether
// name matches pattern. Pattern is a limited glob
Expand All @@ -59,7 +65,7 @@ func matchPattern(pattern string) func(name string) bool {
}
}

func matchPackages(pattern string) []string {
func (c Context) matchPackages(pattern string) []string {
match := func(string) bool { return true }
if pattern != "all" && pattern != "std" {
match = matchPattern(pattern)
Expand All @@ -68,12 +74,12 @@ func matchPackages(pattern string) []string {
have := map[string]bool{
"builtin": true, // ignore pseudo-package that exists only for documentation
}
if !buildContext.CgoEnabled {
if !c.BuildContext.CgoEnabled {
have["runtime/cgo"] = true // ignore during walk
}
var pkgs []string

for _, src := range buildContext.SrcDirs() {
for _, src := range c.BuildContext.SrcDirs() {
if pattern == "std" && src != gorootSrcPkg {
continue
}
Expand All @@ -100,7 +106,7 @@ func matchPackages(pattern string) []string {
if !match(name) {
return nil
}
_, err = buildContext.ImportDir(path, 0)
_, err = c.BuildContext.ImportDir(path, 0)
if err != nil {
if _, noGo := err.(*build.NoGoError); noGo {
return nil
Expand All @@ -115,7 +121,7 @@ func matchPackages(pattern string) []string {

// importPathsNoDotExpansion returns the import paths to use for the given
// command line, but it does no ... expansion.
func importPathsNoDotExpansion(args []string) []string {
func (c Context) importPathsNoDotExpansion(args []string) []string {
if len(args) == 0 {
return []string{"."}
}
Expand All @@ -138,7 +144,7 @@ func importPathsNoDotExpansion(args []string) []string {
a = path.Clean(a)
}
if a == "all" || a == "std" {
out = append(out, allPackages(a)...)
out = append(out, c.allPackages(a)...)
continue
}
out = append(out, a)
Expand All @@ -147,15 +153,15 @@ func importPathsNoDotExpansion(args []string) []string {
}

// importPaths returns the import paths to use for the given command line.
func importPaths(args []string) []string {
args = importPathsNoDotExpansion(args)
func (c Context) ImportPaths(args []string) []string {
args = c.importPathsNoDotExpansion(args)
var out []string
for _, a := range args {
if strings.Contains(a, "...") {
if build.IsLocalImport(a) {
out = append(out, allPackagesInFS(a)...)
} else {
out = append(out, allPackages(a)...)
out = append(out, c.allPackages(a)...)
}
continue
}
Expand All @@ -168,8 +174,8 @@ func importPaths(args []string) []string {
// under the $GOPATH directories and $GOROOT matching pattern.
// The pattern is either "all" (all packages), "std" (standard packages)
// or a path including "...".
func allPackages(pattern string) []string {
pkgs := matchPackages(pattern)
func (c Context) allPackages(pattern string) []string {
pkgs := c.matchPackages(pattern)
if len(pkgs) == 0 {
fmt.Fprintf(os.Stderr, "warning: %q matched no packages\n", pattern)
}
Expand Down
2 changes: 1 addition & 1 deletion tool.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ package gotool
// The path "std" is expanded to all packages in the Go standard library.
// The string "..." is treated as a wildcard within a path.
func ImportPaths(args []string) []string {
return importPaths(args)
return DefaultContext.ImportPaths(args)
}

0 comments on commit 14d7ad1

Please sign in to comment.