makefile: install yarn (#526)

* makefile: install yarn

* gitignore
This commit is contained in:
Federico Kunze 2020-09-23 17:28:38 +03:00 committed by GitHub
parent e3f3619caf
commit 291dfcafbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 3 deletions

1
.gitignore vendored
View File

@ -27,6 +27,7 @@ docs/node_modules
docs/modules docs/modules
dist dist
tools-stamp tools-stamp
docs-tools-stamp
proto-tools-stamp proto-tools-stamp
golangci-lint golangci-lint
keyring_test_cosmos keyring_test_cosmos

View File

@ -221,8 +221,16 @@ else
@echo "solcjs already installed; skipping..." @echo "solcjs already installed; skipping..."
endif endif
docs-tools:
ifeq (, $(shell which yarn))
@echo "Installing yarn..."
@npm install -g yarn
else
@echo "yarn already installed; skipping..."
endif
tools: tools-stamp tools: tools-stamp
tools-stamp: contract-tools runsim tools-stamp: contract-tools docs-tools runsim
# Create dummy file to satisfy dependency and avoid # Create dummy file to satisfy dependency and avoid
# rebuilding when this Makefile target is hit twice # rebuilding when this Makefile target is hit twice
# in a row. # in a row.
@ -232,7 +240,13 @@ tools-clean:
rm -f $(RUNSIM) rm -f $(RUNSIM)
rm -f tools-stamp rm -f tools-stamp
.PHONY: runsim tools tools-stamp tools-clean docs-tools-stamp: docs-tools
# Create dummy file to satisfy dependency and avoid
# rebuilding when this Makefile target is hit twice
# in a row.
touch $@
.PHONY: runsim tools tools-stamp tools-clean docs-tools-stamp
############################################################################### ###############################################################################
### Tests & Simulation ### ### Tests & Simulation ###
@ -402,7 +416,8 @@ docs-serve:
# Build the site into docs/.vuepress/dist # Build the site into docs/.vuepress/dist
docs-build: docs-build:
@cd docs && \ @$(MAKE) docs-tools-stamp && \
cd docs && \
yarn install && \ yarn install && \
yarn run build yarn run build