| Message ID | 280363cd569a8c6e870107eb219597b42911fed2.1743859985.git.ramsay@ramsayjones.plus.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | miscellaneous build mods (part 1) | expand |
On 06/04/2025 20:38, Ramsay Jones wrote: [snip] > diff --git a/meson.build b/meson.build > index 88a29fd043..efd0bd3319 100644 > --- a/meson.build > +++ b/meson.build > @@ -693,10 +693,8 @@ endif > # These variables are used for building libgit.a. > libgit_c_args = [ > '-DBINDIR="' + get_option('bindir') + '"', > - '-DDEFAULT_EDITOR="' + get_option('default_editor') + '"', > '-DDEFAULT_GIT_TEMPLATE_DIR="' + get_option('datadir') / 'git-core/templates' + '"', > '-DDEFAULT_HELP_FORMAT="' + get_option('default_help_format') + '"', > - '-DDEFAULT_PAGER="' + get_option('default_pager') + '"', > '-DETC_GITATTRIBUTES="' + get_option('gitattributes') + '"', > '-DETC_GITCONFIG="' + get_option('gitconfig') + '"', > '-DFALLBACK_RUNTIME_PREFIX="' + get_option('prefix') + '"', > @@ -708,6 +706,17 @@ libgit_c_args = [ > '-DPAGER_ENV="' + get_option('pager_environment') + '"', > '-DSHELL_PATH="' + fs.as_posix(shell.full_path()) + '"', > ] > + > +editor_opt = get_option('default_editor') > +if editor_opt != '' and editor_opt != 'vi' > + libgit_c_args += '-DDEFAULT_EDITOR="' + editor_opt + '"' > +endif > + > +pager_opt = get_option('default_pager') > +if pager_opt != '' and pager_opt != 'less' > + libgit_c_args += '-DDEFAULT_PAGER="' + pager_opt + '"' > +endif > + > libgit_include_directories = [ '.' ] > libgit_dependencies = [ ] > It would be somewhat remiss of me to not mention here that this does not work for any but the simplest of values! :( If you set a simple single 'bareword' like 'vim' or 'more' (even '~/bin/vi') then every thing works just fine. However, if the value contains any of (at least) the following characters: single quote, double quote or backslash, then things stop working! [I spent one whole evening (and a bit - always something else to 'try') trying to 'fix' this problem, without success] If you try an example that is given in the Makefile:312, then the make build: $ make V=1 DEFAULT_EDITOR='"C:\Program Files\Vim\gvim.exe" --nofork' all doc >m-out 2>&1 passes the folowing arguments to (respectively) gcc and asciidoc: -DDEFAULT_EDITOR='"\"C:\\Program Files\\Vim\\gvim.exe\" --nofork"' -a 'git-default-editor="C:\Program Files\Vim\gvim.exe" --nofork' whereas, the meson build: $ meson setup --optimization=2 -Ddocs=man,html -Ddefault_editor='"C:\Program Files\Vim\gvim.exe" --nofork' -Ddefault_pager=more -Dprefix=$HOME -Dpcre2=disabled build/ The Meson build system ... User defined options optimization : 2 prefix : /home/ramsay default_editor: "C:\Program Files\Vim\gvim.exe" --nofork default_pager : more docs : man,html pcre2 : disabled Found ninja-1.11.1 at /usr/bin/ninja $ similarly, passes the folowing arguments to (respectively) gcc and asciidoc: '-DDEFAULT_EDITOR=""C:\\Program Files\\Vim\\gvim.exe" --nofork"' '-agit-default-editor="C:/Program Files/Vim/gvim.exe" --nofork' If you now attempt a 'meson compile' it will, of course, fail to compile editor.c because the DEFAULT_EDITOR is the empty string ("") followed by (C:\\Program Files\\Vim\\gvim.exe" --nofork"). Also, note that the directory seperators have changed from \\ to / in the argument to asciidoc. [Again, spelunking the docs for meson, it said that "if you want quotes, you will have to do it yourself"! ;) ] OK, so I couldn't come up with any incantation which would fix this issue. I will have to admit defeat and ask someone who actually knows meson to fix it. :( Thanks. ATB, Ramsay Jones
diff --git a/Documentation/meson.build b/Documentation/meson.build index 594546d68b..1642b6e2a3 100644 --- a/Documentation/meson.build +++ b/Documentation/meson.build @@ -242,6 +242,16 @@ if docs_backend == 'asciidoc' '--attribute=build_dir=' + meson.current_build_dir(), ] + pager_opt = get_option('default_pager') + if pager_opt != '' and pager_opt != 'less' + asciidoc_common_options += '-agit-default-pager=' + pager_opt + endif + + editor_opt = get_option('default_editor') + if editor_opt != '' and editor_opt != 'vi' + asciidoc_common_options += '-agit-default-editor=' + editor_opt + endif + documentation_deps = [ asciidoc_conf, ] @@ -279,6 +289,16 @@ elif docs_backend == 'asciidoctor' '--require', 'asciidoctor-extensions', ] + pager_opt = get_option('default_pager') + if pager_opt != '' and pager_opt != 'less' + asciidoc_common_options += '-agit-default-pager=' + pager_opt + endif + + editor_opt = get_option('default_editor') + if editor_opt != '' and editor_opt != 'vi' + asciidoc_common_options += '-agit-default-editor=' + editor_opt + endif + documentation_deps = [ asciidoctor_extensions, ] diff --git a/meson.build b/meson.build index 88a29fd043..efd0bd3319 100644 --- a/meson.build +++ b/meson.build @@ -693,10 +693,8 @@ endif # These variables are used for building libgit.a. libgit_c_args = [ '-DBINDIR="' + get_option('bindir') + '"', - '-DDEFAULT_EDITOR="' + get_option('default_editor') + '"', '-DDEFAULT_GIT_TEMPLATE_DIR="' + get_option('datadir') / 'git-core/templates' + '"', '-DDEFAULT_HELP_FORMAT="' + get_option('default_help_format') + '"', - '-DDEFAULT_PAGER="' + get_option('default_pager') + '"', '-DETC_GITATTRIBUTES="' + get_option('gitattributes') + '"', '-DETC_GITCONFIG="' + get_option('gitconfig') + '"', '-DFALLBACK_RUNTIME_PREFIX="' + get_option('prefix') + '"', @@ -708,6 +706,17 @@ libgit_c_args = [ '-DPAGER_ENV="' + get_option('pager_environment') + '"', '-DSHELL_PATH="' + fs.as_posix(shell.full_path()) + '"', ] + +editor_opt = get_option('default_editor') +if editor_opt != '' and editor_opt != 'vi' + libgit_c_args += '-DDEFAULT_EDITOR="' + editor_opt + '"' +endif + +pager_opt = get_option('default_pager') +if pager_opt != '' and pager_opt != 'less' + libgit_c_args += '-DDEFAULT_PAGER="' + pager_opt + '"' +endif + libgit_include_directories = [ '.' ] libgit_dependencies = [ ]
Some preprocessor -Defines have defaults set in the source code when they have not been provided to the C compiler. In this case, there is no need to pass them on the command-line, unless the build requires a non-standard value. The build variables for DEFAULT_EDITOR and DEFAULT_PAGER have appropriate defaults ('vi' and 'less') set in the code. Add the preprocessor -Defines to the 'libgit_c_args' only if the values set with the corresponding 'options' are different to these standard values. Also, the 'git-var' documentation contains some conditional text which documents the chosen compiled in value, which would not read well for the standard values. Similar to the above, only add the corresponding '-a' attribute arguments to the 'asciidoc_common_options' variable, if the values set in the 'options' are different to these standard values. Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com> --- Documentation/meson.build | 20 ++++++++++++++++++++ meson.build | 13 +++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-)