[ARVADOS-WORKBENCH2] updated: 1.1.4-4-ga0993ae

[Git user]

Summary of changes:
 Makefile | 103 +++++++++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 81 insertions(+), 22 deletions(-)

       via  a0993aee4d868f8e22f0219ecd360650caa4215e (commit)
      from  00faaa2f82feb3f98b4473739be549125b718063 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit a0993aee4d868f8e22f0219ecd360650caa4215e
Author: Nico Cesar <ncesar at veritasgenetics.com>
Date:   Tue Jun 12 11:32:26 2018 -0400

    13544: Makefile massive cleanup, more specialized targets
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <ncesar at veritasgenetics.com>

diff --git a/Makefile b/Makefile
index 7bcb1b3..ba710a8 100644
--- a/Makefile
+++ b/Makefile
@@ -3,13 +3,32 @@
 # SPDX-License-Identifier: Apache-2.0
 
 APP_NAME?=arvados-workbench2
-#Get version from the latest tag plus timsetamp
+
+# GIT_TAG is the last tagged stable release (i.e. 1.2.0)
 GIT_TAG?=$(shell git describe --abbrev=0)
+
+# TS_GIT is the timestamp in the current directory (i.e. 1528815021).
+# Note that it will only change if files change.
 TS_GIT?=$(shell git log -n1 --first-parent "--format=format:%ct" .)
+
+# DATE_FROM_TS_GIT is the human(ish)-readable version of TS_GIT
+# 1528815021 -> 20180612145021
 DATE_FROM_TS_GIT?=$(shell date -ud @$(TS_GIT) +%Y%m%d%H%M%S)
-CI_VERSION?="$(GIT_TAG).$(DATE_FROM_TS_GIT)"	
+
+# NIGHTLY_VERSION uses all the above to produce X.Y.Z.timestamp
+# something in the lines of 1.2.0.20180612145021, this will be the package version
+NIGHTLY_VERSION?=$(GIT_TAG).$(DATE_FROM_TS_GIT)
+
+DESCRIPTION=Arvados Workbench2 - Arvados is a free and open source platform for big data science.
+MAINTAINER=Ward Vandewege <wvandewege at veritasgenetics.com>
+
+# DEST_DIR will have the build package copied.
+DEST_DIR=/var/www/arvados-workbench2/workbench2/
+
 export WORKSPACE?=$(shell pwd)
 
+.PHONY: help clean* yarn-install test build packages packages-with-version 
+
 help:
 	@echo >&2
 	@echo >&2 "There is no default make target here.  Did you mean 'make test'?"
@@ -20,23 +39,63 @@ help:
 	@echo >&2 "  Project home            --> https://arvados.org"
 	@echo >&2
 	@false
-clean:
-	@rm -f $(WORKSPACE)/*.deb
-	@rm -f $(WORKSPACE)/*.rpm
-test:
-	@yarn install
-	@yarn test	--no-watchAll --bail --ci
-
-build: test
-	@yarn install
-	@yarn build
-
-package-version: build
-	# Build deb and rpm packages using fpm from dist passing the destination folder for the deploy to be /var/www/arvados-workbench2/
-	@fpm -s dir -t deb  -n "$(APP_NAME)" -v "$(VERSION)" "--maintainer=Ward Vandewege <ward at curoverse.com>" --description "workbench2 Package" --deb-no-default-config-files $(WORKSPACE)/build/=/var/www/arvados-workbench2/workbench2/
-	@fpm -s dir -t rpm  -n "$(APP_NAME)" -v "$(VERSION)" "--maintainer=Ward Vandewege <ward at curoverse.com>" --description "workbench2 Package" $(WORKSPACE)/build/=/var/www/arvados-workbench2/workbench2/
-
-package-no-version: build
-	# Build deb and rpm packages using fpm from dist passing the destination folder for the deploy to be /var/www/arvados-workbench2/
-	@fpm -s dir -t deb  -n "$(APP_NAME)" -v "$(CI_VERSION)" "--maintainer=Ward Vandewege <ward at curoverse.com>" --description "workbench2 Package" --deb-no-default-config-files $(WORKSPACE)/build/=/var/www/arvados-workbench2/workbench2/
-	@fpm -s dir -t rpm  -n "$(APP_NAME)" -v "$(CI_VERSION)" "--maintainer=Ward Vandewege <ward at curoverse.com>" --description "workbench2 Package" $(WORKSPACE)/build/=/var/www/arvados-workbench2/workbench2/
+
+clean-deb:
+	rm -f $(WORKSPACE)/*.deb
+
+clean-rpm:
+	rm -f $(WORKSPACE)/*.rpm
+
+clean-node-modules:
+	rm -rf $(WORKSPACE)/node_modules
+
+clean: clean-rpm clean-deb clean-node-modules
+
+yarn-install:
+	yarn install
+
+test: yarn-install
+	yarn test	--no-watchAll --bail --ci
+
+build: yarn-install test
+	yarn build
+
+# use FPM to create DEB and RPM with a version (usually triggered from CI to make a release)
+packages-with-version: build
+	fpm \
+	 -s dir \
+	 -t deb \
+	 -n "$(APP_NAME)" \
+	 -v "$(VERSION)" \
+	 --maintainer="$(MAINTAINER)" \
+	 --description="$(DESCRIPTION)" \
+	 --deb-no-default-config-files \
+	$(WORKSPACE)/build/=DEST_DIR
+	fpm \
+	 -s dir \
+	 -t rpm \
+	 -n "$(APP_NAME)" \
+	 -v "$(VERSION)" \
+	 --maintainer="$(MAINTAINER)" \
+	 --description="$(DESCRIPTION)" \
+	 $(WORKSPACE)/build/=DEST_DIR
+
+# use FPM to create DEB and RPM
+packages: build
+	fpm \
+	 -s dir \
+	 -t deb \
+	 -n "$(APP_NAME)" \
+	 -v "$(NIGHTLY_VERSION)" \
+	 --maintainer="$(MAINTAINER)" \
+	 --description="$(DESCRIPTION)" \
+	 --deb-no-default-config-files \
+	$(WORKSPACE)/build/=DEST_DIR
+	fpm \
+	 -s dir \
+	 -t rpm \
+	 -n "$(APP_NAME)" \
+	 -v "$(NIGHTLY_VERSION)" \
+	 --maintainer="$(MAINTAINER)" \
+	 --description="$(DESCRIPTION)" \
+	 $(WORKSPACE)/build/=DEST_DIR

-----------------------------------------------------------------------


hooks/post-receive
--