jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 21:26:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

support/scripts/graph-depends: use colors instead of colours

Browse Source 
The graph-depends was not very consistent in colors vs. colours: some
parts were using colours, some parts were using colors.

Let's settle on the US spelling, colors.

This change the user-visble option --colours to --colors, but it is
unlikely that a lot of users customize the colors through
BR2_GRAPH_DEPS_OPTS, so this user interface change is considered
reasonable.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Thomas Petazzoni 2018-03-31 18:35:40 +02:00 committed by Peter Korsgaard
parent f179394621
commit 3cd92ac711
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/manual/common-usage.txt
View File

@ -224,12 +224,12 @@ The +graph-depends+ behaviour can be controlled by setting options in the
* +--transitive+, +--no-transitive+, to draw (or not) the transitive * +--transitive+, +--no-transitive+, to draw (or not) the transitive
dependencies. The default is to not draw transitive dependencies. dependencies. The default is to not draw transitive dependencies.
* +--colours R,T,H+, the comma-separated list of colours to draw the * +--colors R,T,H+, the comma-separated list of colors to draw the
root package (+R+), the target packages (+T+) and the host packages root package (+R+), the target packages (+T+) and the host packages
(+H+). Defaults to: +lightblue,grey,gainsboro+ (+H+). Defaults to: +lightblue,grey,gainsboro+
-------------------------------- --------------------------------
BR2_GRAPH_DEPS_OPTS='-d 3 --no-transitive --colours=red,green,blue' make graph-depends BR2_GRAPH_DEPS_OPTS='-d 3 --no-transitive --colors=red,green,blue' make graph-depends
-------------------------------- --------------------------------
=== Graphing the build duration === Graphing the build duration

16
support/scripts/graph-depends
View File

@ -297,9 +297,9 @@ def parse_args():
"'host' to stop on host packages.") "'host' to stop on host packages.")
parser.add_argument("--exclude", "-x", metavar="PACKAGE", dest="exclude_list", action="append", parser.add_argument("--exclude", "-x", metavar="PACKAGE", dest="exclude_list", action="append",
help="Like --stop-on, but do not add PACKAGE to the graph.") help="Like --stop-on, but do not add PACKAGE to the graph.")
parser.add_argument("--colours", "-c", metavar="COLOR_LIST", dest="colours", parser.add_argument("--colors", "-c", metavar="COLOR_LIST", dest="colors",
default="lightblue,grey,gainsboro", default="lightblue,grey,gainsboro",
help="Comma-separated list of the three colours to use" + help="Comma-separated list of the three colors to use" +
" to draw the top-level package, the target" + " to draw the top-level package, the target" +
" packages, and the host packages, in this order." + " packages, and the host packages, in this order." +
" Defaults to: 'lightblue,grey,gainsboro'") " Defaults to: 'lightblue,grey,gainsboro'")
@ -353,12 +353,12 @@ def main():
get_depends_func = brpkgutil.get_rdepends get_depends_func = brpkgutil.get_rdepends
arrow_dir = "back" arrow_dir = "back"
# Get the colours: we need exactly three colours, # Get the colors: we need exactly three colors,
# so no need not split more than 4 # so no need not split more than 4
# We'll let 'dot' validate the colours... # We'll let 'dot' validate the colors...
colours = args.colours.split(',', 4) colors = args.colors.split(',', 4)
if len(colours) != 3: if len(colors) != 3:
sys.stderr.write("Error: incorrect colour list '%s'\n" % args.colours) sys.stderr.write("Error: incorrect color list '%s'\n" % args.colors)
sys.exit(1) sys.exit(1)
# In full mode, start with the result of get_targets() to get the main # In full mode, start with the result of get_targets() to get the main
@ -403,7 +403,7 @@ def main():
outfile.write("digraph G {\n") outfile.write("digraph G {\n")
print_pkg_deps(outfile, dict_deps, dict_version, stop_list, exclude_list, print_pkg_deps(outfile, dict_deps, dict_version, stop_list, exclude_list,
arrow_dir, 0, args.depth, rootpkg, colours) arrow_dir, 0, args.depth, rootpkg, colors)
outfile.write("}\n") outfile.write("}\n")