diff options
| author | Shulhan <ms@kilabit.info> | 2018-06-05 06:09:05 +0700 |
|---|---|---|
| committer | Shulhan <ms@kilabit.info> | 2018-06-05 06:09:05 +0700 |
| commit | 85e948e20fccd93fb34ea957e6d1a16a68b0d40d (patch) | |
| tree | 0791fd2471bcfd40d64cdeafa5274fe45bd2a8c2 | |
| parent | 8531bb7fbccca925da155343e2bddfa45fda3fc9 (diff) | |
| download | beku-85e948e20fccd93fb34ea957e6d1a16a68b0d40d.tar.xz | |
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.
| -rw-r--r-- | buildcmd.go | 11 | ||||
| -rw-r--r-- | env.go | 9 | ||||
| -rw-r--r-- | 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"} ) @@ -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) @@ -342,9 +342,6 @@ func (pkg *Package) ScanBuild() (cmd buildMode) { cmd |= buildModeGdm continue } - if fis[x].Name() == buildFileMake { - cmd |= buildModeMake - } } return |
