From fd8e6c98b9cc73056f6b819d63a88520f3c565b9 Mon Sep 17 00:00:00 2001 From: "Johan T. Halseth" Date: Wed, 15 Jul 2020 15:36:20 +0200 Subject: [PATCH] make: fetch falafel dependency for mobile-rpc --- Makefile | 9 ++++++++- mobile/gen_bindings.sh | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8080d76d..40f9b232 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,7 @@ BTCD_PKG := github.com/btcsuite/btcd GOVERALLS_PKG := github.com/mattn/goveralls LINT_PKG := github.com/golangci/golangci-lint/cmd/golangci-lint GOACC_PKG := github.com/ory/go-acc +FALAFEL_PKG := github.com/lightninglabs/falafel GO_BIN := ${GOPATH}/bin BTCD_BIN := $(GO_BIN)/btcd @@ -32,6 +33,7 @@ BTCD_COMMIT := $(shell cat go.mod | \ LINT_COMMIT := v1.18.0 GOACC_COMMIT := ddc355013f90fea78d83d3a6c71f1d37ac07ecd5 +FALAFEL_COMMIT := v0.7.1 DEPGET := cd /tmp && GO111MODULE=on go get -v GOBUILD := GO111MODULE=on go build -v @@ -107,6 +109,10 @@ btcd: @$(call print, "Installing btcd.") $(DEPGET) $(BTCD_PKG)@$(BTCD_COMMIT) +falafel: + @$(call print, "Installing falafel.") + $(DEPGET) $(FALAFEL_PKG)@$(FALAFEL_COMMIT) + # ============ # INSTALLATION # ============ @@ -213,7 +219,7 @@ rpc-check: rpc for rpc in $$(find lnrpc/ -name "*.proto" | $(XARGS) awk '/ rpc /{print $$2}'); do if ! grep -q $$rpc lnrpc/rest-annotations.yaml; then echo "RPC $$rpc not added to lnrpc/rest-annotations.yaml"; exit 1; fi; done if test -n "$$(git describe --dirty | grep dirty)"; then echo "Protos not properly formatted or not compiled with v3.4.0"; git status; git diff; exit 1; fi -mobile-rpc: +mobile-rpc: falafel @$(call print, "Creating mobile RPC from protos.") cd ./mobile; ./gen_bindings.sh @@ -252,6 +258,7 @@ clean: unit \ unit-cover \ unit-race \ + falafel \ goveralls \ travis-race \ travis-cover \ diff --git a/mobile/gen_bindings.sh b/mobile/gen_bindings.sh index 8ed84460..705646b2 100755 --- a/mobile/gen_bindings.sh +++ b/mobile/gen_bindings.sh @@ -3,7 +3,7 @@ mkdir -p build # Check falafel version. -falafelVersion="0.7" +falafelVersion="0.7.1" falafel=$(which falafel) if [ $falafel ] then