From 28f731601ea6f3899cc38507225efb9768ee6171 Mon Sep 17 00:00:00 2001 From: Alex Peters Date: Fri, 19 Mar 2021 11:52:38 +0100 Subject: [PATCH] Remove deprecated build targets --- Makefile | 44 -------------------------------------------- README.md | 4 +--- 2 files changed, 1 insertion(+), 47 deletions(-) diff --git a/Makefile b/Makefile index d4bcc970053..e191d573fbc 100644 --- a/Makefile +++ b/Makefile @@ -67,34 +67,7 @@ endif ldflags += $(LDFLAGS) ldflags := $(strip $(ldflags)) -coral_ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=coral \ - -X github.com/cosmos/cosmos-sdk/version.AppName=corald \ - -X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \ - -X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \ - -X github.com/CosmWasm/wasmd/app.NodeDir=.corald \ - -X github.com/CosmWasm/wasmd/app.Bech32Prefix=coral \ - -X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)" -# we could consider enabling governance override? -# -X github.com/CosmWasm/wasmd/app.EnableSpecificProposals=MigrateContract,UpdateAdmin,ClearAdmin \ - -coral_ldflags += $(LDFLAGS) -coral_ldflags := $(strip $(coral_ldflags)) - -flex_ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=gaiaflex \ - -X github.com/cosmos/cosmos-sdk/version.AppName=gaiaflexd \ - -X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \ - -X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \ - -X github.com/CosmWasm/wasmd/app.ProposalsEnabled=true \ - -X github.com/CosmWasm/wasmd/app.NodeDir=.gaiaflexd \ - -X github.com/CosmWasm/wasmd/app.Bech32Prefix=cosmos \ - -X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)" - -flex_ldflags += $(LDFLAGS) -flex_ldflags := $(strip $(flex_ldflags)) - BUILD_FLAGS := -tags "$(build_tags_comma_sep)" -ldflags '$(ldflags)' -trimpath -CORAL_BUILD_FLAGS := -tags "$(build_tags_comma_sep)" -ldflags '$(coral_ldflags)' -trimpath -FLEX_BUILD_FLAGS := -tags "$(build_tags_comma_sep)" -ldflags '$(flex_ldflags)' -trimpath # The below include contains the tools and runsim targets. include contrib/devtools/Makefile @@ -108,23 +81,6 @@ else go build -mod=readonly $(BUILD_FLAGS) -o build/wasmd ./cmd/wasmd endif -build-coral: go.sum -ifeq ($(OS),Windows_NT) - exit 1 -else - go build -mod=readonly $(CORAL_BUILD_FLAGS) -o build/corald ./cmd/wasmd -endif - -build-gaiaflex: go.sum -ifeq ($(OS),Windows_NT) - exit 1 -else - go build -mod=readonly $(FLEX_BUILD_FLAGS) -o build/gaiaflexd ./cmd/wasmd -endif - -build-linux: go.sum - LEDGER_ENABLED=false GOOS=linux GOARCH=amd64 $(MAKE) build - build-contract-tests-hooks: ifeq ($(OS),Windows_NT) go build -mod=readonly $(BUILD_FLAGS) -o build/contract_tests.exe ./cmd/contract_tests diff --git a/README.md b/README.md index f2627e914a6..826a6542334 100644 --- a/README.md +++ b/README.md @@ -167,7 +167,7 @@ Available flags: * `-X github.com/CosmWasm/wasmd/app.NodeDir=.corald` - set the config/data directory for the node (default `~/.wasmd`) -* `-X github.com/CosmWasm/wasmd/app.Bech32Prefix=coral` - set the bech32 prefix for all accounts (default `cosmos`) +* `-X github.com/CosmWasm/wasmd/app.Bech32Prefix=coral` - set the bech32 prefix for all accounts (default `wasm`) * `-X github.com/CosmWasm/wasmd/app.ProposalsEnabled=true` - enable all x/wasm governance proposals (default `false`) * `-X github.com/CosmWasm/wasmd/app.EnableSpecificProposals=MigrateContract,UpdateAdmin,ClearAdmin` - enable a subset of the x/wasm governance proposal types (overrides `ProposalsEnabled`) @@ -175,8 +175,6 @@ Available flags: Examples: * [`wasmd`](./Makefile#L50-L55) is a generic, permissionless version using the `cosmos` bech32 prefix -* [`gaiaflex`](./Makefile#L78-L87) is a generic, *permissioned* version using the `cosmos` bech32 prefix -* [`coral`](./Makefile#L63-L71) is a permissionless version designed for a specific testnet, with a `coral` bech32 prefix ## Genesis Configuration