From 3a1c84690239fd7a23393f0ba2e714ab8c659557 Mon Sep 17 00:00:00 2001 From: Eric Rasche Date: Tue, 22 Mar 2016 16:15:22 +0000 Subject: [PATCH 1/3] Remove duplicate help target And reformat for using existing help-text helper Fixes #1979 --- Makefile | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index d7770ffe451..77532142ab6 100644 --- a/Makefile +++ b/Makefile @@ -15,34 +15,25 @@ GRUNT_DOCKER_NAME:=galaxy/client-builder:16.01 all: help @echo "This makefile is primarily used for building Galaxy's JS client. A sensible all target is not yet implemented." -help: - @echo "client - rebuild all client artifacts" - @echo "docs - generate Sphinx HTML documentation, including API docs" - @echo "open-docs - generate Sphinx HTML documentation and open in browser" - @echo "open-project - open project on github" - @echo "lint - check style using tox and flake8 for Python 2 and Python 3" - @echo "release-check-metadata - check github PR metadata for target release" - @echo "release-bootstrap-history - bootstrap history for a new release" - -docs: +docs: ## generate Sphinx HTML documentation, including API docs $(IN_VENV) $(MAKE) -C docs clean $(IN_VENV) $(MAKE) -C docs html _open-docs: open docs/_build/html/index.html || xdg-open docs/_build/html/index.html -open-docs: docs _open-docs +open-docs: docs _open-docs ## generate Sphinx HTML documentation and open in browser -open-project: +open-project: ## open project on github open $(PROJECT_URL) || xdg-open $(PROJECT_URL) -lint: +lint: ## check style using tox and flake8 for Python 2 and Python 3 $(IN_VENV) tox -e py27-lint && tox -e py34-lint release-issue: $(IN_VENV) python scripts/bootstrap_history.py --create-release-issue $(RELEASE_CURR) -release-check-metadata: +release-check-metadata: ## check github PR metadata for target release $(IN_VENV) python scripts/bootstrap_history.py --check-release $(RELEASE_CURR) release-check-blocking-issues: @@ -51,7 +42,7 @@ release-check-blocking-issues: release-check-blocking-prs: $(IN_VENV) python scripts/bootstrap_history.py --check-blocking-prs $(RELEASE_CURR) -release-bootstrap-history: +release-bootstrap-history: ## bootstrap history for a new release $(IN_VENV) python scripts/bootstrap_history.py --release $(RELEASE_CURR) npm-deps: @@ -66,7 +57,7 @@ style: npm-deps ## Calls the style task of Grunt webpack: npm-deps ## Pack javascript cd client && node_modules/webpack/bin/webpack.js -p -client: grunt style webpack ## Process all client-side tasks +client: grunt style webpack ## Rebuild all client-side artifacts grunt-docker-image: ## Build docker image for running grunt docker build -t ${GRUNT_DOCKER_NAME} client From 9a6d3962307f345da34f338f42eebf570562cd63 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Tue, 22 Mar 2016 11:25:19 +0000 Subject: [PATCH 2/3] Fix docs Makefile target. --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 77532142ab6..36dc7f4b795 100644 --- a/Makefile +++ b/Makefile @@ -16,11 +16,11 @@ all: help @echo "This makefile is primarily used for building Galaxy's JS client. A sensible all target is not yet implemented." docs: ## generate Sphinx HTML documentation, including API docs - $(IN_VENV) $(MAKE) -C docs clean - $(IN_VENV) $(MAKE) -C docs html + $(IN_VENV) $(MAKE) -C doc clean + $(IN_VENV) $(MAKE) -C doc html _open-docs: - open docs/_build/html/index.html || xdg-open docs/_build/html/index.html + open doc/_build/html/index.html || xdg-open doc/_build/html/index.html open-docs: docs _open-docs ## generate Sphinx HTML documentation and open in browser From 9d8957d121108549c1448a959aaf1061091a0bec Mon Sep 17 00:00:00 2001 From: Eric Rasche Date: Tue, 22 Mar 2016 16:31:15 +0000 Subject: [PATCH 3/3] Document a couple other targets --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 36dc7f4b795..8100a8e1068 100644 --- a/Makefile +++ b/Makefile @@ -30,22 +30,22 @@ open-project: ## open project on github lint: ## check style using tox and flake8 for Python 2 and Python 3 $(IN_VENV) tox -e py27-lint && tox -e py34-lint -release-issue: +release-issue: ## Create release issue on github $(IN_VENV) python scripts/bootstrap_history.py --create-release-issue $(RELEASE_CURR) release-check-metadata: ## check github PR metadata for target release $(IN_VENV) python scripts/bootstrap_history.py --check-release $(RELEASE_CURR) -release-check-blocking-issues: +release-check-blocking-issues: ## Check github for release blocking issues $(IN_VENV) python scripts/bootstrap_history.py --check-blocking-issues $(RELEASE_CURR) -release-check-blocking-prs: +release-check-blocking-prs: ## Check github for release blocking PRs $(IN_VENV) python scripts/bootstrap_history.py --check-blocking-prs $(RELEASE_CURR) release-bootstrap-history: ## bootstrap history for a new release $(IN_VENV) python scripts/bootstrap_history.py --release $(RELEASE_CURR) -npm-deps: +npm-deps: ## Install NodeJS dependencies. cd client && npm install grunt: npm-deps ## Calls out to Grunt to build client