mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-19 13:17:39 +01:00
projects-dir.mk: Introduce and evalutate JW_BUILD_VERBOSE
Most notably, ssh-wrapper.sh doesn't run ssh with -x anylonger, if JW_BUILD_VERBOSE is not set to true Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
parent
80992f6025
commit
ac476f10c2
1 changed files with 21 additions and 14 deletions
|
|
@ -13,18 +13,30 @@
|
||||||
# might take you there semi-automatically.
|
# might take you there semi-automatically.
|
||||||
#
|
#
|
||||||
|
|
||||||
# ------------ Makefile and environment variables
|
# ------------ Makefile and environment variable definitions
|
||||||
|
|
||||||
-include local.mk
|
-include local.mk
|
||||||
|
|
||||||
SHELL = /bin/bash -o pipefail
|
SHELL = /bin/bash -o pipefail
|
||||||
|
PROJECTS_TXT ?= projects.txt
|
||||||
|
JW_BUILD_VERBOSE ?= false
|
||||||
|
BASE_PACKAGES = cvs git make sudo
|
||||||
|
EXCLUDE_FROM_BUILD += \
|
||||||
|
dspider-btools \
|
||||||
|
dspider-shared \
|
||||||
|
feedfs-dspcd \
|
||||||
|
casview \
|
||||||
|
dspfs \
|
||||||
|
jux3 \
|
||||||
|
emscren-v8
|
||||||
|
|
||||||
|
|
||||||
|
# ------------ evaluate Makefile and environment variables
|
||||||
|
|
||||||
ifneq ($(PROJECTS),)
|
ifneq ($(PROJECTS),)
|
||||||
export PGIT_CLONE_PROJECTS = $(PROJECTS)
|
export PGIT_CLONE_PROJECTS = $(PROJECTS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
PROJECTS_TXT ?= projects.txt
|
|
||||||
|
|
||||||
ifneq ($(wildcard $(PROJECTS_TXT)),)
|
ifneq ($(wildcard $(PROJECTS_TXT)),)
|
||||||
PROJECTS ?= $(shell cat $(PROJECTS_TXT) | sed '/^ *\#/ d')
|
PROJECTS ?= $(shell cat $(PROJECTS_TXT) | sed '/^ *\#/ d')
|
||||||
# TODO: this could be nicer
|
# TODO: this could be nicer
|
||||||
|
|
@ -34,16 +46,11 @@ else
|
||||||
CVS_PROJECTS = $(filter $(dir $(wildcard */CVS)),$(PROJECTS))
|
CVS_PROJECTS = $(filter $(dir $(wildcard */CVS)),$(PROJECTS))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
BASE_PACKAGES = cvs git make sudo
|
ifeq ($(JW_BUILD_VERBOSE),true)
|
||||||
|
SSH_WRAPPER_TRACE ?= -x
|
||||||
|
endif
|
||||||
|
|
||||||
EXCLUDE_FROM_BUILD += \
|
export JW_BUILD_VERBOSE
|
||||||
dspider-btools \
|
|
||||||
dspider-shared \
|
|
||||||
feedfs-dspcd \
|
|
||||||
casview \
|
|
||||||
dspfs \
|
|
||||||
jux3 \
|
|
||||||
emscren-v8
|
|
||||||
|
|
||||||
# ------------ external programs I
|
# ------------ external programs I
|
||||||
|
|
||||||
|
|
@ -370,7 +377,7 @@ links.done:
|
||||||
touch $@
|
touch $@
|
||||||
|
|
||||||
$(SSH_WRAPPER_SH): Makefile
|
$(SSH_WRAPPER_SH): Makefile
|
||||||
/bin/echo -e '#!/bin/bash -x\n\nexec /usr/bin/ssh $$JW_BUILD_SSH_EXTRA_OPTS "$$@"' > $@.tmp
|
/bin/echo -e '#!/bin/bash $(SSH_WRAPPER_TRACE)\n\nexec /usr/bin/ssh $$JW_BUILD_SSH_EXTRA_OPTS "$$@"' > $@.tmp
|
||||||
chmod 700 $@.tmp
|
chmod 700 $@.tmp
|
||||||
mv $@.tmp $@
|
mv $@.tmp $@
|
||||||
ssh-wrapper: $(SSH_WRAPPER_SH)
|
ssh-wrapper: $(SSH_WRAPPER_SH)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue