]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
Merge bmake-20210110
authorSimon J. Gerraty <sjg@FreeBSD.org>
Thu, 14 Jan 2021 06:21:37 +0000 (22:21 -0800)
committerSimon J. Gerraty <sjg@FreeBSD.org>
Thu, 14 Jan 2021 06:21:37 +0000 (22:21 -0800)
commit06b9b3e0ad0dc3f0166b3e8f26ced68c271cf527
tree92a02f1874a5dacc12b39edd184602d24888baad
parent0495ed398c4f64013bab2327eb13a303e1f90c13
parent8e11a9b4250be3c3379c45fa820bff78d99d5946
Merge bmake-20210110

Quite a lot of churn on style, but lots of
good work refactoring complicated functions
and lots more unit-tests.
Thanks mostly to rillig at NetBSD

Some interesting entries from ChangeLog

o .MAKE.{UID,GID} represent uid and gid running make.

o allow env var MAKE_OBJDIR_CHECK_WRITABLE=no to skip writable
  checks in InitObjdir.  Explicit .OBJDIR target always allows
  read-only directory.

o add more unit tests for META MODE

Merge commit '8e11a9b4250be3c3379c45fa820bff78d99d5946' into main

Change-Id: I464fd4c013067f0915671c1ccc96d2d8090b2b9c
241 files changed:
contrib/bmake/ChangeLog
contrib/bmake/FILES
contrib/bmake/LICENSE
contrib/bmake/PSD.doc/tutorial.ms
contrib/bmake/VERSION
contrib/bmake/arch.c
contrib/bmake/bmake.1
contrib/bmake/bmake.cat1
contrib/bmake/buf.c
contrib/bmake/buf.h
contrib/bmake/compat.c
contrib/bmake/cond.c
contrib/bmake/dir.c
contrib/bmake/dir.h
contrib/bmake/enum.c
contrib/bmake/enum.h
contrib/bmake/filemon/filemon.h
contrib/bmake/filemon/filemon_dev.c
contrib/bmake/filemon/filemon_ktrace.c
contrib/bmake/for.c
contrib/bmake/hash.c
contrib/bmake/hash.h
contrib/bmake/import.sh
contrib/bmake/job.c
contrib/bmake/job.h
contrib/bmake/lst.c
contrib/bmake/lst.h
contrib/bmake/main.c
contrib/bmake/make-conf.h
contrib/bmake/make.1
contrib/bmake/make.c
contrib/bmake/make.h
contrib/bmake/make_malloc.c
contrib/bmake/make_malloc.h
contrib/bmake/meta.c
contrib/bmake/meta.h
contrib/bmake/metachar.h
contrib/bmake/mk/ChangeLog
contrib/bmake/mk/dirdeps-options.mk
contrib/bmake/mk/dirdeps-targets.mk
contrib/bmake/mk/dirdeps.mk
contrib/bmake/mk/init.mk
contrib/bmake/mk/install-mk
contrib/bmake/mk/meta.subdir.mk
contrib/bmake/mk/mkopt.sh
contrib/bmake/mk/own.mk
contrib/bmake/mk/sys.mk
contrib/bmake/nonints.h
contrib/bmake/os.sh
contrib/bmake/parse.c
contrib/bmake/pathnames.h
contrib/bmake/str.c
contrib/bmake/suff.c
contrib/bmake/targ.c
contrib/bmake/trace.c
contrib/bmake/trace.h
contrib/bmake/unit-tests/Makefile
contrib/bmake/unit-tests/cmd-errors-jobs.exp
contrib/bmake/unit-tests/cmd-errors-jobs.mk
contrib/bmake/unit-tests/cmd-errors.mk
contrib/bmake/unit-tests/cmdline.mk
contrib/bmake/unit-tests/compat-error.exp
contrib/bmake/unit-tests/compat-error.mk
contrib/bmake/unit-tests/cond-eof.exp
contrib/bmake/unit-tests/cond-eof.mk
contrib/bmake/unit-tests/cond-func-empty.mk
contrib/bmake/unit-tests/cond-func-exists.mk
contrib/bmake/unit-tests/cond-func-make-main.exp
contrib/bmake/unit-tests/cond-func-make-main.mk
contrib/bmake/unit-tests/cond-short.exp
contrib/bmake/unit-tests/cond-short.mk
contrib/bmake/unit-tests/cond-token-string.exp
contrib/bmake/unit-tests/dep-percent.exp
contrib/bmake/unit-tests/depsrc-meta.exp
contrib/bmake/unit-tests/depsrc-meta.mk
contrib/bmake/unit-tests/depsrc-optional.exp
contrib/bmake/unit-tests/depsrc.exp
contrib/bmake/unit-tests/depsrc.mk
contrib/bmake/unit-tests/deptgt-begin-fail-indirect.exp
contrib/bmake/unit-tests/deptgt-begin-fail-indirect.mk
contrib/bmake/unit-tests/deptgt-begin-fail.exp
contrib/bmake/unit-tests/deptgt-begin-fail.mk
contrib/bmake/unit-tests/deptgt-end-fail-all.exp
contrib/bmake/unit-tests/deptgt-end-fail-all.mk
contrib/bmake/unit-tests/deptgt-end-fail-indirect.exp
contrib/bmake/unit-tests/deptgt-end-fail-indirect.mk
contrib/bmake/unit-tests/deptgt-end-fail.exp
contrib/bmake/unit-tests/deptgt-end-fail.mk
contrib/bmake/unit-tests/deptgt-suffixes.exp
contrib/bmake/unit-tests/deptgt-suffixes.mk
contrib/bmake/unit-tests/deptgt.exp
contrib/bmake/unit-tests/deptgt.mk
contrib/bmake/unit-tests/directive-elif.exp
contrib/bmake/unit-tests/directive-elif.mk
contrib/bmake/unit-tests/directive-else.exp
contrib/bmake/unit-tests/directive-else.mk
contrib/bmake/unit-tests/directive-endfor.exp
contrib/bmake/unit-tests/directive-endfor.mk
contrib/bmake/unit-tests/directive-endif.exp
contrib/bmake/unit-tests/directive-endif.mk
contrib/bmake/unit-tests/directive-error.mk
contrib/bmake/unit-tests/directive-export-env.mk
contrib/bmake/unit-tests/directive-export-impl.exp
contrib/bmake/unit-tests/directive-export-impl.mk
contrib/bmake/unit-tests/directive-export-literal.mk
contrib/bmake/unit-tests/directive-export.exp
contrib/bmake/unit-tests/directive-export.mk
contrib/bmake/unit-tests/directive-for-errors.exp
contrib/bmake/unit-tests/directive-for-errors.mk
contrib/bmake/unit-tests/directive-for-escape.exp
contrib/bmake/unit-tests/directive-for-escape.mk
contrib/bmake/unit-tests/directive-for-lines.exp
contrib/bmake/unit-tests/directive-for-lines.mk
contrib/bmake/unit-tests/directive-for-null.exp
contrib/bmake/unit-tests/directive-for-null.mk
contrib/bmake/unit-tests/directive-for.exp
contrib/bmake/unit-tests/directive-for.mk
contrib/bmake/unit-tests/directive-if.exp
contrib/bmake/unit-tests/directive-if.mk
contrib/bmake/unit-tests/directive-include.mk
contrib/bmake/unit-tests/directive-info.exp
contrib/bmake/unit-tests/directive-info.mk
contrib/bmake/unit-tests/directive-misspellings.exp
contrib/bmake/unit-tests/directive-misspellings.mk
contrib/bmake/unit-tests/directive-undef.exp
contrib/bmake/unit-tests/directive-undef.mk
contrib/bmake/unit-tests/directive-unexport-env.exp
contrib/bmake/unit-tests/directive-unexport-env.mk
contrib/bmake/unit-tests/directive-unexport.exp
contrib/bmake/unit-tests/directive-unexport.mk
contrib/bmake/unit-tests/directive-warning.exp
contrib/bmake/unit-tests/directive-warning.mk
contrib/bmake/unit-tests/jobs-error-indirect.exp
contrib/bmake/unit-tests/jobs-error-indirect.mk
contrib/bmake/unit-tests/jobs-error-nested-make.exp
contrib/bmake/unit-tests/jobs-error-nested-make.mk
contrib/bmake/unit-tests/jobs-error-nested.exp
contrib/bmake/unit-tests/jobs-error-nested.mk
contrib/bmake/unit-tests/make-exported.mk
contrib/bmake/unit-tests/meta-cmd-cmp.exp
contrib/bmake/unit-tests/meta-cmd-cmp.mk
contrib/bmake/unit-tests/modmisc.exp
contrib/bmake/unit-tests/modmisc.mk
contrib/bmake/unit-tests/opt-chdir.exp
contrib/bmake/unit-tests/opt-debug-errors.exp
contrib/bmake/unit-tests/opt-debug-graph1.exp
contrib/bmake/unit-tests/opt-debug-jobs.exp
contrib/bmake/unit-tests/opt-debug-lint.exp
contrib/bmake/unit-tests/opt-debug-lint.mk
contrib/bmake/unit-tests/opt-file.exp
contrib/bmake/unit-tests/opt-file.mk
contrib/bmake/unit-tests/opt-jobs-no-action.exp
contrib/bmake/unit-tests/opt-jobs-no-action.mk
contrib/bmake/unit-tests/opt-keep-going-multiple.exp
contrib/bmake/unit-tests/opt-keep-going-multiple.mk
contrib/bmake/unit-tests/opt-keep-going.exp
contrib/bmake/unit-tests/opt-keep-going.mk
contrib/bmake/unit-tests/opt-no-action-runflags.exp
contrib/bmake/unit-tests/opt-no-action-runflags.mk
contrib/bmake/unit-tests/opt.exp
contrib/bmake/unit-tests/posix.exp
contrib/bmake/unit-tests/sh-dots.exp
contrib/bmake/unit-tests/sh-errctl.exp
contrib/bmake/unit-tests/sh-errctl.mk
contrib/bmake/unit-tests/sh-flags.exp
contrib/bmake/unit-tests/sh-flags.mk
contrib/bmake/unit-tests/sh-jobs.exp
contrib/bmake/unit-tests/sh-jobs.mk
contrib/bmake/unit-tests/sh-meta-chars.mk
contrib/bmake/unit-tests/shell-csh.mk
contrib/bmake/unit-tests/suff-add-later.exp
contrib/bmake/unit-tests/suff-clear-regular.exp
contrib/bmake/unit-tests/suff-clear-regular.mk
contrib/bmake/unit-tests/suff-clear-single.exp
contrib/bmake/unit-tests/suff-incomplete.exp
contrib/bmake/unit-tests/suff-incomplete.mk
contrib/bmake/unit-tests/suff-lookup.exp
contrib/bmake/unit-tests/suff-main-several.exp
contrib/bmake/unit-tests/suff-main-several.mk
contrib/bmake/unit-tests/suff-phony.exp
contrib/bmake/unit-tests/suff-phony.mk
contrib/bmake/unit-tests/suff-rebuild.exp
contrib/bmake/unit-tests/suff-rebuild.mk
contrib/bmake/unit-tests/suff-self.exp
contrib/bmake/unit-tests/suff-transform-debug.exp
contrib/bmake/unit-tests/suff-transform-debug.mk
contrib/bmake/unit-tests/suff-transform-endless.exp
contrib/bmake/unit-tests/suff-transform-endless.mk
contrib/bmake/unit-tests/suff-transform-expand.exp
contrib/bmake/unit-tests/suff-transform-select.exp
contrib/bmake/unit-tests/suff-transform-select.mk
contrib/bmake/unit-tests/use-inference.exp
contrib/bmake/unit-tests/use-inference.mk
contrib/bmake/unit-tests/var-op-default.mk
contrib/bmake/unit-tests/var-op-expand.exp
contrib/bmake/unit-tests/var-op-expand.mk
contrib/bmake/unit-tests/vardebug.exp
contrib/bmake/unit-tests/varmisc.mk
contrib/bmake/unit-tests/varmod-defined.exp
contrib/bmake/unit-tests/varmod-edge.exp
contrib/bmake/unit-tests/varmod-extension.exp
contrib/bmake/unit-tests/varmod-extension.mk
contrib/bmake/unit-tests/varmod-gmtime.exp
contrib/bmake/unit-tests/varmod-gmtime.mk
contrib/bmake/unit-tests/varmod-head.exp
contrib/bmake/unit-tests/varmod-head.mk
contrib/bmake/unit-tests/varmod-ifelse.exp
contrib/bmake/unit-tests/varmod-ifelse.mk
contrib/bmake/unit-tests/varmod-indirect.exp
contrib/bmake/unit-tests/varmod-indirect.mk
contrib/bmake/unit-tests/varmod-localtime.exp
contrib/bmake/unit-tests/varmod-localtime.mk
contrib/bmake/unit-tests/varmod-range.exp
contrib/bmake/unit-tests/varmod-root.exp
contrib/bmake/unit-tests/varmod-root.mk
contrib/bmake/unit-tests/varmod-subst-regex.exp
contrib/bmake/unit-tests/varmod-subst-regex.mk
contrib/bmake/unit-tests/varmod-sysv.exp
contrib/bmake/unit-tests/varmod-sysv.mk
contrib/bmake/unit-tests/varmod-tail.exp
contrib/bmake/unit-tests/varmod-tail.mk
contrib/bmake/unit-tests/varmod-to-many-words.mk
contrib/bmake/unit-tests/varmod-to-one-word.mk
contrib/bmake/unit-tests/varmod-to-separator.exp
contrib/bmake/unit-tests/varmod.exp
contrib/bmake/unit-tests/varmod.mk
contrib/bmake/unit-tests/varname-dot-makeflags.exp
contrib/bmake/unit-tests/varname-dot-makeflags.mk
contrib/bmake/unit-tests/varname-dot-shell.exp
contrib/bmake/unit-tests/varname-make_print_var_on_error-jobs.exp
contrib/bmake/unit-tests/varname-make_print_var_on_error-jobs.mk
contrib/bmake/unit-tests/varname-make_print_var_on_error.exp
contrib/bmake/unit-tests/varname-make_print_var_on_error.mk
contrib/bmake/unit-tests/varname-makeflags.mk
contrib/bmake/unit-tests/varparse-dynamic.mk
contrib/bmake/unit-tests/varparse-errors.exp
contrib/bmake/unit-tests/varparse-errors.mk
contrib/bmake/util.c
contrib/bmake/var.c
usr.bin/bmake/Makefile.config
usr.bin/bmake/unit-tests/Makefile