From 85e948e20fccd93fb34ea957e6d1a16a68b0d40d Mon Sep 17 00:00:00 2001 From: Shulhan Date: Tue, 5 Jun 2018 06:09:05 +0700 Subject: Remove make from build command Some package use make to install dependencies and to run integration test. For example, go-redis download redis, compile, and build it. --- buildcmd.go | 11 ++++------- env.go | 9 --------- package.go | 3 --- 3 files changed, 4 insertions(+), 19 deletions(-) diff --git a/buildcmd.go b/buildcmd.go index 62144b1..445a743 100644 --- a/buildcmd.go +++ b/buildcmd.go @@ -9,17 +9,14 @@ type buildMode uint const ( buildModeDep buildMode = 1 << iota buildModeGdm - buildModeMake ) const ( - buildFileDep = "Gopkg.toml" - buildFileGdm = "Godeps" - buildFileMake = "Makefile" + buildFileDep = "Gopkg.toml" + buildFileGdm = "Godeps" ) var ( - buildCmdDep = []string{"dep", "ensure"} - buildCmdGdm = []string{"gdm", "restore"} - buildCmdMake = []string{"make"} + buildCmdDep = []string{"dep", "ensure"} + buildCmdGdm = []string{"gdm", "restore"} ) diff --git a/env.go b/env.go index 02b206f..6b5f1d0 100644 --- a/env.go +++ b/env.go @@ -1348,15 +1348,6 @@ func (env *Env) build(pkg *Package) (err error) { err = nil } - if cmd&buildModeMake > 0 { - err = pkg.Run(buildCmdMake) - if err != nil { - fmt.Fprintf(defStderr, "[ENV] build %s >>> %s\n", - pkg.ImportPath, err.Error()) - err = nil - } - } - if cmd == 0 { // (3) err = pkg.ScanDeps(env) diff --git a/package.go b/package.go index 322dcd9..a429cdc 100644 --- a/package.go +++ b/package.go @@ -342,9 +342,6 @@ func (pkg *Package) ScanBuild() (cmd buildMode) { cmd |= buildModeGdm continue } - if fis[x].Name() == buildFileMake { - cmd |= buildModeMake - } } return -- cgit v1.3