diff --git a/Makefile b/Makefile index 3587e8a37..34444d8e7 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,7 @@ GOTOOLS = \ github.com/mitchellh/gox \ - github.com/golang/dep/cmd/dep \ github.com/alecthomas/gometalinter \ - github.com/gogo/protobuf/protoc-gen-gogo \ - github.com/gobuffalo/packr/packr + github.com/gogo/protobuf/protoc-gen-gogo PACKAGES=$(shell go list ./... | grep -v '/vendor/') BUILD_TAGS?=minter BUILD_FLAGS=-ldflags "-s -w -X minter/version.GitCommit=`git rev-parse --short=8 HEAD`" diff --git a/scripts/dist.sh b/scripts/dist.sh index c71b75116..bd934464a 100644 --- a/scripts/dist.sh +++ b/scripts/dist.sh @@ -35,10 +35,10 @@ make get_vendor_deps # ldflags: -s Omit the symbol table and debug information. # -w Omit the DWARF symbol table. echo "==> Building for mac os..." -CGO_ENABLED=1 CGO_LDFLAGS="-lsnappy" go build -tags "minter gcc" -ldflags "-s -w -X ${GIT_IMPORT}.GitCommit=${GIT_COMMIT}" -o "build/pkg/darwin_amd64/minter" ./cmd/minter +CGO_ENABLED=1 go build -tags "minter gcc" -ldflags "-s -w -X ${GIT_IMPORT}.GitCommit=${GIT_COMMIT}" -o "build/pkg/darwin_amd64/minter" ./cmd/minter echo "==> Building for linux in docker" -docker run -t -v ${PWD}:/go/src/github.com/MinterTeam/minter-go-node/ -i minter-builder-1:latest sh -c 'CGO_ENABLED=1 CGO_LDFLAGS="-lsnappy" go build -tags "minter gcc" -ldflags "-s -w -X ${GIT_IMPORT}.GitCommit=${GIT_COMMIT}" -o "build/pkg/linux_amd64/minter" ./cmd/minter/' +docker run -t -v ${PWD}:/go/src/github.com/MinterTeam/minter-go-node/ -i minter-builder-1:latest sh -c 'CGO_ENABLED=1 go build -tags "minter gcc" -ldflags "-s -w -X ${GIT_IMPORT}.GitCommit=${GIT_COMMIT}" -o "build/pkg/linux_amd64/minter" ./cmd/minter/' # Zip all the files. echo "==> Packaging..." diff --git a/scripts/get_tools.sh b/scripts/get_tools.sh index 74f62f8fa..577eb43ab 100755 --- a/scripts/get_tools.sh +++ b/scripts/get_tools.sh @@ -38,7 +38,6 @@ installFromGithub() { installFromGithub pkg/errors ba968bfe8b2f7e042a574c888954fccecfa385b4 installFromGithub joho/godotenv 23d116af351c84513e1946b527c88823e476be13 installFromGithub mitchellh/gox 51ed453898ca5579fea9ad1f08dff6b121d9f2e8 -installFromGithub golang/dep 22125cfaa6ddc71e145b1535d4b7ee9744fefff2 cmd/dep installFromGithub alecthomas/gometalinter 17a7ffa42374937bfecabfb8d2efbd4db0c26741 installFromGithub gogo/protobuf 61dbc136cf5d2f08d68a011382652244990a53a9 protoc-gen-gogo installFromGithub square/certstrap e27060a3643e814151e65b9807b6b06d169580a7