289b30715d
This commit converts the dependency management from Godeps to the vendor folder, also switching the tool from godep to trash. Since the upstream tool lacks a few features proposed via a few PRs, until those PRs are merged in (if), use github.com/karalabe/trash. You can update dependencies via trash --update. All dependencies have been updated to their latest version. Parts of the build system are reworked to drop old notions of Godeps and invocation of the go vet command so that it doesn't run against the vendor folder, as that will just blow up during vetting. The conversion drops OpenCL (and hence GPU mining support) from ethash and our codebase. The short reasoning is that there's noone to maintain and having opencl libs in our deps messes up builds as go install ./... tries to build them, failing with unsatisfied link errors for the C OpenCL deps. golang.org/x/net/context is not vendored in. We expect it to be fetched by the user (i.e. using go get). To keep ci.go builds reproducible the package is "vendored" in build/_vendor.
222 lines
5.5 KiB
Go
222 lines
5.5 KiB
Go
// Copyright 2015 The go-ethereum Authors
|
|
// This file is part of go-ethereum.
|
|
//
|
|
// go-ethereum is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// go-ethereum is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
// Contains the geth command usage template and generator.
|
|
|
|
package main
|
|
|
|
import (
|
|
"io"
|
|
|
|
"github.com/ethereum/go-ethereum/cmd/utils"
|
|
"github.com/ethereum/go-ethereum/internal/debug"
|
|
"gopkg.in/urfave/cli.v1"
|
|
)
|
|
|
|
// AppHelpTemplate is the test template for the default, global app help topic.
|
|
var AppHelpTemplate = `NAME:
|
|
{{.App.Name}} - {{.App.Usage}}
|
|
|
|
Copyright 2013-2016 The go-ethereum Authors
|
|
|
|
USAGE:
|
|
{{.App.HelpName}} [options]{{if .App.Commands}} command [command options]{{end}} {{if .App.ArgsUsage}}{{.App.ArgsUsage}}{{else}}[arguments...]{{end}}
|
|
{{if .App.Version}}
|
|
VERSION:
|
|
{{.App.Version}}
|
|
{{end}}{{if len .App.Authors}}
|
|
AUTHOR(S):
|
|
{{range .App.Authors}}{{ . }}{{end}}
|
|
{{end}}{{if .App.Commands}}
|
|
COMMANDS:
|
|
{{range .App.Commands}}{{join .Names ", "}}{{ "\t" }}{{.Usage}}
|
|
{{end}}{{end}}{{if .FlagGroups}}
|
|
{{range .FlagGroups}}{{.Name}} OPTIONS:
|
|
{{range .Flags}}{{.}}
|
|
{{end}}
|
|
{{end}}{{end}}{{if .App.Copyright }}
|
|
COPYRIGHT:
|
|
{{.App.Copyright}}
|
|
{{end}}
|
|
`
|
|
|
|
// flagGroup is a collection of flags belonging to a single topic.
|
|
type flagGroup struct {
|
|
Name string
|
|
Flags []cli.Flag
|
|
}
|
|
|
|
// AppHelpFlagGroups is the application flags, grouped by functionality.
|
|
var AppHelpFlagGroups = []flagGroup{
|
|
{
|
|
Name: "ETHEREUM",
|
|
Flags: []cli.Flag{
|
|
utils.DataDirFlag,
|
|
utils.KeyStoreDirFlag,
|
|
utils.NetworkIdFlag,
|
|
utils.OlympicFlag,
|
|
utils.TestNetFlag,
|
|
utils.DevModeFlag,
|
|
utils.IdentityFlag,
|
|
utils.FastSyncFlag,
|
|
utils.LightKDFFlag,
|
|
},
|
|
},
|
|
{
|
|
Name: "PERFORMANCE TUNING",
|
|
Flags: []cli.Flag{
|
|
utils.CacheFlag,
|
|
utils.TrieCacheGenFlag,
|
|
},
|
|
},
|
|
{
|
|
Name: "ACCOUNT",
|
|
Flags: []cli.Flag{
|
|
utils.UnlockedAccountFlag,
|
|
utils.PasswordFileFlag,
|
|
},
|
|
},
|
|
{
|
|
Name: "API AND CONSOLE",
|
|
Flags: []cli.Flag{
|
|
utils.RPCEnabledFlag,
|
|
utils.RPCListenAddrFlag,
|
|
utils.RPCPortFlag,
|
|
utils.RPCApiFlag,
|
|
utils.WSEnabledFlag,
|
|
utils.WSListenAddrFlag,
|
|
utils.WSPortFlag,
|
|
utils.WSApiFlag,
|
|
utils.WSAllowedOriginsFlag,
|
|
utils.IPCDisabledFlag,
|
|
utils.IPCApiFlag,
|
|
utils.IPCPathFlag,
|
|
utils.RPCCORSDomainFlag,
|
|
utils.JSpathFlag,
|
|
utils.ExecFlag,
|
|
utils.PreloadJSFlag,
|
|
},
|
|
},
|
|
{
|
|
Name: "NETWORKING",
|
|
Flags: []cli.Flag{
|
|
utils.BootnodesFlag,
|
|
utils.ListenPortFlag,
|
|
utils.MaxPeersFlag,
|
|
utils.MaxPendingPeersFlag,
|
|
utils.NATFlag,
|
|
utils.NoDiscoverFlag,
|
|
utils.NodeKeyFileFlag,
|
|
utils.NodeKeyHexFlag,
|
|
},
|
|
},
|
|
{
|
|
Name: "MINER",
|
|
Flags: []cli.Flag{
|
|
utils.MiningEnabledFlag,
|
|
utils.MinerThreadsFlag,
|
|
utils.AutoDAGFlag,
|
|
utils.EtherbaseFlag,
|
|
utils.TargetGasLimitFlag,
|
|
utils.GasPriceFlag,
|
|
utils.ExtraDataFlag,
|
|
},
|
|
},
|
|
{
|
|
Name: "GAS PRICE ORACLE",
|
|
Flags: []cli.Flag{
|
|
utils.GpoMinGasPriceFlag,
|
|
utils.GpoMaxGasPriceFlag,
|
|
utils.GpoFullBlockRatioFlag,
|
|
utils.GpobaseStepDownFlag,
|
|
utils.GpobaseStepUpFlag,
|
|
utils.GpobaseCorrectionFactorFlag,
|
|
},
|
|
},
|
|
{
|
|
Name: "VIRTUAL MACHINE",
|
|
Flags: []cli.Flag{
|
|
utils.VMEnableJitFlag,
|
|
utils.VMForceJitFlag,
|
|
utils.VMJitCacheFlag,
|
|
},
|
|
},
|
|
{
|
|
Name: "LOGGING AND DEBUGGING",
|
|
Flags: append([]cli.Flag{
|
|
utils.MetricsEnabledFlag,
|
|
utils.FakePoWFlag,
|
|
}, debug.Flags...),
|
|
},
|
|
{
|
|
Name: "EXPERIMENTAL",
|
|
Flags: []cli.Flag{
|
|
utils.WhisperEnabledFlag,
|
|
utils.NatspecEnabledFlag,
|
|
},
|
|
},
|
|
{
|
|
Name: "MISCELLANEOUS",
|
|
Flags: []cli.Flag{
|
|
utils.SolcPathFlag,
|
|
},
|
|
},
|
|
}
|
|
|
|
func init() {
|
|
// Override the default app help template
|
|
cli.AppHelpTemplate = AppHelpTemplate
|
|
|
|
// Define a one shot struct to pass to the usage template
|
|
type helpData struct {
|
|
App interface{}
|
|
FlagGroups []flagGroup
|
|
}
|
|
// Override the default app help printer, but only for the global app help
|
|
originalHelpPrinter := cli.HelpPrinter
|
|
cli.HelpPrinter = func(w io.Writer, tmpl string, data interface{}) {
|
|
if tmpl == AppHelpTemplate {
|
|
// Iterate over all the flags and add any uncategorized ones
|
|
categorized := make(map[string]struct{})
|
|
for _, group := range AppHelpFlagGroups {
|
|
for _, flag := range group.Flags {
|
|
categorized[flag.String()] = struct{}{}
|
|
}
|
|
}
|
|
uncategorized := []cli.Flag{}
|
|
for _, flag := range data.(*cli.App).Flags {
|
|
if _, ok := categorized[flag.String()]; !ok {
|
|
uncategorized = append(uncategorized, flag)
|
|
}
|
|
}
|
|
if len(uncategorized) > 0 {
|
|
// Append all ungategorized options to the misc group
|
|
miscs := len(AppHelpFlagGroups[len(AppHelpFlagGroups)-1].Flags)
|
|
AppHelpFlagGroups[len(AppHelpFlagGroups)-1].Flags = append(AppHelpFlagGroups[len(AppHelpFlagGroups)-1].Flags, uncategorized...)
|
|
|
|
// Make sure they are removed afterwards
|
|
defer func() {
|
|
AppHelpFlagGroups[len(AppHelpFlagGroups)-1].Flags = AppHelpFlagGroups[len(AppHelpFlagGroups)-1].Flags[:miscs]
|
|
}()
|
|
}
|
|
// Render out custom usage screen
|
|
originalHelpPrinter(w, tmpl, helpData{data, AppHelpFlagGroups})
|
|
} else {
|
|
originalHelpPrinter(w, tmpl, data)
|
|
}
|
|
}
|
|
}
|