janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-28 07:43:55 +01:00
Code Activity

make, scripts: Rename list-cvs-files.sh to list-vcs-files.sh

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2018-12-13 18:15:12 +00:00
commit 9b532fd601
8 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/dav.mk
View file

@ -6,7 +6,7 @@ DAV_SERVER ?= cvs.jannet.de
DAV_RSYNC_SERVER ?= $(DAV_SERVER) DAV_RSYNC_SERVER ?= $(DAV_SERVER)
DAV_RSYNC_DIR ?= /srv/dav/pub/groups/$(DAV_GROUP)/$(DAV_GROUP_PROJECT) DAV_RSYNC_DIR ?= /srv/dav/pub/groups/$(DAV_GROUP)/$(DAV_GROUP_PROJECT)
DAV_RSYNC_URL = $(DAV_RSYNC_SERVER):$(DAV_RSYNC_DIR) DAV_RSYNC_URL = $(DAV_RSYNC_SERVER):$(DAV_RSYNC_DIR)
DAV_RSYNC_EXCLUDE ?= $(shell bash $(MOD_SCRIPT_DIR)/list-cvs-files.sh) DAV_RSYNC_EXCLUDE ?= $(shell bash $(MOD_SCRIPT_DIR)/list-vcs-files.sh)
DAV_RSYNC_EXCLUDE_OPTS = $(addprefix --exclude , $(DAV_RSYNC_EXCLUDE) '*.done') DAV_RSYNC_EXCLUDE_OPTS = $(addprefix --exclude , $(DAV_RSYNC_EXCLUDE) '*.done')
DAV_RSYNC_EXTRA_OPTS ?= DAV_RSYNC_EXTRA_OPTS ?=
DAV_RSYNC ?= rsync $(DAV_RSYNC_EXCLUDE_OPTS) DAV_RSYNC ?= rsync $(DAV_RSYNC_EXCLUDE_OPTS)

2
make/defs.mk
View file

@ -749,7 +749,7 @@ define install_local_cfg
endef endef
define cvs_files define cvs_files
sh $(MOD_SCRIPT_DIR)/list-cvs-files.sh -f sh $(MOD_SCRIPT_DIR)/list-vcs-files.sh -f
endef endef
define add_flavour_prefix define add_flavour_prefix

2
make/projects-dir.mk
View file

@ -99,7 +99,7 @@ PROJECTS_PY_BUILD = $(PROJECTS_PY) build $(PROJECTS_PY_EXTRA_BUILD_OPTS)
PURGE_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/purge-stale-projects.sh /opt/jw-build/bin/purge-stale-projects.sh) purge-not-found) PURGE_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/purge-stale-projects.sh /opt/jw-build/bin/purge-stale-projects.sh) purge-not-found)
PKG_MANAGER_SH ?= /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/pkg-manager.sh /opt/jw-build/bin/pkg-manager.sh) pkg-manager-not-found) PKG_MANAGER_SH ?= /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/pkg-manager.sh /opt/jw-build/bin/pkg-manager.sh) pkg-manager-not-found)
CREATE_PROJECT_SH ?= /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/jw-build-create-project.sh /opt/jw-build/bin/jw-build-create-project.sh) jw-build-create-project-not-found) CREATE_PROJECT_SH ?= /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/jw-build-create-project.sh /opt/jw-build/bin/jw-build-create-project.sh) jw-build-create-project-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) LIST_VCS_FILES = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/list-vcs-files.sh /opt/jw-build/bin/list-vcs-files.sh) list-vcs-files-not-found)
JW_PKG = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/jw-pkg /opt/jw-build/bin/jw-pkg) jw-pkg-not-found) JW_PKG = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/jw-pkg /opt/jw-build/bin/jw-pkg) jw-pkg-not-found)
BROWSER ?= xdg-open BROWSER ?= xdg-open
EDITOR ?= xdg-open EDITOR ?= xdg-open

2
make/rpmdist.mk
View file

@ -276,7 +276,7 @@ define increase_build_number
echo -n "+ increasing build number to " ;\ echo -n "+ increasing build number to " ;\
echo $(MAJOR_MINOR_RELEASE)-$(shell expr $(BUILD_NUMBER) + 1)-dev | tee VERSION ;\ echo $(MAJOR_MINOR_RELEASE)-$(shell expr $(BUILD_NUMBER) + 1)-dev | tee VERSION ;\
echo $(HASH) > HASH ;\ echo $(HASH) > HASH ;\
if ! /bin/bash $(MOD_SCRIPT_DIR)/list-cvs-files.sh | grep -q '^HASH$$'; then \ if ! /bin/bash $(MOD_SCRIPT_DIR)/list-vcs-files.sh | grep -q '^HASH$$'; then \
$(SCM_ADD) HASH ;\ $(SCM_ADD) HASH ;\
fi ;\ fi ;\
$(SCM_COMMIT) -m "$(MAJOR_MINOR_RELEASE)-$(shell expr $(BUILD_NUMBER) + 1)-dev" HASH VERSION $(SCM_COMMIT) -m "$(MAJOR_MINOR_RELEASE)-$(shell expr $(BUILD_NUMBER) + 1)-dev" HASH VERSION

2
make/rules.mk
View file

@ -406,7 +406,7 @@ $(INSTALLED_PROFILE_PATH_SCRIPT): $(TOPDIR)/profiledir.done
$(INSTALL) -p -o $(PROFILEOWNER) -g $(PROFILEGROUP) -m $(PROFILEMODE) path_script.sh $@ $(INSTALL) -p -o $(PROFILEOWNER) -g $(PROFILEGROUP) -m $(PROFILEMODE) path_script.sh $@
find: find:
@bash $(MOD_SCRIPT_DIR)/list-cvs-files.sh @bash $(MOD_SCRIPT_DIR)/list-vcs-files.sh
collect: collect:
bash $(MOD_SCRIPT_DIR)/collect-installed-pkg-changes.sh -t $(TOPDIR) bash $(MOD_SCRIPT_DIR)/collect-installed-pkg-changes.sh -t $(TOPDIR)

2
make/topdir.mk
View file

@ -10,7 +10,7 @@ SUBDIRS ?= $(wildcard inst/pre make scripts contrib src libsrc \
images htdocs tmpl doc test inst/post) images htdocs tmpl doc test inst/post)
PROJECT_DESCR = $(TOPDIR)/make/project.conf PROJECT_DESCR = $(TOPDIR)/make/project.conf
GIT_DESCR = $(TOPDIR)/.git/description GIT_DESCR = $(TOPDIR)/.git/description
LIST_VCS_FILES = /bin/bash $(MOD_SCRIPT_DIR)/list-cvs-files.sh LIST_VCS_FILES = /bin/bash $(MOD_SCRIPT_DIR)/list-vcs-files.sh
OPT_JANWARE_PROJECT ?= -j OPT_JANWARE_PROJECT ?= -j

0
scripts/list-cvs-files.sh → scripts/list-vcs-files.sh
View file

2
scripts/pkg.sh
View file

@ -90,7 +90,7 @@ scm_files()
{ {
( (
cd $TOPDIR cd $TOPDIR
/bin/bash $MOD_SCRIPT_DIR/list-cvs-files.sh -f $@ /bin/bash $MOD_SCRIPT_DIR/list-vcs-files.sh -f $@
) )
} }