git: c1d01b5fd681 - main - Merge bmake-20230510
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 13 May 2023 17:08:26 UTC
The branch main has been updated by sjg:
URL: https://cgit.FreeBSD.org/src/commit/?id=c1d01b5fd6811491ee6c05cf6982fd65343122c8
commit c1d01b5fd6811491ee6c05cf6982fd65343122c8
Merge: da1ef2d61930 945078deae44
Author: Simon J. Gerraty <sjg@FreeBSD.org>
AuthorDate: 2023-05-13 17:05:48 +0000
Commit: Simon J. Gerraty <sjg@FreeBSD.org>
CommitDate: 2023-05-13 17:05:48 +0000
Merge bmake-20230510
Merge commit '945078deae448e0a13c34b3393d836087719fb16'
contrib/bmake/ChangeLog | 24 ++
contrib/bmake/FILES | 4 +-
contrib/bmake/VERSION | 2 +-
contrib/bmake/bmake.1 | 33 +-
contrib/bmake/bmake.cat1 | 17 +-
contrib/bmake/compat.c | 6 +-
contrib/bmake/for.c | 60 +++-
contrib/bmake/make.1 | 33 +-
contrib/bmake/mk/ChangeLog | 35 ++
contrib/bmake/mk/FILES | 2 +
contrib/bmake/mk/dirdeps-targets.mk | 11 +-
contrib/bmake/mk/dirdeps.mk | 16 +-
contrib/bmake/mk/install-mk | 4 +-
contrib/bmake/mk/jobs.mk | 17 +-
contrib/bmake/mk/meta.autodep.mk | 6 +-
contrib/bmake/mk/meta.sys.mk | 105 ++----
contrib/bmake/mk/mk-files.txt | 55 ++-
contrib/bmake/mk/newlog.sh | 412 ++++++++++++++++++++++
contrib/bmake/mk/sys.dependfile.mk | 11 +-
contrib/bmake/mk/sys.dirdeps.mk | 183 ++++++++++
contrib/bmake/mk/sys.mk | 5 +-
contrib/bmake/parse.c | 27 +-
contrib/bmake/unit-tests/Makefile | 6 +-
contrib/bmake/unit-tests/cond-func.mk | 12 +-
contrib/bmake/unit-tests/cond-late.mk | 15 +-
contrib/bmake/unit-tests/dep-var.mk | 7 +-
contrib/bmake/unit-tests/directive-for-errors.exp | 33 +-
contrib/bmake/unit-tests/directive-for-errors.mk | 57 ++-
contrib/bmake/unit-tests/directive-for-escape.exp | 84 ++---
contrib/bmake/unit-tests/directive-for-escape.mk | 62 +++-
contrib/bmake/unit-tests/directive-for.exp | 63 ++--
contrib/bmake/unit-tests/directive-for.mk | 149 +++++---
contrib/bmake/unit-tests/forloop.exp | 20 --
contrib/bmake/unit-tests/forloop.mk | 53 ---
contrib/bmake/unit-tests/parse.mk | 32 +-
contrib/bmake/unit-tests/var-eval-short.exp | 8 +-
contrib/bmake/unit-tests/var-eval-short.mk | 12 +-
contrib/bmake/unit-tests/var-scope-local.exp | 54 ++-
contrib/bmake/unit-tests/var-scope-local.mk | 101 ++++--
contrib/bmake/unit-tests/varmod-gmtime.exp | 20 +-
contrib/bmake/unit-tests/varmod-gmtime.mk | 33 +-
contrib/bmake/unit-tests/varmod-localtime.exp | 20 +-
contrib/bmake/unit-tests/varmod-localtime.mk | 33 +-
contrib/bmake/unit-tests/varmod-mtime.exp | 1 +
contrib/bmake/unit-tests/varmod-mtime.mk | 30 ++
contrib/bmake/unit-tests/varmod-path.mk | 14 +-
contrib/bmake/var.c | 119 ++++++-
47 files changed, 1547 insertions(+), 559 deletions(-)
diff --cc contrib/bmake/mk/newlog.sh
index 000000000000,526d1700d98f..526d1700d98f
mode 000000,100755..100755
--- a/contrib/bmake/mk/newlog.sh
+++ b/contrib/bmake/mk/newlog.sh
diff --cc contrib/bmake/mk/sys.dirdeps.mk
index 000000000000,845eda181b90..845eda181b90
mode 000000,100644..100644
--- a/contrib/bmake/mk/sys.dirdeps.mk
+++ b/contrib/bmake/mk/sys.dirdeps.mk
diff --cc contrib/bmake/unit-tests/varmod-mtime.exp
index 000000000000,39a9383953dd..39a9383953dd
mode 000000,100644..100644
--- a/contrib/bmake/unit-tests/varmod-mtime.exp
+++ b/contrib/bmake/unit-tests/varmod-mtime.exp
diff --cc contrib/bmake/unit-tests/varmod-mtime.mk
index 000000000000,dd57ef3f0f31..dd57ef3f0f31
mode 000000,100644..100644
--- a/contrib/bmake/unit-tests/varmod-mtime.mk
+++ b/contrib/bmake/unit-tests/varmod-mtime.mk