opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1824 from erasche/makefile-help

Browse Source 
Makefile help target + formatting
This commit is contained in:
carlfeberhard
2016-03-01 08:29:17 -05:00
parent e730af5a27 b9c8d5beb4
commit 763fb11290
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+17 -12
View File
@@ -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)
@@ -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:
@egrep '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'