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

run.mk: Add variable EXE_CMD

Browse source 
Add variable EXE_CMD to be overriden in including makefiles

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2020-12-01 16:21:20 +00:00
commit 0596109c36
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
make/run.mk
View file

@ -50,13 +50,13 @@ LD_SCRIPTS = $(foreach d,$(BUILD_LD_DIRS),$(wildcard $(d)/*.ld
FINAL_LDFLAGS += $(foreach d,$(BUILD_LD_DIRS),-L$(d) $(addprefix -T ,$(sort $(notdir $(wildcard $(d)/*.ld))))) FINAL_LDFLAGS += $(foreach d,$(BUILD_LD_DIRS),-L$(d) $(addprefix -T ,$(sort $(notdir $(wildcard $(d)/*.ld)))))
include $(JWBDIR)/make/profiler.mk include $(JWBDIR)/make/profiler.mk
BUILD_HDR =
include $(JWBDIR)/make/rules.mk include $(JWBDIR)/make/rules.mk
include $(JWBDIR)/make/ldlibpath.mk include $(JWBDIR)/make/ldlibpath.mk
include $(JWBDIR)/make/path-rules.mk include $(JWBDIR)/make/path-rules.mk
include $(JWBDIR)/make/debugger.mk include $(JWBDIR)/make/debugger.mk
EXE_ARGS += $(LOCAL_EXE_ARGS) EXE_ARGS += $(LOCAL_EXE_ARGS)
EXE_CMD ?= $(EXE_PATH) $(EXE_ARGS)
ifneq ($(wildcard local.supp),) ifneq ($(wildcard local.supp),)
VALGRIND_OPTS += --suppressions=local.supp VALGRIND_OPTS += --suppressions=local.supp
@ -72,20 +72,20 @@ run-deps: all
ifeq ($(TARGET),mingw) ifeq ($(TARGET),mingw)
run test: run-deps run test: run-deps
@echo "wine $(EXE_PATH) $(EXE_ARGS)" @echo "wine $(EXE_CMD)"
@echo -e "set PATH=%PATH;$(DLL_PATH)\n" \ @echo -e "set PATH=%PATH;$(DLL_PATH)\n" \
"$(EXE_PATH) $(EXE_ARGS)" | wine cmd "$(EXE_CMD)" | wine cmd
start: run-deps start: run-deps
@echo "wine $(EXE_PATH) $(EXE_ARGS)" @echo "wine $(EXE_CMD)"
@echo -e "set PATH=%PATH;$(DLL_PATH)\n" \ @echo -e "set PATH=%PATH;$(DLL_PATH)\n" \
"$(EXE_PATH) $(EXE_ARGS)" | wine cmd & "$(EXE_CMD)" | wine cmd &
else else
run test: run-deps run test: run-deps
$(EXE_PATH) $(EXE_ARGS) $(EXE_CMD)
start: run-deps start: run-deps
$(EXE_PATH) $(EXE_ARGS) & $(EXE_CMD) &
which: which:
$(WHICH) $(EXE_PATH) $(WHICH) $(EXE_PATH)
@ -93,9 +93,9 @@ which:
$(SHORTCUT_SCRIPT): $(SHORTCUT_SCRIPT):
ifeq ($(TARGET),mingw) ifeq ($(TARGET),mingw)
echo "set PATH=%PATH;$(DLL_PATH)" > $@.tmp echo "set PATH=%PATH;$(DLL_PATH)" > $@.tmp
echo "$(EXE_PATH) $(EXE_ARGS)" >> $@.tmp echo "$(EXE_CMD)" >> $@.tmp
else else
echo -e "#!/bin/bash\n\n$(RM) -f core.*\nexport LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)\nexport PATH=$(PATH)\n$(EXE_PATH) $(EXE_ARGS)" > $@.tmp echo -e "#!/bin/bash\n\n$(RM) -f core.*\nexport LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)\nexport PATH=$(PATH)\n$(EXE_CMD)" > $@.tmp
chmod 755 $@.tmp chmod 755 $@.tmp
endif endif
mv $@.tmp $@ mv $@.tmp $@
@ -116,16 +116,16 @@ wait-stop:
restart: stop wait-stop all start restart: stop wait-stop all start
valgrind: run-deps valgrind: run-deps
valgrind $(VALGRIND_OPTS) $(EXE_PATH) $(EXE_ARGS) valgrind $(VALGRIND_OPTS) $(EXE_CMD)
valkyrie: run-deps valkyrie: run-deps
valkyrie $(VALGRIND_OPTS) $(EXE_PATH) $(EXE_ARGS) valkyrie $(VALGRIND_OPTS) $(EXE_CMD)
efence: run-deps efence: run-deps
ef $(EXE_PATH) $(EXE_ARGS) ef $(EXE_CMD)
supp.tmp: supp.tmp:
valgrind --gen-suppressions=all $(EXE_PATH) $(EXE_ARGS) 2>$@.tmp; mv $@.tmp $@ || exit 0 valgrind --gen-suppressions=all $(EXE_CMD) 2>$@.tmp; mv $@.tmp $@ || exit 0
vg-create-supp: supp.tmp vg-create-supp: supp.tmp
$(CAT) $< | $(JWB_SCRIPT_DIR)/parse-valgrind-suppressions.sh > local.supp $(CAT) $< | $(JWB_SCRIPT_DIR)/parse-valgrind-suppressions.sh > local.supp
@ -157,10 +157,10 @@ abort:
killall -6 $(notdir $(EXE_PATH)) killall -6 $(notdir $(EXE_PATH))
strace: $(EXE_PATH) $(EXE_BIN) run-deps strace: $(EXE_PATH) $(EXE_BIN) run-deps
strace -f $(STRACE_EXTRA_OPTS) $(EXE_PATH) $(EXE_ARGS) strace -f $(STRACE_EXTRA_OPTS) $(EXE_CMD)
tee: $(EXE_PATH) $(EXE_BIN) run-deps tee: $(EXE_PATH) $(EXE_BIN) run-deps
$(EXE_PATH) $(EXE_ARGS) 2>&1 | tee run.out $(EXE_CMD) 2>&1 | tee run.out
kcg: kcg:
kcachegrind callgrind.* kcachegrind callgrind.*