projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
15530: Set homeCluster to LoginCluster
[arvados.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index a543d4649364f0b1a5e87abf02ad39b8dce45e29..669fdda9f643b45e8b1dada54d60b98c61b60179 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-2,6
+2,10
@@
#
# SPDX-License-Identifier: Apache-2.0
#
# 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)
APP_NAME?=arvados-workbench2
# GIT_TAG is the last tagged stable release (i.e. 1.2.0)
@@
-34,7
+38,7
@@
DEST_DIR=/var/www/arvados-workbench2/workbench2/
DEB_FILE=$(APP_NAME)_$(VERSION)-$(ITERATION)_amd64.deb
# redHat package file
DEB_FILE=$(APP_NAME)_$(VERSION)-$(ITERATION)_amd64.deb
# redHat package file
-RPM_FILE=$(APP_NAME)
_
$(VERSION)-$(ITERATION).x86_64.rpm
+RPM_FILE=$(APP_NAME)
-
$(VERSION)-$(ITERATION).x86_64.rpm
export WORKSPACE?=$(shell pwd)
export WORKSPACE?=$(shell pwd)
@@
-66,7
+70,7
@@
yarn-install:
yarn install
test: yarn-install
yarn install
test: yarn-install
- yarn test
--no-watchAll --bail --ci
+ yarn test --no-watchAll --bail --ci
build: test
yarn build
build: test
yarn build
@@
-78,9
+82,12
@@
$(DEB_FILE): build
-n "$(APP_NAME)" \
-v "$(VERSION)" \
--iteration "$(ITERATION)" \
-n "$(APP_NAME)" \
-v "$(VERSION)" \
--iteration "$(ITERATION)" \
+ --vendor="The Arvados Authors" \
--maintainer="$(MAINTAINER)" \
--maintainer="$(MAINTAINER)" \
+ --url="https://arvados.org" \
+ --license="GNU Affero General Public License, version 3.0" \
--description="$(DESCRIPTION)" \
--description="$(DESCRIPTION)" \
- --
deb-no-default-config-files
\
+ --
config-files="etc/arvados/workbench2/workbench2.example.json"
\
$(WORKSPACE)/build/=$(DEST_DIR)
$(RPM_FILE): build
$(WORKSPACE)/build/=$(DEST_DIR)
$(RPM_FILE): build
@@
-90,9
+97,24
@@
$(RPM_FILE): build
-n "$(APP_NAME)" \
-v "$(VERSION)" \
--iteration "$(ITERATION)" \
-n "$(APP_NAME)" \
-v "$(VERSION)" \
--iteration "$(ITERATION)" \
+ --vendor="The Arvados Authors" \
--maintainer="$(MAINTAINER)" \
--maintainer="$(MAINTAINER)" \
+ --url="https://arvados.org" \
+ --license="GNU Affero General Public License, version 3.0" \
--description="$(DESCRIPTION)" \
--description="$(DESCRIPTION)" \
+ --config-files="etc/arvados/workbench2/workbench2.example.json" \
$(WORKSPACE)/build/=$(DEST_DIR)
$(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
# use FPM to create DEB and RPM
-packages:
$(DEB_FILE) $(RPM_FILE)
+packages:
copy