aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShulhan <ms@kilabit.info>2018-06-06 02:01:35 +0700
committerShulhan <ms@kilabit.info>2018-06-06 02:01:35 +0700
commite956e9f2aff7b233138df5484f005db4a7609a89 (patch)
treea9319db7baf8c1fff0269a98c562379b50fd5d84
parent0a2f40a801301a649d53afa9113a451bf9bdc1a6 (diff)
downloadbeku-e956e9f2aff7b233138df5484f005db4a7609a89.tar.xz
Rename "buildXxx" to "vendorXxx"
-rw-r--r--buildcmd.go25
-rw-r--r--env.go16
-rw-r--r--package.go14
-rw-r--r--vendormode.go25
4 files changed, 40 insertions, 40 deletions
diff --git a/buildcmd.go b/buildcmd.go
deleted file mode 100644
index 3bfa9e4..0000000
--- a/buildcmd.go
+++ /dev/null
@@ -1,25 +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 buildMode uint
-
-const (
- buildModeDep buildMode = 1 << iota
- buildModeGdm
- buildModeGovendor
-)
-
-const (
- buildFileDep = "Gopkg.toml"
- buildFileGdm = "Godeps"
- buildFileGovendor = "vendor/vendor.json"
-)
-
-var (
- buildCmdDep = []string{"dep", "ensure"}
- buildCmdGdm = []string{"gdm", "restore"}
- buildCmdGovendor = []string{"govendor", "sync"}
-)
diff --git a/env.go b/env.go
index 7d24054..a43d72b 100644
--- a/env.go
+++ b/env.go
@@ -1358,18 +1358,18 @@ func (env *Env) postSync(pkg *Package) (err error) {
func (env *Env) build(pkg *Package) (err error) {
cmd := pkg.ScanBuild()
- if cmd&buildModeDep > 0 {
+ if cmd&vendorModeDep > 0 {
if Debug >= DebugL2 {
- buildCmdDep = append(buildCmdDep, "-v")
+ vendorCmdDep = append(vendorCmdDep, "-v")
}
- err = pkg.Run(env, buildCmdDep)
- } else if cmd&buildModeGdm > 0 {
+ err = pkg.Run(env, vendorCmdDep)
+ } else if cmd&vendorModeGdm > 0 {
if Debug >= DebugL2 {
- buildCmdGdm = append(buildCmdGdm, "-v")
+ vendorCmdGdm = append(vendorCmdGdm, "-v")
}
- err = pkg.Run(env, buildCmdGdm)
- } else if cmd&buildModeGovendor > 0 {
- err = pkg.Run(env, buildCmdGovendor)
+ err = pkg.Run(env, vendorCmdGdm)
+ } else if cmd&vendorModeGovendor > 0 {
+ err = pkg.Run(env, vendorCmdGovendor)
}
if err != nil {
diff --git a/package.go b/package.go
index db20264..e2d112e 100644
--- a/package.go
+++ b/package.go
@@ -311,20 +311,20 @@ func (pkg *Package) ScanDeps(env *Env) (err error) {
// * Godeps: gdm
// * Gopkg.toml: dep
//
-func (pkg *Package) ScanBuild() (cmd buildMode) {
- ok := IsFileExist(pkg.FullPath, buildFileDep)
+func (pkg *Package) ScanBuild() (cmd vendorMode) {
+ ok := IsFileExist(pkg.FullPath, vendorFileDep)
if ok {
- cmd |= buildModeDep
+ cmd |= vendorModeDep
return
}
- ok = IsFileExist(pkg.FullPath, buildFileGdm)
+ ok = IsFileExist(pkg.FullPath, vendorFileGdm)
if ok {
- cmd |= buildModeGdm
+ cmd |= vendorModeGdm
return
}
- ok = IsFileExist(pkg.FullPath, buildFileGovendor)
+ ok = IsFileExist(pkg.FullPath, vendorFileGovendor)
if ok {
- cmd |= buildModeGovendor
+ cmd |= vendorModeGovendor
}
return
diff --git a/vendormode.go b/vendormode.go
new file mode 100644
index 0000000..3a6cbba
--- /dev/null
+++ b/vendormode.go
@@ -0,0 +1,25 @@
+// 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
+ 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"}
+)