aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShulhan <ms@kilabit.info>2018-07-02 15:55:56 +0700
committerShulhan <ms@kilabit.info>2018-07-02 15:55:56 +0700
commit975f7098685ec40ab74a5f2c4dbd2bd34b06072c (patch)
tree59e5a8b44c43420ad5fb4c3e4869841569195690
parent49ef4ae75f1a3a1d9c8a2daa87f5291604d3ee94 (diff)
downloadbeku-975f7098685ec40ab74a5f2c4dbd2bd34b06072c.tar.xz
Remove gdm from build handle
gdm is not vendor tool, it's using GOPATH, and will conflict with beku.
-rw-r--r--env.go5
-rw-r--r--package.go7
-rw-r--r--vendormode.go3
3 files changed, 1 insertions, 14 deletions
diff --git a/env.go b/env.go
index 861ea20..eb5a8b3 100644
--- a/env.go
+++ b/env.go
@@ -1364,11 +1364,6 @@ func (env *Env) build(pkg *Package) (err error) {
vendorCmdDep = append(vendorCmdDep, "-v")
}
err = pkg.Run(env, vendorCmdDep)
- } else if cmd&vendorModeGdm > 0 {
- if Debug >= DebugL2 {
- vendorCmdGdm = append(vendorCmdGdm, "-v")
- }
- err = pkg.Run(env, vendorCmdGdm)
} else if cmd&vendorModeGovendor > 0 {
err = pkg.Run(env, vendorCmdGovendor)
}
diff --git a/package.go b/package.go
index e2d112e..a08ab60 100644
--- a/package.go
+++ b/package.go
@@ -308,8 +308,8 @@ func (pkg *Package) ScanDeps(env *Env) (err error) {
// ScanBuild files on package root directory. The following build files is
// known by beku,
//
-// * Godeps: gdm
// * Gopkg.toml: dep
+// * vendor/vendor.json: govendor
//
func (pkg *Package) ScanBuild() (cmd vendorMode) {
ok := IsFileExist(pkg.FullPath, vendorFileDep)
@@ -317,11 +317,6 @@ func (pkg *Package) ScanBuild() (cmd vendorMode) {
cmd |= vendorModeDep
return
}
- ok = IsFileExist(pkg.FullPath, vendorFileGdm)
- if ok {
- cmd |= vendorModeGdm
- return
- }
ok = IsFileExist(pkg.FullPath, vendorFileGovendor)
if ok {
cmd |= vendorModeGovendor
diff --git a/vendormode.go b/vendormode.go
index 3a6cbba..1dc54f8 100644
--- a/vendormode.go
+++ b/vendormode.go
@@ -8,18 +8,15 @@ type vendorMode uint
const (
vendorModeDep vendorMode = 1 << iota
- vendorModeGdm
vendorModeGovendor
)
const (
vendorFileDep = "Gopkg.toml"
- vendorFileGdm = "Godeps"
vendorFileGovendor = "vendor/vendor.json"
)
var (
vendorCmdDep = []string{"dep", "ensure"}
- vendorCmdGdm = []string{"gdm", "restore"}
vendorCmdGovendor = []string{"govendor", "sync"}
)