Skip to content

Commit 611b9ef

Browse files
gericksongerickson
authored
Update subtree mirror of repository 'https://github.com/nestlabs/nlbuild-autotools.git' branch 'master' at commit '1.7.4'. (project-chip#841)
1 parent 25a6d55 commit 611b9ef

File tree

8 files changed

+140
-45
lines changed

8 files changed

+140
-45
lines changed

‎third_party/nlbuild-autotools/repo/.default-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.7.3
1+
1.7.4

‎third_party/nlbuild-autotools/repo/CHANGES

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
1.7.4 (2020-05-18)
2+
3+
* Ensure that 'make help' displays help for generated make
4+
files in addition to the bootstrap make file for the all,
5+
check, coverage, dist, distcheck, doc, docdist, install,
6+
install-headers, manifest, repos, and clean-repos targets.
7+
18
1.7.3 (2020-05-11)
29

310
* Addressed an issue in which NL_ENABLE_COVERAGE,

‎third_party/nlbuild-autotools/repo/automake/post/rules/headers.am

+14-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#
2-
# Copyright 2015-2016 Nest Labs Inc. All Rights Reserved.
2+
# Copyright (c) 2020 Project nlbuild-autotools Authors. All Rights Reserved.
3+
# Copyright (c) 2015-2016 Nest Labs Inc. All Rights Reserved.
34
#
45
# Licensed under the Apache License, Version 2.0 (the "License");
56
# you may not use this file except in compliance with the License.
@@ -43,3 +44,15 @@ install-headers: $(BUILT_SOURCES) install-headers-recursive
4344

4445
install-headers-recursive:
4546
$(nl-make-subdirs)
47+
48+
define MaybePrintInstallHeadersHelp
49+
$(NL_V_AT)echo " install-headers"
50+
$(NL_V_AT)echo " Generate all configured public header artifacts for this"
51+
$(NL_V_AT)echo " project and install them in DESTDIR on the build host"
52+
$(NL_V_AT)echo " system."
53+
$(NL_V_AT)echo
54+
endef # MaybePrintInstallHeadersHelp
55+
56+
define PrintInstallHeadersHelp
57+
$(call MaybePrintInstallHeadersHelp)
58+
endef # PrintInstallHeadersHelp

‎third_party/nlbuild-autotools/repo/automake/pre/macros/coverage.am

+11
Original file line numberDiff line numberDiff line change
@@ -89,4 +89,15 @@ $(NL_V_LCOV)$(LCOV) $(NL_V_LCOV_FLAGS) --config-file="$(abs_top_nlbuild_autotool
8989
$(NL_V_GENHTML)$(GENHTML) $(NL_V_GENHTML_FLAGS) --config-file="$(abs_top_nlbuild_autotools_dir)/etc/lcov.config" "$(@)" --output-directory "$(@D)"
9090
endef # generate-coverage-report
9191

92+
define MaybePrintCoverageHelp
93+
$(NL_V_AT)echo " coverage"
94+
$(NL_V_AT)echo " Generate all configured build artifacts, run all unit"
95+
$(NL_V_AT)echo " and functional tests, and generate code coverage results"
96+
$(NL_V_AT)echo " for this project."
97+
$(NL_V_AT)echo
98+
endef # MaybePrintCoverageHelp
99+
100+
define PrintCoverageHelp
101+
$(call MaybePrintCoverageHelp)
102+
endef # PrintCoverageHelp
92103

‎third_party/nlbuild-autotools/repo/automake/pre/macros/pretty.am

+37-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#
2-
# Copyright 2016 Nest Labs Inc. All Rights Reserved.
2+
# Copyright (c) 2020 Project nlbuild-autotools Authors. All Rights Reserved.
3+
# Copyright (c) 2016 Nest Labs Inc. All Rights Reserved.
34
#
45
# Licensed under the Apache License, Version 2.0 (the "License");
56
# you may not use this file except in compliance with the License.
@@ -50,3 +51,38 @@ PRETTY_FILES ?= $(SOURCES) $(HEADERS)
5051

5152
PRETTY_SUBDIRS ?= $(SUBDIRS)
5253

54+
ifneq ($(PRETTY_CHECK),)
55+
56+
define MaybePrintPrettyCheckHelp
57+
$(NL_V_AT)echo " pretty-check"
58+
$(NL_V_AT)echo " Check but do not (re-)format a collection of project"
59+
$(NL_V_AT)echo " source files."
60+
$(NL_V_AT)echo
61+
endef # MaybePrintPrettyCheckHelp
62+
63+
else
64+
65+
define MaybePrintPrettyCheckHelp
66+
endef # MaybePrintPrettyCheckHelp
67+
68+
endif # PRETTY_CHECK
69+
70+
ifneq ($(PRETTY),)
71+
72+
define MaybePrintPrettyHelp
73+
$(NL_V_AT)echo " pretty"
74+
$(NL_V_AT)echo " (Re-)format a collection of project source files."
75+
$(NL_V_AT)echo
76+
endef # MaybePrintPrettyHelp
77+
78+
else
79+
80+
define MaybePrintPrettyHelp
81+
endef # MaybePrintPrettyHelp
82+
83+
endif # PRETTY
84+
85+
define PrintPrettyHelp
86+
$(call MaybePrintPrettyHelp)
87+
$(call MaybePrintPrettyCheckHelp)
88+
endef # PrintPrettyHelp

‎third_party/nlbuild-autotools/repo/make/post/rules/bootstrap.mak

+2-27
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#
2-
# Copyright 2018 Nest Labs Inc. All Rights Reserved.
2+
# Copyright (c) 2020 Project nlbuild-autotools Authors. All Rights Reserved.
3+
# Copyright (c) 2018 Nest Labs Inc. All Rights Reserved.
34
#
45
# Licensed under the Apache License, Version 2.0 (the "License");
56
# you may not use this file except in compliance with the License.
@@ -55,9 +56,6 @@ bootstrap-make:
5556
$(BOOTSTRAP) -w make
5657

5758
define PrintBootstrapHelp
58-
$(NL_V_AT)echo " all"
59-
$(NL_V_AT)echo " Generate all configured build artifacts for this project."
60-
$(NL_V_AT)echo
6159
$(NL_V_AT)echo " bootstrap"
6260
$(NL_V_AT)echo " (Re-)generate all build infrastructure for the project, "
6361
$(NL_V_AT)echo " including both build configuration scripts and makefiles."
@@ -72,34 +70,11 @@ $(NL_V_AT)echo
7270
$(NL_V_AT)echo " bootstrap-make"
7371
$(NL_V_AT)echo " (Re-)generate build makefiles for the project."
7472
$(NL_V_AT)echo
75-
$(NL_V_AT)echo " check"
76-
$(NL_V_AT)echo " Generate all configured build artifacts and run all unit "
77-
$(NL_V_AT)echo " and functional tests for this project."
78-
$(NL_V_AT)echo
7973
$(NL_V_AT)echo " coverage"
8074
$(NL_V_AT)echo " Generate all configured build artifacts, run all unit "
8175
$(NL_V_AT)echo " and functional tests, and generate code coverage results "
8276
$(NL_V_AT)echo " for this project."
8377
$(NL_V_AT)echo
84-
$(NL_V_AT)echo " dist"
85-
$(NL_V_AT)echo " Generate an archive distribution snapshot for this project."
86-
$(NL_V_AT)echo
87-
$(NL_V_AT)echo " distcheck"
88-
$(NL_V_AT)echo " Generate an archive distribution snapshot for this project "
89-
$(NL_V_AT)echo " and sanity check the resulting distribution by running "
90-
$(NL_V_AT)echo " 'make check' on it for this project."
91-
$(NL_V_AT)echo
92-
$(NL_V_AT)echo " doc"
93-
$(NL_V_AT)echo " Generate documentation for the project."
94-
$(NL_V_AT)echo
95-
$(NL_V_AT)echo " docdist"
96-
$(NL_V_AT)echo " Generate an archive distribution of the documentation for "
97-
$(NL_V_AT)echo " the project."
98-
$(NL_V_AT)echo
99-
$(NL_V_AT)echo " install"
100-
$(NL_V_AT)echo " Generate all configured build artifacts for this project "
101-
$(NL_V_AT)echo " and install them in DESTDIR on the build host system."
102-
$(NL_V_AT)echo
10378
$(NL_V_AT)echo " install-headers"
10479
$(NL_V_AT)echo " Generate all configured public header artifacts for this "
10580
$(NL_V_AT)echo " project and install them in DESTDIR on the build host "

‎third_party/nlbuild-autotools/repo/make/post/rules/help.mak

+68-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#
2-
# Copyright 2018 Nest Labs Inc. All Rights Reserved.
2+
# Copyright (c) 2020 Project nlbuild-autotools Authors. All Rights Reserved.
3+
# Copyright (c) 2018 Nest Labs Inc. All Rights Reserved.
34
#
45
# Licensed under the Apache License, Version 2.0 (the "License");
56
# you may not use this file except in compliance with the License.
@@ -20,12 +21,77 @@
2021
# targets.
2122
#
2223

23-
define PrintHelp
24+
define PrintHelpPreamble
2425
$(NL_V_AT)echo "This makefile supports the following build targets:"
2526
$(NL_V_AT)echo
27+
endef # PrintHelpPreamble
28+
29+
define PrintAllHelp
30+
$(NL_V_AT)echo " all"
31+
$(NL_V_AT)echo " Generate all configured build artifacts for this project."
32+
$(NL_V_AT)echo
33+
endef # PrintAllHelp
34+
35+
define PrintCheckHelp
36+
$(NL_V_AT)echo " check"
37+
$(NL_V_AT)echo " Generate all configured build artifacts and run all unit"
38+
$(NL_V_AT)echo " and functional tests for this project."
39+
$(NL_V_AT)echo
40+
endef # PrintCheckHelp
41+
42+
define PrintDistHelp
43+
$(NL_V_AT)echo " dist"
44+
$(NL_V_AT)echo " Generate an archive distribution snapshot for this project."
45+
$(NL_V_AT)echo
46+
endef # PrintDistHelp
47+
48+
define PrintDistcheckHelp
49+
$(NL_V_AT)echo " distcheck"
50+
$(NL_V_AT)echo " Generate an archive distribution snapshot for this project"
51+
$(NL_V_AT)echo " and sanity check the resulting distribution by running"
52+
$(NL_V_AT)echo " 'make check' on it for this project."
53+
$(NL_V_AT)echo
54+
endef # PrintDistcheckHelp
55+
56+
define PrintDocHelp
57+
$(NL_V_AT)echo " doc"
58+
$(NL_V_AT)echo " Generate documentation for the project."
59+
$(NL_V_AT)echo
60+
endef # PrintDocHelp
61+
62+
define PrintDocdistHelp
63+
$(NL_V_AT)echo " docdist"
64+
$(NL_V_AT)echo " Generate an archive distribution of the documentation for"
65+
$(NL_V_AT)echo " the project."
66+
$(NL_V_AT)echo
67+
endef # PrintDocdistHelp
68+
69+
define PrintHelpHelp
2670
$(NL_V_AT)echo " help"
2771
$(NL_V_AT)echo " Display this content."
2872
$(NL_V_AT)echo
73+
endef # PrintHelpHelp
74+
75+
define PrintInstallHelp
76+
$(NL_V_AT)echo " install"
77+
$(NL_V_AT)echo " Generate all configured build artifacts for this project"
78+
$(NL_V_AT)echo " and install athem in DESTDIR on the build host system."
79+
$(NL_V_AT)echo
80+
endef # PrintInstallHelp
81+
82+
define PrintHelp
83+
$(call PrintHelpPreamble)
84+
$(call PrintAllHelp)
85+
$(call PrintCheckHelp)
86+
$(call PrintCoverageHelp)
87+
$(call PrintDistHelp)
88+
$(call PrintDistcheckHelp)
89+
$(call PrintDocHelp)
90+
$(call PrintDocdistHelp)
91+
$(call PrintInstallHelp)
92+
$(call PrintInstallHeadersHelp)
93+
$(call PrintPrettyHelp)
94+
$(call PrintReposHelp)
2995
endef # PrintHelp
3096

3197
.PHONY: help-local

‎third_party/nlbuild-autotools/repo/make/post/rules/repos.mak

-13
Original file line numberDiff line numberDiff line change
@@ -212,16 +212,3 @@ endif # REPOS
212212
define PrintReposHelp
213213
$(call MaybePrintReposHelp)
214214
endef # PrintReposHelp
215-
216-
.PHONY: help-repos-local
217-
help-repos-local:
218-
$(call PrintReposHelp)
219-
220-
.PHONY: help-repos-hook
221-
help-repos-hook: help-repos-local
222-
223-
.PHONY: help-repos
224-
help-repos: help-repos-local help-repos-hook
225-
226-
.PHONY: help
227-
help: help-repos

0 commit comments

Comments
 (0)