akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make: fetch falafel dependency for mobile-rpc

Browse Source
This commit is contained in:
Johan T. Halseth 2020-07-15 15:36:20 +02:00
parent 7a30332619
commit fd8e6c98b9
No known key found for this signature in database
GPG Key ID: 15BAADA29DA20D26
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -6,6 +6,7 @@ BTCD_PKG := github.com/btcsuite/btcd
GOVERALLS_PKG := github.com/mattn/goveralls GOVERALLS_PKG := github.com/mattn/goveralls
LINT_PKG := github.com/golangci/golangci-lint/cmd/golangci-lint LINT_PKG := github.com/golangci/golangci-lint/cmd/golangci-lint
GOACC_PKG := github.com/ory/go-acc GOACC_PKG := github.com/ory/go-acc
FALAFEL_PKG := github.com/lightninglabs/falafel
GO_BIN := ${GOPATH}/bin GO_BIN := ${GOPATH}/bin
BTCD_BIN := $(GO_BIN)/btcd BTCD_BIN := $(GO_BIN)/btcd
@ -32,6 +33,7 @@ BTCD_COMMIT := $(shell cat go.mod | \
LINT_COMMIT := v1.18.0 LINT_COMMIT := v1.18.0
GOACC_COMMIT := ddc355013f90fea78d83d3a6c71f1d37ac07ecd5 GOACC_COMMIT := ddc355013f90fea78d83d3a6c71f1d37ac07ecd5
FALAFEL_COMMIT := v0.7.1
DEPGET := cd /tmp && GO111MODULE=on go get -v DEPGET := cd /tmp && GO111MODULE=on go get -v
GOBUILD := GO111MODULE=on go build -v GOBUILD := GO111MODULE=on go build -v
@ -107,6 +109,10 @@ btcd:
@$(call print, "Installing btcd.") @$(call print, "Installing btcd.")
$(DEPGET) $(BTCD_PKG)@$(BTCD_COMMIT) $(DEPGET) $(BTCD_PKG)@$(BTCD_COMMIT)
falafel:
@$(call print, "Installing falafel.")
$(DEPGET) $(FALAFEL_PKG)@$(FALAFEL_COMMIT)
# ============ # ============
# INSTALLATION # 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 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 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.") @$(call print, "Creating mobile RPC from protos.")
cd ./mobile; ./gen_bindings.sh cd ./mobile; ./gen_bindings.sh
@ -252,6 +258,7 @@ clean:
unit \ unit \
unit-cover \ unit-cover \
unit-race \ unit-race \
falafel \
goveralls \ goveralls \
travis-race \ travis-race \
travis-cover \ travis-cover \

2
mobile/gen_bindings.sh
View File

@ -3,7 +3,7 @@
mkdir -p build mkdir -p build
# Check falafel version. # Check falafel version.
falafelVersion="0.7" falafelVersion="0.7.1"
falafel=$(which falafel) falafel=$(which falafel)
if [ $falafel ] if [ $falafel ]
then then