diff --git a/make/dav.mk b/make/dav.mk index 313caa70..40104cd0 100644 --- a/make/dav.mk +++ b/make/dav.mk @@ -6,7 +6,7 @@ DAV_SERVER ?= cvs.jannet.de DAV_RSYNC_SERVER ?= $(DAV_SERVER) DAV_RSYNC_DIR ?= /srv/dav/pub/groups/$(DAV_GROUP)/$(DAV_GROUP_PROJECT) 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_EXTRA_OPTS ?= DAV_RSYNC ?= rsync $(DAV_RSYNC_EXCLUDE_OPTS) diff --git a/make/defs.mk b/make/defs.mk index 896f90e1..479e7e1f 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -749,7 +749,7 @@ define install_local_cfg endef define cvs_files - sh $(MOD_SCRIPT_DIR)/list-cvs-files.sh -f + sh $(MOD_SCRIPT_DIR)/list-vcs-files.sh -f endef define add_flavour_prefix diff --git a/make/projects-dir.mk b/make/projects-dir.mk index 9d37ded3..2b0e8b74 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -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) 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) -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) BROWSER ?= xdg-open EDITOR ?= xdg-open diff --git a/make/rpmdist.mk b/make/rpmdist.mk index 9efc0469..37150921 100644 --- a/make/rpmdist.mk +++ b/make/rpmdist.mk @@ -276,7 +276,7 @@ define increase_build_number echo -n "+ increasing build number to " ;\ echo $(MAJOR_MINOR_RELEASE)-$(shell expr $(BUILD_NUMBER) + 1)-dev | tee VERSION ;\ 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 ;\ fi ;\ $(SCM_COMMIT) -m "$(MAJOR_MINOR_RELEASE)-$(shell expr $(BUILD_NUMBER) + 1)-dev" HASH VERSION diff --git a/make/rules.mk b/make/rules.mk index aa98dc73..c4ecfee2 100644 --- a/make/rules.mk +++ b/make/rules.mk @@ -406,7 +406,7 @@ $(INSTALLED_PROFILE_PATH_SCRIPT): $(TOPDIR)/profiledir.done $(INSTALL) -p -o $(PROFILEOWNER) -g $(PROFILEGROUP) -m $(PROFILEMODE) path_script.sh $@ find: - @bash $(MOD_SCRIPT_DIR)/list-cvs-files.sh + @bash $(MOD_SCRIPT_DIR)/list-vcs-files.sh collect: bash $(MOD_SCRIPT_DIR)/collect-installed-pkg-changes.sh -t $(TOPDIR) diff --git a/make/topdir.mk b/make/topdir.mk index 311d0c85..3516f833 100644 --- a/make/topdir.mk +++ b/make/topdir.mk @@ -10,7 +10,7 @@ SUBDIRS ?= $(wildcard inst/pre make scripts contrib src libsrc \ images htdocs tmpl doc test inst/post) PROJECT_DESCR = $(TOPDIR)/make/project.conf 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 diff --git a/scripts/list-cvs-files.sh b/scripts/list-vcs-files.sh similarity index 100% rename from scripts/list-cvs-files.sh rename to scripts/list-vcs-files.sh diff --git a/scripts/pkg.sh b/scripts/pkg.sh index f3a07c8b..5b17f792 100644 --- a/scripts/pkg.sh +++ b/scripts/pkg.sh @@ -90,7 +90,7 @@ scm_files() { ( cd $TOPDIR - /bin/bash $MOD_SCRIPT_DIR/list-cvs-files.sh -f $@ + /bin/bash $MOD_SCRIPT_DIR/list-vcs-files.sh -f $@ ) }