From bee63ce4ff15b8d48a0ee6fa9d902775f86fa1a1 Mon Sep 17 00:00:00 2001 From: Ethan Frey Date: Mon, 15 May 2017 19:13:49 +0200 Subject: [PATCH] Cleaned up build process, moved codegen to separate package in go-wire --- Makefile | 7 ++++--- _gen.go | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index d453f7ad1..ca9703399 100644 --- a/Makefile +++ b/Makefile @@ -25,11 +25,12 @@ ensure_tools: go get $(GOTOOLS) prepgen: install - cd ../go-wire && make tools go install ./vendor/github.com/btcsuite/btcutil/base58 go install ./vendor/github.com/stretchr/testify/assert go install ./vendor/github.com/stretchr/testify/require go install ./vendor/golang.org/x/crypto/bcrypt -codegen: prepgen - gen +codegen: + @echo "--> regenerating all interface wrappers" + @gen + @echo "Done!" diff --git a/_gen.go b/_gen.go index 36e39887f..a98feaf4e 100644 --- a/_gen.go +++ b/_gen.go @@ -1,7 +1,6 @@ package main import ( - _ "github.com/tendermint/go-wire/data" + _ "github.com/tendermint/go-wire/gen" _ "github.com/clipperhouse/stringer" - _ "github.com/clipperhouse/set" )