janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-26 15:23:54 +01:00
Code Activity

make/Makefile, defs-dev.mk: Futher reduced calls to shell from Makefiles

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-03-03 14:50:44 +00:00
commit 857c7d2c6c
2 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/Makefile
View file

@ -7,7 +7,7 @@ TOPDIR = ..
CACHED_FILES := defs.mk projects.mk platform.mk Makefile CACHED_FILES := defs.mk projects.mk platform.mk Makefile
#CACHED_VARS = $(shell sed '/^[ \t]*\([A-Z_]\+\) *\(.=\).*$$.shell/!d; s/ *.=.*//' $(CACHED_FILES)) #CACHED_VARS = $(shell sed '/^[ \t]*\([A-Z_]\+\) *\(.=\).*$$.shell/!d; s/ *.=.*//' $(CACHED_FILES))
CACHED_VARS := WHICH BROWSER SED RM PWD ID CUT TR AWK GETENT XARGS FIND PRINTF HOST_TUPLE OS_NAME_VERSION OS_NAME CAT BIN_INSTALL SUDO CACHED_VARS := WHICH ECHO TEST BROWSER SED RM PWD ID CUT TR AWK GETENT XARGS FIND PRINTF HOST_TUPLE OS_NAME_VERSION OS_NAME CAT BIN_INSTALL SUDO
#CACHED_VARS += TARGET_ARCH RPM_ARCH #CACHED_VARS += TARGET_ARCH RPM_ARCH
CACHED_VARS += TARGET_ARCH CACHED_VARS += TARGET_ARCH
#CACHED_VARS += DEVELOPMENT #CACHED_VARS += DEVELOPMENT

82
make/defs-dev.mk
View file

@ -50,20 +50,20 @@ SITE_MODULES_DIR ?= $(HTDOCS_PREFIX)/proj/site/modules.d
CGI_DIR ?= $(PROJECT_HTMLDIR)/cgi-bin CGI_DIR ?= $(PROJECT_HTMLDIR)/cgi-bin
# -- misc # -- misc
LOGID ?= $(shell id -un | cut -c1-2)-$(PROJECT) LOGID ?= $(shell $(ECHO) $(BUILD_USER) | cut -c1-2)-$(PROJECT)
DAEMON_RUN_USER ?= $(shell id -un) DAEMON_RUN_USER ?= $(BUILD_USER)
DAEMON_RUN_GROUP ?= $(shell id -gn) DAEMON_RUN_GROUP ?= $(BUILD_GROUP)
CATCH_ONLY_YERROR?= true CATCH_ONLY_YERROR?= true
# -- file attributes # -- file attributes
EXEOWNER ?= $(shell id -un) EXEOWNER ?= $(BUILD_USER)
EXEGROUP ?= $(shell id -gn) EXEGROUP ?= $(BUILD_GROUP)
EXEMODE ?= 770 EXEMODE ?= 770
EXEDIROWNER ?= $(shell id -un) EXEDIROWNER ?= $(BUILD_USER)
EXEDIRGROUP ?= $(shell id -gn) EXEDIRGROUP ?= $(BUILD_GROUP)
EXEDIRMODE ?= 755 EXEDIRMODE ?= 755
CFGOWNER ?= $(shell id -un) CFGOWNER ?= $(BUILD_USER)
CFGGROUP ?= $(shell id -gn) CFGGROUP ?= $(BUILD_GROUP)
CFGMODE ?= 660 CFGMODE ?= 660
CFGDIROWNER ?= $(EXEDIROWNER) CFGDIROWNER ?= $(EXEDIROWNER)
CFGDIRGROUP ?= $(EXEDIRGROUP) CFGDIRGROUP ?= $(EXEDIRGROUP)
@ -74,8 +74,8 @@ SYSCFGMODE ?= $(CFGMODE)
SYSCFGDIROWNER ?= $(CFGDIROWNER) SYSCFGDIROWNER ?= $(CFGDIROWNER)
SYSCFGDIRGROUP ?= $(CFGDIRGROUP) SYSCFGDIRGROUP ?= $(CFGDIRGROUP)
SYSCFGDIRMODE ?= $(CFGDIRMODE) SYSCFGDIRMODE ?= $(CFGDIRMODE)
HDROWNER ?= $(shell id -un) HDROWNER ?= $(BUILD_USER)
HDRGROUP ?= $(shell id -gn) HDRGROUP ?= $(BUILD_GROUP)
HDRMODE ?= 644 HDRMODE ?= 644
HDRDIROWNER ?= $(EXEDIROWNER) HDRDIROWNER ?= $(EXEDIROWNER)
HDRDIRGROUP ?= $(EXEDIRGROUP) HDRDIRGROUP ?= $(EXEDIRGROUP)
@ -92,11 +92,11 @@ SCRIPTMODE ?= $(EXEMODE)
SCRIPTDIROWNER ?= $(EXEDIROWNER) SCRIPTDIROWNER ?= $(EXEDIROWNER)
SCRIPTDIRGROUP ?= $(EXEDIRGROUP) SCRIPTDIRGROUP ?= $(EXEDIRGROUP)
SCRIPTDIRMODE ?= $(EXEDIRMODE) SCRIPTDIRMODE ?= $(EXEDIRMODE)
PYMODOWNER ?= $(shell id -un) PYMODOWNER ?= $(BUILD_USER)
PYMODGROUP ?= $(shell id -gn) PYMODGROUP ?= $(BUILD_GROUP)
PYMODMODE ?= 644 PYMODMODE ?= 644
PYMODDIROWNER ?= $(shell id -un) PYMODDIROWNER ?= $(BUILD_USER)
PYMODDIRGROUP ?= $(shell id -gn) PYMODDIRGROUP ?= $(BUILD_GROUP)
PYMODDIRMODE ?= 755 PYMODDIRMODE ?= 755
INITOWNER ?= $(EXEOWNER) INITOWNER ?= $(EXEOWNER)
INITGROUP ?= $(EXEGROUP) INITGROUP ?= $(EXEGROUP)
@ -110,17 +110,17 @@ CGIMODE ?= $(EXEMODE)
CGIDIROWNER ?= $(EXEDIROWNER) CGIDIROWNER ?= $(EXEDIROWNER)
CGIDIRGROUP ?= $(EXEDIRGROUP) CGIDIRGROUP ?= $(EXEDIRGROUP)
CGIDIRMODE ?= $(EXEDIRMODE) CGIDIRMODE ?= $(EXEDIRMODE)
HTMLOWNER ?= $(shell id -un) HTMLOWNER ?= $(BUILD_USER)
HTMLGROUP ?= $(shell id -gn) HTMLGROUP ?= $(BUILD_GROUP)
HTMLMODE ?= 644 HTMLMODE ?= 644
HTMLDIROWNER ?= $(shell id -un) HTMLDIROWNER ?= $(BUILD_USER)
HTMLDIRGROUP ?= $(shell id -gn) HTMLDIRGROUP ?= $(BUILD_GROUP)
HTMLDIRMODE ?= 755 HTMLDIRMODE ?= 755
SYSTEMDOWNER ?= $(shell id -un) SYSTEMDOWNER ?= $(BUILD_USER)
SYSTEMDGROUP ?= $(shell id -gn) SYSTEMDGROUP ?= $(BUILD_GROUP)
SYSTEMDMODE ?= 644 SYSTEMDMODE ?= 644
SYSTEMDDIROWNER ?= $(shell id -un) SYSTEMDDIROWNER ?= $(BUILD_USER)
SYSTEMDDIRGROUP ?= $(shell id -gn) SYSTEMDDIRGROUP ?= $(BUILD_GROUP)
SYSTEMDDIRMODE ?= 755 SYSTEMDDIRMODE ?= 755
LIBOWNER ?= $(EXEOWNER) LIBOWNER ?= $(EXEOWNER)
LIBGROUP ?= $(EXEGROUP) LIBGROUP ?= $(EXEGROUP)
@ -143,14 +143,14 @@ MAKEDIRMODE ?= $(HDRDIRMODE)
PROFILEOWNER ?= $(EXEOWNER) PROFILEOWNER ?= $(EXEOWNER)
PROFILEGROUP ?= $(EXEGROUP) PROFILEGROUP ?= $(EXEGROUP)
PROFILEMODE ?= $(EXEMODE) PROFILEMODE ?= $(EXEMODE)
PROFILEDIROWNER ?= $(shell id -un) PROFILEDIROWNER ?= $(BUILD_USER)
PROFILEDIRGROUP ?= $(shell id -gn) PROFILEDIRGROUP ?= $(BUILD_GROUP)
PROFILEDIRMODE ?= 770 PROFILEDIRMODE ?= 770
ROOTOWNER ?= $(shell id -un) ROOTOWNER ?= $(BUILD_USER)
ROOTGROUP ?= $(shell id -gn) ROOTGROUP ?= $(BUILD_GROUP)
ROOTMODE ?= 770 ROOTMODE ?= 770
ROOTDIROWNER ?= $(shell id -un) ROOTDIROWNER ?= $(BUILD_USER)
ROOTDIRGROUP ?= $(shell id -gn) ROOTDIRGROUP ?= $(BUILD_GROUP)
ROOTDIRMODE ?= 750 ROOTDIRMODE ?= 750
DOCOWNER ?= $(HDROWNER) DOCOWNER ?= $(HDROWNER)
DOCGROUP ?= $(HDRGROUP) DOCGROUP ?= $(HDRGROUP)
@ -164,11 +164,11 @@ TMPLMODE ?= $(DOCMODE)
TMPLDIROWNER ?= $(DOCDIROWNER) TMPLDIROWNER ?= $(DOCDIROWNER)
TMPLDIRGROUP ?= $(DOCDIRGROUP) TMPLDIRGROUP ?= $(DOCDIRGROUP)
TMPLDIRMODE ?= $(DOCDIRMODE) TMPLDIRMODE ?= $(DOCDIRMODE)
VAROWNER ?= $(shell id -un) VAROWNER ?= $(BUILD_USER)
VARGROUP ?= $(shell id -gn) VARGROUP ?= $(BUILD_GROUP)
VARMODE ?= 666 VARMODE ?= 666
VARDIROWNER ?= $(shell id -un) VARDIROWNER ?= $(BUILD_USER)
VARDIRGROUP ?= $(shell id -gn) VARDIRGROUP ?= $(BUILD_GROUP)
VARDIRMODE ?= 770 VARDIRMODE ?= 770
PREFIXOWNER ?= $(EXEOWNER) PREFIXOWNER ?= $(EXEOWNER)
PREFIXGROUP ?= $(EXEGROUP) PREFIXGROUP ?= $(EXEGROUP)
@ -176,17 +176,17 @@ PREFIXMODE ?= 770
PREFIXDIROWNER ?= $(EXEDIROWNER) PREFIXDIROWNER ?= $(EXEDIROWNER)
PREFIXDIRGROUP ?= $(EXEDIRGROUP) PREFIXDIRGROUP ?= $(EXEDIRGROUP)
PREFIXDIRMODE ?= 770 PREFIXDIRMODE ?= 770
IMGOWNER ?= $(shell id -un) IMGOWNER ?= $(BUILD_USER)
IMGGROUP ?= $(shell id -gn) IMGGROUP ?= $(BUILD_GROUP)
IMGMODE ?= 666 IMGMODE ?= 666
IMGDIROWNER ?= $(shell id -un) IMGDIROWNER ?= $(BUILD_USER)
IMGDIRGROUP ?= $(shell id -gn) IMGDIRGROUP ?= $(BUILD_GROUP)
IMGDIRMODE ?= 770 IMGDIRMODE ?= 770
MOOWNER ?= $(shell id -un) MOOWNER ?= $(BUILD_USER)
MOGROUP ?= $(shell id -gn) MOGROUP ?= $(BUILD_GROUP)
MOMODE ?= 666 MOMODE ?= 666
MODIROWNER ?= $(shell id -un) MODIROWNER ?= $(BUILD_USER)
MODIRGROUP ?= $(shell id -gn) MODIRGROUP ?= $(BUILD_GROUP)
MODIRMODE ?= 775 MODIRMODE ?= 775
LOGOWNER ?= $(DOCOWNER) LOGOWNER ?= $(DOCOWNER)
LOGGROUP ?= $(DOCGROUP) LOGGROUP ?= $(DOCGROUP)