diff options
| -rw-r--r-- | env.go | 34 | ||||
| -rw-r--r-- | package.go | 17 | ||||
| -rw-r--r-- | vendormode.go | 19 |
3 files changed, 7 insertions, 63 deletions
@@ -1353,38 +1353,18 @@ func (env *Env) postSync(pkg *Package) (err error) { } // -// (3) Re-scan package dependencies. -// (4) Install missing dependencies. +// (1) Re-scan package dependencies. +// (2) Install missing dependencies. // func (env *Env) build(pkg *Package) (err error) { - cmd := pkg.ScanBuild() - - if cmd&vendorModeDep > 0 { - if Debug >= DebugL2 { - vendorCmdDep = append(vendorCmdDep, "-v") - } - err = pkg.Run(env, vendorCmdDep) - } - + // (1) + err = pkg.ScanDeps(env) if err != nil { - fmt.Fprintf(defStderr, "[ENV] build %s >>> %s\n", - pkg.ImportPath, err.Error()) - err = nil + return } - if cmd == 0 { - // (3) - err = pkg.ScanDeps(env) - if err != nil { - return - } - - // (4) - err = env.installMissing(pkg) - if err != nil { - return - } - } + // (2) + err = env.installMissing(pkg) return } @@ -305,23 +305,6 @@ func (pkg *Package) ScanDeps(env *Env) (err error) { } // -// ScanBuild files on package root directory. The following build files is -// known by beku, -// -// * Gopkg.toml: dep -// * vendor/vendor.json: govendor -// -func (pkg *Package) ScanBuild() (cmd vendorMode) { - ok := IsFileExist(pkg.FullPath, vendorFileDep) - if ok { - cmd |= vendorModeDep - return - } - - return -} - -// // GetRecursiveImports will get all import path recursively using `go list` // and return it as slice of string without any duplication. // diff --git a/vendormode.go b/vendormode.go deleted file mode 100644 index f83f0ff..0000000 --- a/vendormode.go +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2018, Shulhan <ms@kilabit.info>. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package beku - -type vendorMode uint - -const ( - vendorModeDep vendorMode = 1 << iota -) - -const ( - vendorFileDep = "Gopkg.toml" -) - -var ( - vendorCmdDep = []string{"dep", "ensure"} -) |