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

Merge pull request #5178 from halseth/mobile-docker-prefix

Browse Source 
make: pass mobile subserver prefix to docker when generating mobile RPC
This commit is contained in:
Johan T. Halseth 2021-04-06 14:54:11 +02:00 committed by GitHub
commit d1c7059f14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -282,8 +282,8 @@ sample-conf-check:
for flag in $$(GO_FLAGS_COMPLETION=1 go run -tags="$(RELEASE_TAGS)" $(PKG)/cmd/lnd -- | grep -v help | cut -c3-); do if ! grep -q $$flag sample-lnd.conf; then echo "Command line flag --$$flag not added to sample-lnd.conf"; exit 1; fi; done for flag in $$(GO_FLAGS_COMPLETION=1 go run -tags="$(RELEASE_TAGS)" $(PKG)/cmd/lnd -- | grep -v help | cut -c3-); do if ! grep -q $$flag sample-lnd.conf; then echo "Command line flag --$$flag not added to sample-lnd.conf"; exit 1; fi; done
mobile-rpc: mobile-rpc:
@$(call print, "Creating mobile RPC from protos.") @$(call print, "Creating mobile RPC from protos (prefix=$(prefix)).")
cd ./lnrpc; COMPILE_MOBILE=1 ./gen_protos_docker.sh cd ./lnrpc; COMPILE_MOBILE=1 SUBSERVER_PREFIX=$(prefix) ./gen_protos_docker.sh
vendor: vendor:
@$(call print, "Re-creating vendor directory.") @$(call print, "Re-creating vendor directory.")

1
lnrpc/gen_protos_docker.sh
View File

@ -20,5 +20,6 @@ docker run \
--user "$UID:$(id -g)" \ --user "$UID:$(id -g)" \
-e UID=$UID \ -e UID=$UID \
-e COMPILE_MOBILE \ -e COMPILE_MOBILE \
-e SUBSERVER_PREFIX \
-v "$DIR/../:/build" \ -v "$DIR/../:/build" \
lnd-protobuf-builder lnd-protobuf-builder

2
mobile/gen_bindings.sh
View File

@ -57,7 +57,7 @@ done
# If prefix=1 is specified, prefix the generated methods with subserver name. # If prefix=1 is specified, prefix the generated methods with subserver name.
# This must be enabled to support subservers with name conflicts. # This must be enabled to support subservers with name conflicts.
use_prefix="0" use_prefix="0"
if [ "$prefix" = "1" ] if [ "$SUBSERVER_PREFIX" = "1" ]
then then
echo "Prefixing methods with subserver name" echo "Prefixing methods with subserver name"
use_prefix="1" use_prefix="1"