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

projects-dir.mk: Make clean target less aggressive

Browse source 
The clean target now doesn't remove meta files which enforce a new pull if
absent. distclean is the new clean.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-03-03 08:36:31 +00:00
commit 22d89ef234
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
make/projects-dir.mk
View file

@ -127,7 +127,7 @@ CVS_PROJECTS = $(patsubst %/,%,$(dir $(wildcard $(addsuffix /CVS,$(BUIL
all: $(filter-out $(UNAVAILABLE_TARGETS),pull.done links.done) all: $(filter-out $(UNAVAILABLE_TARGETS),pull.done links.done)
$(TIME) $(PROJECTS_PY_BUILD) $@ $(TARGET_PROJECTS) $(TIME) $(PROJECTS_PY_BUILD) $@ $(TARGET_PROJECTS)
clean: clean-dirs done.clean clean: clean-dirs
distclean: clean-all-dirs done.clean distclean: clean-all-dirs done.clean
install: install:
@echo @echo
@ -175,7 +175,7 @@ echo-excludes:
edit-%: | $(TEXT_FILES_CACHE) edit-%: | $(TEXT_FILES_CACHE)
$(EDITOR) $(shell grep "/$*$$" $(TEXT_FILES_CACHE)) $(EDITOR) $(shell grep "/$*$$" $(TEXT_FILES_CACHE))
clean: clean.text-files-cache distclean: clean.text-files-cache
clean.text-files-cache: clean.text-files-cache:
rm -f $(TEXT_FILES_CACHE) rm -f $(TEXT_FILES_CACHE)
list-files: list-files:
@ -219,7 +219,7 @@ pkg-exclude-built-today:
$(JW_PKG) built-today > built-today.tmp $(JW_PKG) built-today > built-today.tmp
cat $(EXCLUDES_FILE) built-today.tmp | sed 's/ */\n/g' | sort -u > $(EXCLUDES_FILE).tmp cat $(EXCLUDES_FILE) built-today.tmp | sed 's/ */\n/g' | sort -u > $(EXCLUDES_FILE).tmp
mv $(EXCLUDES_FILE).tmp $(EXCLUDES_FILE) mv $(EXCLUDES_FILE).tmp $(EXCLUDES_FILE)
clean: clean.pkg-exclude-built-today distclean: clean.pkg-exclude-built-today
clean.pkg-exclude-built-today: clean.pkg-exclude-built-today:
rm -f $(EXCLUDES_FILE).tmp built-today.tmp rm -f $(EXCLUDES_FILE).tmp built-today.tmp
@ -251,6 +251,7 @@ clean-dirs:
clean-all-dirs: clean-all-dirs:
$(PROJECTS_PY_BUILD) clean $(PROJECTS) $(PROJECTS_PY_BUILD) clean $(PROJECTS)
make clean-dirs
purge: $(SSH_WRAPPER_SH) purge: $(SSH_WRAPPER_SH)
ifneq ($(wildcard CVS),) ifneq ($(wildcard CVS),)
@ -377,7 +378,7 @@ $(SSH_WRAPPER_SH): Makefile
ssh-wrapper: $(SSH_WRAPPER_SH) ssh-wrapper: $(SSH_WRAPPER_SH)
clean.ssh-wrapper: clean.ssh-wrapper:
rm -f $(SSH_WRAPPER_SH) rm -f $(SSH_WRAPPER_SH)
clean: clean.ssh-wrapper distclean: clean.ssh-wrapper
define check_cvs_user define check_cvs_user
@if ! grep -q ":ext:$(JANWARE_USER)@" CVS/Root; then \ @if ! grep -q ":ext:$(JANWARE_USER)@" CVS/Root; then \