From c0793f35389c58dc01082bbce01edbd59d77d4f3 Mon Sep 17 00:00:00 2001 From: "Rafael G. Martins" Date: Mon, 12 Mar 2018 00:46:51 +0100 Subject: make: rename TAG_CLOUD to MAKE_TAGS all the template helper variables provided by blogc-make should start with MAKE_ --- man/blogcfile.5.ronn | 2 +- src/blogc-make/exec.c | 2 +- tests/blogc-make/check_exec.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/man/blogcfile.5.ronn b/man/blogcfile.5.ronn index f93d0af..fb2d623 100644 --- a/man/blogcfile.5.ronn +++ b/man/blogcfile.5.ronn @@ -136,7 +136,7 @@ The `[tags]` section is a listing of the tags that should be listed in the website. blogc-make(1) will generate post listing indexes and Atom feeds for each tag listed in the section. -The tags will be also provided to blogc as a `TAG_CLOUD` variable, that is a +The tags will be also provided to blogc as a `MAKE_TAGS` variable, that is a space-separated list of the tags, useful to generate tag clouds using the `foreach` template iterator. See blogc-template(7). diff --git a/src/blogc-make/exec.c b/src/blogc-make/exec.c index d246df9..7fe96e5 100644 --- a/src/blogc-make/exec.c +++ b/src/blogc-make/exec.c @@ -237,7 +237,7 @@ bm_exec_build_blogc_cmd(const char *blogc_bin, bm_settings_t *settings, if (settings != NULL) { if (settings->tags != NULL) { char *tags = bc_strv_join(settings->tags, " "); - bc_string_append_printf(rv, " -D TAG_CLOUD='%s'", tags); + bc_string_append_printf(rv, " -D MAKE_TAGS='%s'", tags); free(tags); } diff --git a/tests/blogc-make/check_exec.c b/tests/blogc-make/check_exec.c index 3bf5df4..c3a8193 100644 --- a/tests/blogc-make/check_exec.c +++ b/tests/blogc-make/check_exec.c @@ -177,7 +177,7 @@ test_build_blogc_cmd_with_settings_and_tags(void **state) char *rv = bm_exec_build_blogc_cmd("blogc", settings, variables, local, true, "main.tmpl", "foo.html", true, true); assert_string_equal(rv, - "LC_ALL='en_US.utf8' blogc -D TAG_CLOUD='asd foo bar' -D FOO='BAR' " + "LC_ALL='en_US.utf8' blogc -D MAKE_TAGS='asd foo bar' -D FOO='BAR' " "-D BAR='BAZ' -D LOL='HEHE' -D ASD='QWE' -D MAKE_ENV_DEV=1 " "-D MAKE_ENV='dev' -l -t 'main.tmpl' -o 'foo.html' -i"); free(rv); @@ -185,14 +185,14 @@ test_build_blogc_cmd_with_settings_and_tags(void **state) rv = bm_exec_build_blogc_cmd("blogc", settings, variables, NULL, false, NULL, NULL, true, false); assert_string_equal(rv, - "LC_ALL='en_US.utf8' blogc -D TAG_CLOUD='asd foo bar' -D FOO='BAR' " + "LC_ALL='en_US.utf8' blogc -D MAKE_TAGS='asd foo bar' -D FOO='BAR' " "-D BAR='BAZ' -D LOL='HEHE' -D MAKE_ENV_DEV=1 -D MAKE_ENV='dev'"); free(rv); rv = bm_exec_build_blogc_cmd("blogc", settings, NULL, NULL, false, NULL, NULL, true, false); assert_string_equal(rv, - "LC_ALL='en_US.utf8' blogc -D TAG_CLOUD='asd foo bar' -D FOO='BAR' " + "LC_ALL='en_US.utf8' blogc -D MAKE_TAGS='asd foo bar' -D FOO='BAR' " "-D BAR='BAZ' -D MAKE_ENV_DEV=1 -D MAKE_ENV='dev'"); free(rv); -- cgit v1.2.3-18-g5258