diff options
| author | Anton Evangelatov <anton.evangelatov@gmail.com> | 2018-07-30 16:56:40 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2018-07-30 16:56:40 +0800 |
| commit | a5d5609e3810fd161e55950eb44d8314e3f1e169 (patch) | |
| tree | 1b387f33124da896bd19430dc1dfda882abd101f /cmd/swarm | |
| parent | 93c0f1715d1ce6e590811a659d20f0e80277ba6a (diff) | |
| download | go-tangerine-a5d5609e3810fd161e55950eb44d8314e3f1e169.tar go-tangerine-a5d5609e3810fd161e55950eb44d8314e3f1e169.tar.gz go-tangerine-a5d5609e3810fd161e55950eb44d8314e3f1e169.tar.bz2 go-tangerine-a5d5609e3810fd161e55950eb44d8314e3f1e169.tar.lz go-tangerine-a5d5609e3810fd161e55950eb44d8314e3f1e169.tar.xz go-tangerine-a5d5609e3810fd161e55950eb44d8314e3f1e169.tar.zst go-tangerine-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/swarm')
| -rw-r--r-- | cmd/swarm/config.go | 2 | ||||
| -rw-r--r-- | cmd/swarm/main.go | 7 |
2 files changed, 4 insertions, 5 deletions
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) } |