Merge branch 'master' into 13797-refactoring

[arvados-workbench2.git] / Makefile

diff --git a/Makefile b/Makefile
index ba710a8eb34909f1c48f2f0bced54b74074c99fe..c28b4b86c360b0e4200af5f5eb6ef0513983da7b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,10 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+# Use bash, and run all lines in each recipe as one shell command
+SHELL := /bin/bash
+.ONESHELL:
+
 APP_NAME?=arvados-workbench2
 
 # GIT_TAG is the last tagged stable release (i.e. 1.2.0)
@@ -15,9 +19,14 @@ 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
+ITERATION?=1
 
 DESCRIPTION=Arvados Workbench2 - Arvados is a free and open source platform for big data science.
 MAINTAINER=Ward Vandewege <wvandewege@veritasgenetics.com>
@@ -25,6 +34,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 
@@ -57,45 +72,43 @@ 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 \
         -n "$(APP_NAME)" \
         -v "$(VERSION)" \
+        --iteration "$(ITERATION)" \
         --maintainer="$(MAINTAINER)" \
         --description="$(DESCRIPTION)" \
-        --deb-no-default-config-files \
-       $(WORKSPACE)/build/=DEST_DIR
+        --config-files="etc/arvados/workbench2/workbench2.example.json" \
+       $(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
+        --config-files="etc/arvados/workbench2/workbench2.example.json" \
+        $(WORKSPACE)/build/=$(DEST_DIR)
+
+copy: $(DEB_FILE) $(RPM_FILE)
+       for target in $(TARGETS); do \
+               if [[ $$target =~ ^centos ]]; then
+                       cp -p $(RPM_FILE) packages/$$target ; \
+               else
+                       cp -p $(DEB_FILE) packages/$$target ; \
+               fi
+       done
+       rm -f $(RPM_FILE)
+       rm -f $(DEB_FILE)
 
 # 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
+packages: copy