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

make: Replace "pereq" in targets by "deps"

Browse source 
"prereq" is simply impossible to use in explanations with a straight face.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-12-07 19:21:08 +00:00
commit 6bdb16878a
6 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/prereq-installed.mk
View file

@ -1,4 +1,4 @@
PREREQ_INSTALLED_TARGETS += run gdb valgrind attach attach-strace libpath valgrind strace debug lldb echo-prereq shortcut check-conf PREREQ_INSTALLED_TARGETS += run gdb valgrind attach attach-strace libpath valgrind strace debug lldb echo-deps shortcut check-conf
ifneq ($(filter $(PREREQ_INSTALLED_TARGETS),$(MAKECMDGOALS)),) ifneq ($(filter $(PREREQ_INSTALLED_TARGETS),$(MAKECMDGOALS)),)
PREREQ_BUILD += $(shell ls /etc/ld.so.conf.d | sed '/ld-.*.conf/ !d; s/ld-\(.*\).conf/\1/') PREREQ_BUILD += $(shell ls /etc/ld.so.conf.d | sed '/ld-.*.conf/ !d; s/ld-\(.*\).conf/\1/')

4
make/profiler-rules-run.mk
View file

@ -2,10 +2,10 @@
clean: clean.callgrind clean: clean.callgrind
callgrind: run-prereq callgrind: run-deps
$(RM) -f core.* $(RM) -f core.*
valgrind --tool=callgrind $(VALGRIND_OPTS) $(EXE_PATH) $(EXE_ARGS) valgrind --tool=callgrind $(VALGRIND_OPTS) $(EXE_PATH) $(EXE_ARGS)
callgrind-noinst: run-prereq callgrind-noinst: run-deps
$(RM) -f core.* $(RM) -f core.*
valgrind --tool=callgrind --callgrind-out-file=$(CALLGRIND_OUT) --instr-atstart=no $(VALGRIND_OPTS) $(EXE_PATH) $(EXE_ARGS) valgrind --tool=callgrind --callgrind-out-file=$(CALLGRIND_OUT) --instr-atstart=no $(VALGRIND_OPTS) $(EXE_PATH) $(EXE_ARGS)
$(CALLGRIND_OUT): callgrind $(CALLGRIND_OUT): callgrind

10
make/projects-dir.mk
View file

@ -171,13 +171,13 @@ build-order-%: $(filter-out $(UNAVAILABLE_TARGETS),pull.done)
build-order: build-order-all build-order: build-order-all
echo-prereq-build: echo-build-deps:
@$(PROJECTS_PY) required-os-pkg --skip-excluded --flavours "build" $(TARGET_PROJECTS) @$(PROJECTS_PY) required-os-pkg --skip-excluded --flavours "build" $(TARGET_PROJECTS)
echo-prereq-install: echo-install-deps:
@$(PROJECTS_PY) required-os-pkg --skip-excluded --flavours "build run" $(TARGET_PROJECTS) @$(PROJECTS_PY) required-os-pkg --skip-excluded --flavours "build run" $(TARGET_PROJECTS)
echo-prereq-release: echo-release-deps:
@$(PROJECTS_PY) required-os-pkg --skip-excluded --flavours "build run release" $(TARGET_PROJECTS) @$(PROJECTS_PY) required-os-pkg --skip-excluded --flavours "build run release" $(TARGET_PROJECTS)
echo-os: echo-os:
@$(GET_OS_SH) @$(GET_OS_SH)
@ -227,10 +227,10 @@ cloc:
pkg-manager-refresh: pkg-manager-refresh:
$(PKG_MANAGER_SH) refresh $(DASH_Y) $(PKG_MANAGER_SH) refresh $(DASH_Y)
pkg-install-prereq-build: pkg-install-build-deps:
$(PKG_MANAGER_SH) install $(DASH_Y) $(BASE_PKGS) $(shell $(PROJECTS_PY) required-os-pkg --skip-excluded --flavours "build" $(TARGET_PROJECTS)) $(PKG_MANAGER_SH) install $(DASH_Y) $(BASE_PKGS) $(shell $(PROJECTS_PY) required-os-pkg --skip-excluded --flavours "build" $(TARGET_PROJECTS))
pkg-install-prereq-release: pkg-install-release-deps:
$(PKG_MANAGER_SH) install $(DASH_Y) $(BASE_PKGS) $(shell $(PROJECTS_PY) required-os-pkg --skip-excluded --flavours "build run release" $(TARGET_PROJECTS)) $(PKG_MANAGER_SH) install $(DASH_Y) $(BASE_PKGS) $(shell $(PROJECTS_PY) required-os-pkg --skip-excluded --flavours "build run release" $(TARGET_PROJECTS))
pkg-exclude-built-today: pkg-exclude-built-today:

6
make/rules.mk
View file

@ -33,7 +33,7 @@ distclean: clean
mocclean \ mocclean \
objclean \ objclean \
pckgclean \ pckgclean \
prereqclean \ depsclean \
profclean \ profclean \
push \ push \
rccclean \ rccclean \
@ -106,7 +106,7 @@ libclean:
vcdistclean: vcdistclean:
$(RM) -rf *.plg *.opt *.ncb Debug *.exe dist *.ilk $(RM) -rf *.plg *.opt *.ncb Debug *.exe dist *.ilk
prereqclean: depsclean:
set -e; for dir in $(PREREQ_DIR); do make -$(MAKEFLAGS) -C $$dir clean; done set -e; for dir in $(PREREQ_DIR); do make -$(MAKEFLAGS) -C $$dir clean; done
profclean: profclean:
@ -222,7 +222,7 @@ echo-include:
echo-mk: echo-mk:
@echo MAKEFILE_LIST = $(MAKEFILE_LIST) @echo MAKEFILE_LIST = $(MAKEFILE_LIST)
echo-prereq: echo-deps:
@echo "PREREQ_BUILD = $(sort $(PREREQ_BUILD))" @echo "PREREQ_BUILD = $(sort $(PREREQ_BUILD))"
@echo "PREREQ_INSTALL = $(sort $(PREREQ_INSTALL))" @echo "PREREQ_INSTALL = $(sort $(PREREQ_INSTALL))"
@echo "PREREQ_RUN = $(sort $(PREREQ_RUN))" @echo "PREREQ_RUN = $(sort $(PREREQ_RUN))"

20
make/run.mk
View file

@ -67,24 +67,24 @@ install:
clean: runclean localclean clean: runclean localclean
distclean: distclean:
run-prereq: all run-deps: all
$(RM) -f core core.* vgcore vgcore.* $(RM) -f core core.* vgcore vgcore.*
ifeq ($(TARGET),mingw) ifeq ($(TARGET),mingw)
run test: run-prereq run test: run-deps
@echo "wine $(EXE_PATH) $(EXE_ARGS)" @echo "wine $(EXE_PATH) $(EXE_ARGS)"
@echo -e "set PATH=%PATH;$(DLL_PATH)\n" \ @echo -e "set PATH=%PATH;$(DLL_PATH)\n" \
"$(EXE_PATH) $(EXE_ARGS)" | wine cmd "$(EXE_PATH) $(EXE_ARGS)" | wine cmd
start: run-prereq start: run-deps
@echo "wine $(EXE_PATH) $(EXE_ARGS)" @echo "wine $(EXE_PATH) $(EXE_ARGS)"
@echo -e "set PATH=%PATH;$(DLL_PATH)\n" \ @echo -e "set PATH=%PATH;$(DLL_PATH)\n" \
"$(EXE_PATH) $(EXE_ARGS)" | wine cmd & "$(EXE_PATH) $(EXE_ARGS)" | wine cmd &
else else
run test: run-prereq run test: run-deps
$(EXE_PATH) $(EXE_ARGS) $(EXE_PATH) $(EXE_ARGS)
start: run-prereq start: run-deps
$(EXE_PATH) $(EXE_ARGS) & $(EXE_PATH) $(EXE_ARGS) &
which: which:
@ -115,13 +115,13 @@ wait-stop:
restart: stop wait-stop all start restart: stop wait-stop all start
valgrind: run-prereq valgrind: run-deps
valgrind $(VALGRIND_OPTS) $(EXE_PATH) $(EXE_ARGS) valgrind $(VALGRIND_OPTS) $(EXE_PATH) $(EXE_ARGS)
valkyrie: run-prereq valkyrie: run-deps
valkyrie $(VALGRIND_OPTS) $(EXE_PATH) $(EXE_ARGS) valkyrie $(VALGRIND_OPTS) $(EXE_PATH) $(EXE_ARGS)
efence: run-prereq efence: run-deps
ef $(EXE_PATH) $(EXE_ARGS) ef $(EXE_PATH) $(EXE_ARGS)
supp.tmp: supp.tmp:
@ -156,10 +156,10 @@ kill:
abort: abort:
killall -6 $(notdir $(EXE_PATH)) killall -6 $(notdir $(EXE_PATH))
strace: $(EXE_PATH) $(EXE_BIN) run-prereq strace: $(EXE_PATH) $(EXE_BIN) run-deps
strace -f $(STRACE_EXTRA_OPTS) $(EXE_PATH) $(EXE_ARGS) strace -f $(STRACE_EXTRA_OPTS) $(EXE_PATH) $(EXE_ARGS)
tee: $(EXE_PATH) $(EXE_BIN) run-prereq tee: $(EXE_PATH) $(EXE_BIN) run-deps
$(EXE_PATH) $(EXE_ARGS) 2>&1 | tee run.out $(EXE_PATH) $(EXE_ARGS) 2>&1 | tee run.out
kcg: kcg:

2
make/topdir.mk
View file

@ -186,7 +186,7 @@ prefix.done:
mkdir -p $(PREFIX) mkdir -p $(PREFIX)
touch $@ touch $@
echo-prereq-build: echo-build-deps:
@echo $(call proj_query, required-os-pkg --flavours "build" $(PROJECT)) @echo $(call proj_query, required-os-pkg --flavours "build" $(PROJECT))
git-ssh-%: git-ssh-%: