aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorAnton Evangelatov <anton.evangelatov@gmail.com>2018-07-30 16:56:40 +0800
committerPéter Szilágyi <peterke@gmail.com>2018-07-30 16:56:40 +0800
commita5d5609e3810fd161e55950eb44d8314e3f1e169 (patch)
tree1b387f33124da896bd19430dc1dfda882abd101f /cmd
parent93c0f1715d1ce6e590811a659d20f0e80277ba6a (diff)
downloaddexon-a5d5609e3810fd161e55950eb44d8314e3f1e169.tar.gz
dexon-a5d5609e3810fd161e55950eb44d8314e3f1e169.tar.zst
dexon-a5d5609e3810fd161e55950eb44d8314e3f1e169.zip
build: rename swarm deb package to ethereum-swarm; change swarm deb version from 1.8.x to 0.3.x (#16988)
* build: add support for different package and binary names * build: bump up copyright date * build: change default PackageName to empty string * build, internal, swarm: enhance build/release process * build: hack ethereum-swarm as a "depends" in deb package * build/ci: remove redundant variables * build, cmd, mobile, params, swarm: remove VERSION file; rename Version to VersionMeta; * internal: remove VERSION() method which reads VERSION file * build: fix VersionFilePath to Version * Makefile: remove clean_go_build_cache.sh until it works * Makefile: revert removal of clean_go_build_cache.sh
Diffstat (limited to 'cmd')
-rw-r--r--cmd/faucet/faucet.go2
-rw-r--r--cmd/geth/bugcmd.go2
-rw-r--r--cmd/geth/consolecmd_test.go4
-rw-r--r--cmd/geth/misccmd.go2
-rw-r--r--cmd/swarm/config.go2
-rw-r--r--cmd/swarm/main.go7
-rw-r--r--cmd/utils/flags.go2
7 files changed, 10 insertions, 11 deletions
diff --git a/cmd/faucet/faucet.go b/cmd/faucet/faucet.go
index 70fd6d1ab..679906027 100644
--- a/cmd/faucet/faucet.go
+++ b/cmd/faucet/faucet.go
@@ -213,7 +213,7 @@ func newFaucet(genesis *core.Genesis, port int, enodes []*discv5.Node, network u
// Assemble the raw devp2p protocol stack
stack, err := node.New(&node.Config{
Name: "geth",
- Version: params.Version,
+ Version: params.VersionWithMeta,
DataDir: filepath.Join(os.Getenv("HOME"), ".faucet"),
P2P: p2p.Config{
NAT: nat.Any(),
diff --git a/cmd/geth/bugcmd.go b/cmd/geth/bugcmd.go
index 7e9a8ccc7..0adc69d1f 100644
--- a/cmd/geth/bugcmd.go
+++ b/cmd/geth/bugcmd.go
@@ -51,7 +51,7 @@ func reportBug(ctx *cli.Context) error {
fmt.Fprintln(&buff, "#### System information")
fmt.Fprintln(&buff)
- fmt.Fprintln(&buff, "Version:", params.Version)
+ fmt.Fprintln(&buff, "Version:", params.VersionWithMeta)
fmt.Fprintln(&buff, "Go Version:", runtime.Version())
fmt.Fprintln(&buff, "OS:", runtime.GOOS)
printOSDetails(&buff)
diff --git a/cmd/geth/consolecmd_test.go b/cmd/geth/consolecmd_test.go
index 258b9e6dd..8d8b10f8f 100644
--- a/cmd/geth/consolecmd_test.go
+++ b/cmd/geth/consolecmd_test.go
@@ -50,7 +50,7 @@ func TestConsoleWelcome(t *testing.T) {
geth.SetTemplateFunc("goos", func() string { return runtime.GOOS })
geth.SetTemplateFunc("goarch", func() string { return runtime.GOARCH })
geth.SetTemplateFunc("gover", runtime.Version)
- geth.SetTemplateFunc("gethver", func() string { return params.Version })
+ geth.SetTemplateFunc("gethver", func() string { return params.VersionWithMeta })
geth.SetTemplateFunc("niltime", func() string { return time.Unix(0, 0).Format(time.RFC1123) })
geth.SetTemplateFunc("apis", func() string { return ipcAPIs })
@@ -133,7 +133,7 @@ func testAttachWelcome(t *testing.T, geth *testgeth, endpoint, apis string) {
attach.SetTemplateFunc("goos", func() string { return runtime.GOOS })
attach.SetTemplateFunc("goarch", func() string { return runtime.GOARCH })
attach.SetTemplateFunc("gover", runtime.Version)
- attach.SetTemplateFunc("gethver", func() string { return params.Version })
+ attach.SetTemplateFunc("gethver", func() string { return params.VersionWithMeta })
attach.SetTemplateFunc("etherbase", func() string { return geth.Etherbase })
attach.SetTemplateFunc("niltime", func() string { return time.Unix(0, 0).Format(time.RFC1123) })
attach.SetTemplateFunc("ipc", func() bool { return strings.HasPrefix(endpoint, "ipc") })
diff --git a/cmd/geth/misccmd.go b/cmd/geth/misccmd.go
index aa9b1ee56..f62e25478 100644
--- a/cmd/geth/misccmd.go
+++ b/cmd/geth/misccmd.go
@@ -108,7 +108,7 @@ func makedag(ctx *cli.Context) error {
func version(ctx *cli.Context) error {
fmt.Println(strings.Title(clientIdentifier))
- fmt.Println("Version:", params.Version)
+ fmt.Println("Version:", params.VersionWithMeta)
if gitCommit != "" {
fmt.Println("Git Commit:", gitCommit)
}
diff --git a/cmd/swarm/config.go b/cmd/swarm/config.go
index e7c13c7a3..ce2acdcc9 100644
--- a/cmd/swarm/config.go
+++ b/cmd/swarm/config.go
@@ -38,8 +38,6 @@ import (
bzzapi "github.com/ethereum/go-ethereum/swarm/api"
)
-const SWARM_VERSION = "0.3.1-unstable"
-
var (
//flag definition for the dumpconfig command
DumpConfigCommand = cli.Command{
diff --git a/cmd/swarm/main.go b/cmd/swarm/main.go
index d1dbb44df..9185af980 100644
--- a/cmd/swarm/main.go
+++ b/cmd/swarm/main.go
@@ -39,11 +39,11 @@ import (
"github.com/ethereum/go-ethereum/node"
"github.com/ethereum/go-ethereum/p2p"
"github.com/ethereum/go-ethereum/p2p/discover"
- "github.com/ethereum/go-ethereum/params"
"github.com/ethereum/go-ethereum/swarm"
bzzapi "github.com/ethereum/go-ethereum/swarm/api"
swarmmetrics "github.com/ethereum/go-ethereum/swarm/metrics"
"github.com/ethereum/go-ethereum/swarm/tracing"
+ sv "github.com/ethereum/go-ethereum/swarm/version"
"gopkg.in/urfave/cli.v1"
)
@@ -216,7 +216,7 @@ var defaultNodeConfig = node.DefaultConfig
// This init function sets defaults so cmd/swarm can run alongside geth.
func init() {
defaultNodeConfig.Name = clientIdentifier
- defaultNodeConfig.Version = params.VersionWithCommit(gitCommit)
+ defaultNodeConfig.Version = sv.VersionWithCommit(gitCommit)
defaultNodeConfig.P2P.ListenAddr = ":30399"
defaultNodeConfig.IPCPath = "bzzd.ipc"
// Set flag defaults for --help display.
@@ -516,7 +516,8 @@ func main() {
}
func version(ctx *cli.Context) error {
- fmt.Println("Version:", SWARM_VERSION)
+ fmt.Println(strings.Title(clientIdentifier))
+ fmt.Println("Version:", sv.VersionWithMeta)
if gitCommit != "" {
fmt.Println("Git Commit:", gitCommit)
}
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 27e56f109..522ad06b6 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -98,7 +98,7 @@ func NewApp(gitCommit, usage string) *cli.App {
app.Author = ""
//app.Authors = nil
app.Email = ""
- app.Version = params.Version
+ app.Version = params.VersionWithMeta
if len(gitCommit) >= 8 {
app.Version += "-" + gitCommit[:8]
}