From e122bb8f5dd8120f155fcd0b3be87e836663d4a0 Mon Sep 17 00:00:00 2001
From: Eric Rasche <rasche.eric@gmail.com>
Date: Tue, 1 Mar 2016 01:23:28 +0000
Subject: [PATCH 1/3] Annotate make targets

Saw this cute trick http://marmelab.com/blog/2016/02/29/auto-documented-makefile.html
and figured it wouldn't be too hard to do here as well.

Produces a nice help text for commands
---
 Makefile | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 803f30b03da..613bf435aab 100644
--- a/Makefile
+++ b/Makefile
@@ -7,35 +7,35 @@ RELEASE_NEXT_BRANCH:=dev
 RELEASE_UPSTREAM:=upstream
 GRUNT_DOCKER_NAME:=galaxy/client-builder:16.01
 
-all:
+all: help
 	@echo "This makefile is primarily used for building Galaxy's JS client. A sensible all target is not yet implemented."
 
 npm-deps:
 	cd client && npm install
 
-grunt: npm-deps
+grunt: npm-deps ## Calls out to Grunt to build client
 	cd client && node_modules/grunt-cli/bin/grunt
 
-style: npm-deps
+style: npm-deps ## Calls the style task of Grunt
 	cd client && node_modules/grunt-cli/bin/grunt style
 
-webpack: npm-deps
+webpack: npm-deps ## Pack javascript
 	cd client && node_modules/webpack/bin/webpack.js -p
 
-client: grunt style webpack
+client: grunt style webpack ## Process all client-side tasks
 
-grunt-docker-image:
+grunt-docker-image: ## Build docker image for running grunt
 	docker build -t ${GRUNT_DOCKER_NAME} client
 
-grunt-docker: grunt-docker-image
+grunt-docker: grunt-docker-image ## Run grunt inside docker
 	docker run -it -v `pwd`:/data ${GRUNT_DOCKER_NAME}
 
-clean-grunt-docker-image:
+clean-grunt-docker-image: ## Remove grunt docker image
 	docker rmi ${GRUNT_DOCKER_NAME}
 
 
 # Release Targets
-create_release_rc:
+create_release_rc: ## Create a release-candidate branch
 	git checkout dev
 	git pull --ff-only ${RELEASE_UPSTREAM} dev
 	git push origin dev
@@ -63,7 +63,7 @@ create_release_rc:
 	git branch -d version-$(RELEASE_CURR)
 	git branch -d version-$(RELEASE_NEXT).dev
 
-create_release:
+create_release: ## Create a release branch
 	git pull --ff-only $(RELEASE_UPSTREAM) master
 	git push origin master
 	git checkout release_$(RELEASE_CURR)
@@ -92,7 +92,7 @@ create_release:
 	#git push origin master:master
 	#git push origin --tags
 
-create_point_release:
+create_point_release: ## Create a point release
 	git pull --ff-only $(RELEASE_UPSTREAM) master
 	git push origin master
 	git checkout release_$(RELEASE_CURR)
@@ -119,3 +119,8 @@ create_point_release:
 	#git push origin master:master
 	#git push origin --tags
 	git checkout release_$(RELEASE_CURR)
+
+.PHONY: help
+
+help:
+	@grep -P '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'

From a034238c8cb75db1ce165366e87498f48a4a38f6 Mon Sep 17 00:00:00 2001
From: Eric Rasche <rasche.eric@gmail.com>
Date: Tue, 1 Mar 2016 01:25:36 +0000
Subject: [PATCH 2/3] Silence expr warning

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 613bf435aab..8e2a0c0ee6d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 RELEASE_CURR:=16.01
-RELEASE_CURR_MINOR_NEXT:=$(shell expr `awk '$$1 == "VERSION_MINOR" {print $$NF}' lib/galaxy/version.py | tr -d \" | sed 's/None/0/' ` + 1)
+RELEASE_CURR_MINOR_NEXT:=$(shell expr `awk '$$1 == "VERSION_MINOR" {print $$NF}' lib/galaxy/version.py | tr -d \" | sed 's/None/0/;s/dev/0/;' ` + 1)
 RELEASE_NEXT:=16.04
 # TODO: This needs to be updated with create_release_rc
 #RELEASE_NEXT_BRANCH:=release_$(RELEASE_NEXT)

From b9c8d5beb48dbd71f1cfedd39afb75eb5ceb569e Mon Sep 17 00:00:00 2001
From: Eric Rasche <rasche.eric@gmail.com>
Date: Tue, 1 Mar 2016 03:08:51 +0000
Subject: [PATCH 3/3] Duplicate @jxtx's fix

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 8e2a0c0ee6d..309cd737748 100644
--- a/Makefile
+++ b/Makefile
@@ -123,4 +123,4 @@ create_point_release: ## Create a point release
 .PHONY: help
 
 help:
-	@grep -P '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+	@egrep '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'