highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-11-19 18:48:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

build: remove glide usage to build btcd from Makefile

Browse Source 
We no longer need glide to build btcd as btcd itself now uses go modules
as we do.
This commit is contained in:
Olaoluwa Osuntokun
2018-11-29 20:05:05 -08:00
parent 1fd3aac925
commit 0936aebf1d
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@@ -2,18 +2,15 @@ PKG := github.com/lightningnetwork/lnd
ESCPKG := github.com\/lightningnetwork\/lnd ESCPKG := github.com\/lightningnetwork\/lnd
BTCD_PKG := github.com/btcsuite/btcd BTCD_PKG := github.com/btcsuite/btcd
GLIDE_PKG := github.com/Masterminds/glide
GOVERALLS_PKG := github.com/mattn/goveralls GOVERALLS_PKG := github.com/mattn/goveralls
LINT_PKG := gopkg.in/alecthomas/gometalinter.v2 LINT_PKG := gopkg.in/alecthomas/gometalinter.v2
GO_BIN := ${GOPATH}/bin GO_BIN := ${GOPATH}/bin
BTCD_BIN := $(GO_BIN)/btcd BTCD_BIN := $(GO_BIN)/btcd
GLIDE_BIN := $(GO_BIN)/glide
GOVERALLS_BIN := $(GO_BIN)/goveralls GOVERALLS_BIN := $(GO_BIN)/goveralls
LINT_BIN := $(GO_BIN)/gometalinter.v2 LINT_BIN := $(GO_BIN)/gometalinter.v2
HAVE_BTCD := $(shell command -v $(BTCD_BIN) 2> /dev/null) HAVE_BTCD := $(shell command -v $(BTCD_BIN) 2> /dev/null)
HAVE_GLIDE := $(shell command -v $(GLIDE_BIN) 2> /dev/null)
HAVE_GOVERALLS := $(shell command -v $(GOVERALLS_BIN) 2> /dev/null) HAVE_GOVERALLS := $(shell command -v $(GOVERALLS_BIN) 2> /dev/null)
HAVE_LINTER := $(shell command -v $(LINT_BIN) 2> /dev/null) HAVE_LINTER := $(shell command -v $(LINT_BIN) 2> /dev/null)
@@ -22,7 +19,6 @@ BTCD_DIR :=${GOPATH}/src/$(BTCD_PKG)
COMMIT := $(shell git describe --abbrev=40 --dirty) COMMIT := $(shell git describe --abbrev=40 --dirty)
LDFLAGS := -ldflags "-X $(PKG)/build.Commit=$(COMMIT)" LDFLAGS := -ldflags "-X $(PKG)/build.Commit=$(COMMIT)"
GLIDE_COMMIT := 84607742b10f492430762d038e954236bbaf23f7
BTCD_COMMIT := $(shell cat go.sum | \ BTCD_COMMIT := $(shell cat go.sum | \
grep $(BTCD_PKG) | \ grep $(BTCD_PKG) | \
tail -n1 | \ tail -n1 | \
@@ -32,7 +28,7 @@ BTCD_COMMIT := $(shell cat go.sum | \
GOBUILD := GO111MODULE=on go build -v GOBUILD := GO111MODULE=on go build -v
GOINSTALL := GO111MODULE=on go install -v GOINSTALL := GO111MODULE=on go install -v
GOTEST := go test -v GOTEST := GO111MODULE=on go test -v
GOLIST := go list $(PKG)/... | grep -v '/vendor/' GOLIST := go list $(PKG)/... | grep -v '/vendor/'
GOLISTCOVER := $(shell go list -f '{{.ImportPath}}' ./... | sed -e 's/^$(ESCPKG)/./') GOLISTCOVER := $(shell go list -f '{{.ImportPath}}' ./... | sed -e 's/^$(ESCPKG)/./')
@@ -91,12 +87,6 @@ all: scratch check install
# DEPENDENCIES # DEPENDENCIES
# ============ # ============
$(GLIDE_BIN):
@$(call print, "Fetching glide.")
go get -d $(GLIDE_PKG)
cd ${GOPATH}/src/$(GLIDE_PKG) && ( git checkout $(GLIDE_COMMIT) || ( git fetch --all && git checkout $(GLIDE_COMMIT) ) )
$(GOINSTALL) $(GLIDE_PKG)
$(GOVERALLS_BIN): $(GOVERALLS_BIN):
@$(call print, "Fetching goveralls.") @$(call print, "Fetching goveralls.")
go get -u $(GOVERALLS_PKG) go get -u $(GOVERALLS_PKG)
@@ -109,9 +99,9 @@ $(BTCD_DIR):
@$(call print, "Fetching btcd.") @$(call print, "Fetching btcd.")
go get -d github.com/btcsuite/btcd go get -d github.com/btcsuite/btcd
btcd: $(GLIDE_BIN) $(BTCD_DIR) btcd: $(BTCD_DIR)
@$(call print, "Compiling btcd dependencies.") @$(call print, "Compiling btcd dependencies.")
cd $(BTCD_DIR) && ( git checkout $(BTCD_COMMIT) || ( git fetch --all && git checkout $(BTCD_COMMIT) ) ) && glide install cd $(BTCD_DIR) && ( git checkout $(BTCD_COMMIT) || ( git fetch --all && git checkout $(BTCD_COMMIT) ) )
@$(call print, "Installing btcd and btcctl.") @$(call print, "Installing btcd and btcctl.")
$(GOINSTALL) $(BTCD_PKG) $(GOINSTALL) $(BTCD_PKG)
$(GOINSTALL) $(BTCD_PKG)/cmd/btcctl $(GOINSTALL) $(BTCD_PKG)/cmd/btcctl