X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/9217ddf079cb81d105c9c5927ad0c7c5ac1040ee..95262273a85a2002a9f614c045fe6b907ddcc106:/Makefile

diff --git a/Makefile b/Makefile
index 68d10574..a543d464 100644
--- a/Makefile
+++ b/Makefile
@@ -3,13 +3,43 @@
 # 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)"	
+
+# 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
+# it can be overwritten when invoking make as in make packages VERSION=1.2.0
+VERSION?=$(GIT_TAG).$(DATE_FROM_TS_GIT)
+
+# ITERATION is the package iteration, intended for manual change if anything non-code related
+# changes in the package. (i.e. example config files externally added
+ITERATION?=1
+
+DESCRIPTION=Arvados Workbench2 - Arvados is a free and open source platform for big data science.
+MAINTAINER=Ward Vandewege <wvandewege@veritasgenetics.com>
+
+# DEST_DIR will have the build package copied.
+DEST_DIR=/var/www/arvados-workbench2/workbench2/
+
+# Debian package file
+DEB_FILE=$(APP_NAME)_$(VERSION)-$(ITERATION)_amd64.deb
+
+# redHat package file
+RPM_FILE=$(APP_NAME)_$(VERSION)-$(ITERATION).x86_64.rpm
+
 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 +50,49 @@ 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:
-	@yarn install
-	@yarn build
-
-package-version:
-	# 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@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@curoverse.com>" --description "workbench2 Package" $(WORKSPACE)/build/=/var/www/arvados-workbench2/workbench2/
-
-package-no-version:
-	# 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@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@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: test
+	yarn build
+
+$(DEB_FILE): build
+	fpm \
+	 -s dir \
+	 -t deb \
+	 -n "$(APP_NAME)" \
+	 -v "$(VERSION)" \
+	 --iteration "$(ITERATION)" \
+	 --maintainer="$(MAINTAINER)" \
+	 --description="$(DESCRIPTION)" \
+	 --deb-no-default-config-files \
+	$(WORKSPACE)/build/=$(DEST_DIR)
+
+$(RPM_FILE): build
+	fpm \
+	 -s dir \
+	 -t rpm \
+	 -n "$(APP_NAME)" \
+	 -v "$(VERSION)" \
+	 --iteration "$(ITERATION)" \
+	 --maintainer="$(MAINTAINER)" \
+	 --description="$(DESCRIPTION)" \
+	 $(WORKSPACE)/build/=$(DEST_DIR)
+
+# use FPM to create DEB and RPM
+packages: $(DEB_FILE) $(RPM_FILE)