Skip to content

Commit 0e53ef4

Browse files
committed
makefile: replaced constant version spec with call to xmlstarlet (sync with skeleton app)
Signed-off-by: Alexander Piskun <[email protected]>
1 parent 4868eb1 commit 0e53ef4

File tree

1 file changed

+18
-15
lines changed

1 file changed

+18
-15
lines changed

Makefile

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,29 @@
22

33
APP_ID := talk_bot_ai
44
APP_NAME := AssistantTalkBot
5-
APP_VERSION := 3.0.0
5+
APP_VERSION := $$(xmlstarlet sel -t -v "//version" appinfo/info.xml)
66
JSON_INFO := "{\"id\":\"$(APP_ID)\",\"name\":\"$(APP_NAME)\",\"daemon_config_name\":\"manual_install\",\"version\":\"$(APP_VERSION)\",\"secret\":\"12345\",\"port\":10034}"
77

88
.PHONY: help
99
help:
10-
@echo "Welcome to the Nextcloud Assistant talk bot. Please use \`make <target>\` where <target> is one of:"
10+
@echo " Welcome to Nextcloud $(APP_NAME) $(APP_VERSION)!"
1111
@echo " "
12-
@echo " Next commands are only for dev environment with nextcloud-docker-dev!"
13-
@echo " They should run from the host you are developing on (with activated venv) and not in the container with Nextcloud!"
14-
@echo " "
15-
@echo " build-push build image and upload to ghcr.io"
16-
@echo " "
17-
@echo " run install $(APP_NAME) for Nextcloud Latest"
18-
@echo " run30 install $(APP_NAME) for Nextcloud 30"
19-
@echo " "
20-
@echo " For development of this app use PyCharm run configurations. Development is always set for last Nextcloud."
21-
@echo " First run '$(APP_NAME)' and then 'make register', after that you can use/debug/develop it and easy test."
22-
@echo " "
23-
@echo " register perform registration of running '$(APP_NAME)' into the 'manual_install' deploy daemon."
24-
@echo " register30 perform registration of running '$(APP_NAME)' into the 'manual_install' deploy daemon."
12+
@echo " Please use \`make <target>\` where <target> is one of"
13+
@echo " "
14+
@echo " build-push builds CPU images and uploads them to ghcr.io"
15+
@echo " "
16+
@echo " > Next commands are only for the dev environment with nextcloud-docker-dev!"
17+
@echo " > They must be run from the host you are developing on, not in a Nextcloud container!"
18+
@echo " "
19+
@echo " run installs $(APP_NAME) for Nextcloud Latest"
20+
@echo " run30 installs $(APP_NAME) for Nextcloud 30"
21+
@echo " "
22+
@echo " > Commands for manual registration of ExApp($(APP_NAME) should be running!):"
23+
@echo " "
24+
@echo " register performs registration of running $(APP_NAME) into the 'manual_install' deploy daemon."
25+
@echo " register30 performs registration of running $(APP_NAME) into the 'manual_install' deploy daemon."
26+
@echo " "
27+
2528

2629
.PHONY: build-push
2730
build-push:

0 commit comments

Comments
 (0)