X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/81fd54f647fdbea139ffd8f74c33fc8d888683f1..02fe86a56f080ed1d5770ad6c6856a15f50ab508:/Makefile

diff --git a/Makefile b/Makefile
index 5ad686bf..669fdda9 100644
--- 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)
@@ -30,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 
@@ -60,29 +70,51 @@ yarn-install:
 	yarn install
 
 test: yarn-install
-	yarn test	--no-watchAll --bail --ci
+	yarn test --no-watchAll --bail --ci
 
-build: yarn-install test
+build: test
 	yarn build
 
-# use FPM to create DEB and RPM
-packages: build
+$(DEB_FILE): build
 	fpm \
 	 -s dir \
 	 -t deb \
 	 -n "$(APP_NAME)" \
 	 -v "$(VERSION)" \
 	 --iteration "$(ITERATION)" \
+	 --vendor="The Arvados Authors" \
 	 --maintainer="$(MAINTAINER)" \
+	 --url="https://arvados.org" \
+	 --license="GNU Affero General Public License, version 3.0" \
 	 --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)" \
+	 --vendor="The Arvados Authors" \
 	 --maintainer="$(MAINTAINER)" \
+	 --url="https://arvados.org" \
+	 --license="GNU Affero General Public License, version 3.0" \
 	 --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: copy