X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e9477357d7836cc0f91b0afede0583f1070c00fa..e5e907eac3162ddf7e76a431f66b8c26e80b0acf:/Makefile

diff --git a/Makefile b/Makefile
index 8e29481116..a543d46493 100644
--- a/Makefile
+++ b/Makefile
@@ -15,9 +15,10 @@ TS_GIT?=$(shell git log -n1 --first-parent "--format=format:%ct" .)
 # 1528815021 -> 20180612145021
 DATE_FROM_TS_GIT?=$(shell date -ud @$(TS_GIT) +%Y%m%d%H%M%S)
 
-# NIGHTLY_VERSION uses all the above to produce X.Y.Z.timestamp
+# 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)
+# 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
@@ -29,6 +30,12 @@ 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 
@@ -61,11 +68,10 @@ yarn-install:
 test: yarn-install
 	yarn test	--no-watchAll --bail --ci
 
-build: yarn-install test
+build: 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
+$(DEB_FILE): build
 	fpm \
 	 -s dir \
 	 -t deb \
@@ -75,7 +81,9 @@ packages-with-version: build
 	 --maintainer="$(MAINTAINER)" \
 	 --description="$(DESCRIPTION)" \
 	 --deb-no-default-config-files \
-	$(WORKSPACE)/build/=DEST_DIR
+	$(WORKSPACE)/build/=$(DEST_DIR)
+
+$(RPM_FILE): build
 	fpm \
 	 -s dir \
 	 -t rpm \
@@ -84,26 +92,7 @@ packages-with-version: build
 	 --iteration "$(ITERATION)" \
 	 --maintainer="$(MAINTAINER)" \
 	 --description="$(DESCRIPTION)" \
-	 $(WORKSPACE)/build/=DEST_DIR
+	 $(WORKSPACE)/build/=$(DEST_DIR)
 
 # use FPM to create DEB and RPM
-packages: build
-	fpm \
-	 -s dir \
-	 -t deb \
-	 -n "$(APP_NAME)" \
-	 -v "$(NIGHTLY_VERSION)" \
-	 --iteration "$(ITERATION)" \
-	 --maintainer="$(MAINTAINER)" \
-	 --description="$(DESCRIPTION)" \
-	 --deb-no-default-config-files \
-	$(WORKSPACE)/build/=DEST_DIR
-	fpm \
-	 -s dir \
-	 -t rpm \
-	 -n "$(APP_NAME)" \
-	 -v "$(NIGHTLY_VERSION)" \
-	 --iteration "$(ITERATION)" \
-	 --maintainer="$(MAINTAINER)" \
-	 --description="$(DESCRIPTION)" \
-	 $(WORKSPACE)/build/=DEST_DIR
+packages: $(DEB_FILE) $(RPM_FILE)