janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-25 15:03:55 +01:00
Code Activity

[projects|projs]-dirs.mk: Beautify convenience targets

Browse source 
Add target edit-% and rename git-echo-link-% to git-echo-links-%.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2018-09-07 14:21:47 +00:00
commit 087e2785fc
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
make/projects-dir.mk
View file

@ -112,6 +112,7 @@ CREATE_PROJECT_SH ?= /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/jw-bu
LIST_VCS_FILES = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/list-cvs-files.sh /opt/jw-build/bin/list-cvs-files.sh) list-cvs-files-not-found) LIST_VCS_FILES = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/list-cvs-files.sh /opt/jw-build/bin/list-cvs-files.sh) list-cvs-files-not-found)
JANWARE_PKG = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/jannet /opt/jw-build/bin/jannet) jannet-not-found) JANWARE_PKG = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/jannet /opt/jw-build/bin/jannet) jannet-not-found)
BROWSER ?= xdg-open BROWSER ?= xdg-open
EDITOR ?= xdg-open
GIT_SRV_ADMIN_SH = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.jannet.de /opt/jw-build/bin/git-srv-admin.sh GIT_SRV_ADMIN_SH = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.jannet.de /opt/jw-build/bin/git-srv-admin.sh
CVS_ADMIN_SH = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.jannet.de /opt/jw-build/bin/cvs-admin.sh CVS_ADMIN_SH = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.jannet.de /opt/jw-build/bin/cvs-admin.sh
@ -262,7 +263,7 @@ git-show-non-master-branches:
# git-echo-link-<filename> returns a string functioning as hyperlink to # git-echo-link-<filename> returns a string functioning as hyperlink to
# matching files in git, if embedded into a janware wiki or ticket. # matching files in git, if embedded into a janware wiki or ticket.
git-echo-link-%: | $(TEXT_FILES_CACHE) git-echo-links-%: | $(TEXT_FILES_CACHE)
sed "/$*$$/!d; s%$(CWD)%%; s|^|\n \[\[jgit>/proj/$(JANWARE_USER)/|; s/$$/|$*\]\]\n/" $(TEXT_FILES_CACHE) sed "/$*$$/!d; s%$(CWD)%%; s|^|\n \[\[jgit>/proj/$(JANWARE_USER)/|; s/$$/|$*\]\]\n/" $(TEXT_FILES_CACHE)
pull-%: $(SSH_WRAPPER_SH) pull-%: $(SSH_WRAPPER_SH)
@ -295,6 +296,9 @@ git-update-project-descriptions: $(SSH_WRAPPER_SH)
projects.txt: projects.txt:
echo $(PROJECTS) | sed 's/ /\n/g; s%/%%g' > $@ echo $(PROJECTS) | sed 's/ /\n/g; s%/%%g' > $@
edit-%: | $(TEXT_FILES_CACHE)
$(EDITOR) $(shell grep "/$*$$" $(TEXT_FILES_CACHE))
done.clean: done.clean:
rm -f *.done rm -f *.done