projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '15027-object-update-fix'
[arvados-workbench2.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 30ab7bc4aca8e48159a96f214b5c756a16ae7f65..669fdda9f643b45e8b1dada54d60b98c61b60179 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-70,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
@@
-82,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
@@
-94,8
+97,12
@@
$(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)
copy: $(DEB_FILE) $(RPM_FILE)
$(WORKSPACE)/build/=$(DEST_DIR)
copy: $(DEB_FILE) $(RPM_FILE)