zsh-workers
 help / color / mirror / code / Atom feed
* [PATCH 0/1] Update GNU make completion for version 4.4
@ 2023-01-19  1:57 Shohei YOSHIDA
  2023-01-19  1:57 ` [PATCH 1/1] Update gnu " Shohei YOSHIDA
  0 siblings, 1 reply; 5+ messages in thread
From: Shohei YOSHIDA @ 2023-01-19  1:57 UTC (permalink / raw)
  To: zsh-workers; +Cc: Shohei YOSHIDA

Reference
- https://www.gnu.org/software/make/manual/html_node/Options-Summary.html

Shohei YOSHIDA (1):
  Update gnu make completion for version 4.4

 Completion/Unix/Command/_make | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

-- 
2.37.2



^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 1/1] Update gnu make completion for version 4.4
  2023-01-19  1:57 [PATCH 0/1] Update GNU make completion for version 4.4 Shohei YOSHIDA
@ 2023-01-19  1:57 ` Shohei YOSHIDA
  2023-01-19 13:56   ` Daniel Shahaf
  0 siblings, 1 reply; 5+ messages in thread
From: Shohei YOSHIDA @ 2023-01-19  1:57 UTC (permalink / raw)
  To: zsh-workers; +Cc: Shohei YOSHIDA

Add `-b,-m`, `--jobserver-style`, `--shuffle` and `--trace` options
And delete '--warn-undefined-functions' option. This option was implemented
only in redhat's older make and the official gnu make has never supported it.
---
 Completion/Unix/Command/_make | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Completion/Unix/Command/_make b/Completion/Unix/Command/_make
index 510368e8b..60f1da231 100644
--- a/Completion/Unix/Command/_make
+++ b/Completion/Unix/Command/_make
@@ -165,6 +165,7 @@ _make() {
   then
     incl="(-|)include"
     option_specs=(
+      '(-b -m)'{-b,-m}'[ignored for compatibility]'
       '(-B --always-make)'{-B,--always-make}'[unconditionally make all targets]'
       '*'{-C,--directory=}'[change directory first]:change to directory:->cdir'
       '-d[print lots of debug information]'
@@ -176,6 +177,7 @@ _make() {
       '(-i --ignore-errors)'{-i,--ignore-errors}'[ignore errors from recipes]'
       '*'{-I,--include-dir=}'[search specified directory for included makefiles]:search path for included makefile:->dir'
       '(-j --jobs)'{-j+,--jobs=}'[allow specified number of parallel jobs; unlimited jobs with no arg]:: : _guard "[0-9]#" "number of jobs"'
+      '--jobserver-style=[select the style of jobserver to use]:style:(fifo pipe sem)'
       '(-k --keep-going)'{-k,--keep-going}"[keep going when some targets can't be made]"
       '(-l --load-average --max-load)'{-l,--load-average=,--max-load}"[don't start multiple jobs unless load is below specified value]:load"
       '(-L --check-symlink-times)'{-L,--check-symlink-times}'[use the latest mtime between symlinks and target]'
@@ -185,17 +187,18 @@ _make() {
       '(-p --print-data-base)'{-p,--print-data-base}'[print makes internal database]'
       '(-q --question)'{-q,--question}'[run no recipe; exit status says if up to date]'
       '(-r --no-builtin-rules)'{-r,--no-builtin-rules}'[disable the built-in implicit rules]'
+      '--shuffle=-[perform shuffle of prerequisites and goals]::seed or mode:(random reverse none)'
       '(-R --no-builtin-variables)'{-R,--no-builtin-variables}'[disable the built-in variable settings]'
       '(-s --silent --quiet)'{-s,--silent,--quiet}"[don't echo recipes]"
       '--no-silent[echo recipes (disable --silent mode)]'
       '(-S --no-keep-going --stop)'{-S,--no-keep-going,--stop}'[turns off -k]'
       '(-t --touch)'{-t,--touch}'[touch targets instead of remaking them]'
+      '--trace[print tracing information]'
       '(- *)'{-v,--version}'[print the version number of make and exit]'
       '(-w --print-directory)'{-w,--print-directory}'[print the current directory]'
       '--no-print-directory[turn off -w, even if it was turned on implicitly]'
       '*'{-W,--what-if=,--new-file=,--assume-new=}'[consider specified file to be infinitely new]:file to treat as modified:->file'
       '--warn-undefined-variables[warn when an undefined variable is referenced]'
-      '--warn-undefined-functions[warn when an undefined user function is called]'
     )
   else
     # Basic make options only.
-- 
2.37.2



^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/1] Update gnu make completion for version 4.4
  2023-01-19  1:57 ` [PATCH 1/1] Update gnu " Shohei YOSHIDA
@ 2023-01-19 13:56   ` Daniel Shahaf
  2023-01-20  2:53     ` Shohei Yoshida
  0 siblings, 1 reply; 5+ messages in thread
From: Daniel Shahaf @ 2023-01-19 13:56 UTC (permalink / raw)
  To: Shohei YOSHIDA; +Cc: zsh-workers

Shohei YOSHIDA wrote on Thu, Jan 19, 2023 at 10:57:24 +0900:
> +++ b/Completion/Unix/Command/_make
> @@ -165,6 +165,7 @@ _make() {
>    then
>      incl="(-|)include"
>      option_specs=(
> +      '(-b -m)'{-b,-m}'[ignored for compatibility]'

Should we add an «!» to this optspec, so these two options aren't shown
in the output?

> @@ -185,17 +187,18 @@ _make() {
>        '(-p --print-data-base)'{-p,--print-data-base}'[print makes internal database]'

Preëxisting issue: we should add the missing apostrophe.

Cheers,

Daniel


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/1] Update gnu make completion for version 4.4
  2023-01-19 13:56   ` Daniel Shahaf
@ 2023-01-20  2:53     ` Shohei Yoshida
  2023-01-22 14:37       ` Daniel Shahaf
  0 siblings, 1 reply; 5+ messages in thread
From: Shohei Yoshida @ 2023-01-20  2:53 UTC (permalink / raw)
  To: Daniel Shahaf; +Cc: zsh-workers

[-- Attachment #1: Type: text/plain, Size: 909 bytes --]

Thanks for comments

I attached the updated patch

On Thu, Jan 19, 2023 at 10:56 PM Daniel Shahaf <d.s@daniel.shahaf.name> wrote:
>
> Shohei YOSHIDA wrote on Thu, Jan 19, 2023 at 10:57:24 +0900:
> > +++ b/Completion/Unix/Command/_make
> > @@ -165,6 +165,7 @@ _make() {
> >    then
> >      incl="(-|)include"
> >      option_specs=(
> > +      '(-b -m)'{-b,-m}'[ignored for compatibility]'
>
> Should we add an «!» to this optspec, so these two options aren't shown
> in the output?

Yes. I missed it, sorry. By the way, -b and -m options are ignored by
gnu make and make no sense.
So I removed it from the option list.

>
>
> > @@ -185,17 +187,18 @@ _make() {
> >        '(-p --print-data-base)'{-p,--print-data-base}'[print makes internal database]'
>
> Preëxisting issue: we should add the missing apostrophe.

I fixed it.

Cheers

-- 
Shohei YOSHIDA(syohex@gmail.com)

[-- Attachment #2: 0001-Update-gnu-make-completion-for-version-4.4.patch --]
[-- Type: text/x-patch, Size: 3421 bytes --]

From 78be2a33127730b09362fb956ad325a8ebc34dd9 Mon Sep 17 00:00:00 2001
From: Shohei YOSHIDA <syohex@gmail.com>
Date: Thu, 19 Jan 2023 10:48:24 +0900
Subject: [PATCH] Update gnu make completion for version 4.4

Add `--jobserver-style`, `--shuffle` and `--trace` options
And delete '--warn-undefined-functions' option. This option was implemented
only in redhat's older make and the official gnu make has never supported it.
---
 Completion/Unix/Command/_make | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Completion/Unix/Command/_make b/Completion/Unix/Command/_make
index 510368e8b..edc27512c 100644
--- a/Completion/Unix/Command/_make
+++ b/Completion/Unix/Command/_make
@@ -176,26 +176,28 @@ _make() {
       '(-i --ignore-errors)'{-i,--ignore-errors}'[ignore errors from recipes]'
       '*'{-I,--include-dir=}'[search specified directory for included makefiles]:search path for included makefile:->dir'
       '(-j --jobs)'{-j+,--jobs=}'[allow specified number of parallel jobs; unlimited jobs with no arg]:: : _guard "[0-9]#" "number of jobs"'
+      '--jobserver-style=[select the style of jobserver to use]:style:(fifo pipe sem)'
       '(-k --keep-going)'{-k,--keep-going}"[keep going when some targets can't be made]"
       '(-l --load-average --max-load)'{-l,--load-average=,--max-load}"[don't start multiple jobs unless load is below specified value]:load"
       '(-L --check-symlink-times)'{-L,--check-symlink-times}'[use the latest mtime between symlinks and target]'
       '(-n --just-print --dry-run --recon)'{-n,--just-print,--dry-run,--recon}"[don't actually run any recipe; just print them]"
       '*'{-o,--old-file=,--assume-old=}"[consider specified file to be old and don't remake it]:file not to remake:->file"
       '(-O --output-sync)'{-O-,--output-sync=-}'[synchronize output of parallel jobs]::granularity for grouping output:compadd -E 0 none line target recurse'
-      '(-p --print-data-base)'{-p,--print-data-base}'[print makes internal database]'
+      '(-p --print-data-base)'{-p,--print-data-base}"[print make's internal database]"
       '(-q --question)'{-q,--question}'[run no recipe; exit status says if up to date]'
       '(-r --no-builtin-rules)'{-r,--no-builtin-rules}'[disable the built-in implicit rules]'
+      '--shuffle=-[perform shuffle of prerequisites and goals]::seed or mode:(random reverse none)'
       '(-R --no-builtin-variables)'{-R,--no-builtin-variables}'[disable the built-in variable settings]'
       '(-s --silent --quiet)'{-s,--silent,--quiet}"[don't echo recipes]"
       '--no-silent[echo recipes (disable --silent mode)]'
       '(-S --no-keep-going --stop)'{-S,--no-keep-going,--stop}'[turns off -k]'
       '(-t --touch)'{-t,--touch}'[touch targets instead of remaking them]'
+      '--trace[print tracing information]'
       '(- *)'{-v,--version}'[print the version number of make and exit]'
       '(-w --print-directory)'{-w,--print-directory}'[print the current directory]'
       '--no-print-directory[turn off -w, even if it was turned on implicitly]'
       '*'{-W,--what-if=,--new-file=,--assume-new=}'[consider specified file to be infinitely new]:file to treat as modified:->file'
       '--warn-undefined-variables[warn when an undefined variable is referenced]'
-      '--warn-undefined-functions[warn when an undefined user function is called]'
     )
   else
     # Basic make options only.
-- 
2.37.2


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/1] Update gnu make completion for version 4.4
  2023-01-20  2:53     ` Shohei Yoshida
@ 2023-01-22 14:37       ` Daniel Shahaf
  0 siblings, 0 replies; 5+ messages in thread
From: Daniel Shahaf @ 2023-01-22 14:37 UTC (permalink / raw)
  To: Shohei Yoshida; +Cc: zsh-workers

Shohei Yoshida wrote on Fri, 20 Jan 2023 02:53 +00:00:
> On Thu, Jan 19, 2023 at 10:56 PM Daniel Shahaf <d.s@daniel.shahaf.name> wrote:
>> Shohei YOSHIDA wrote on Thu, Jan 19, 2023 at 10:57:24 +0900:
>> > +++ b/Completion/Unix/Command/_make
>> > @@ -165,6 +165,7 @@ _make() {
>> >    then
>> >      incl="(-|)include"
>> >      option_specs=(
>> > +      '(-b -m)'{-b,-m}'[ignored for compatibility]'
>>
>> Should we add an «!» to this optspec, so these two options aren't shown
>> in the output?
>
> Yes. I missed it, sorry. By the way, -b and -m options are ignored by
> gnu make and make no sense.
> So I removed it from the option list.

Sounds good to me.

>> > @@ -185,17 +187,18 @@ _make() {
>> >        '(-p --print-data-base)'{-p,--print-data-base}'[print makes internal database]'
>>
>> Preëxisting issue: we should add the missing apostrophe.
>
> I fixed it.

Thanks a lot.

> Attachments:
> * 0001-Update-gnu-make-completion-for-version-4.4.patch

Pushed with a minor tweak (described the format of "seed" in the optarg
of --shuffle).

Thanks for the patch,

Daniel


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2023-01-22 14:38 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-19  1:57 [PATCH 0/1] Update GNU make completion for version 4.4 Shohei YOSHIDA
2023-01-19  1:57 ` [PATCH 1/1] Update gnu " Shohei YOSHIDA
2023-01-19 13:56   ` Daniel Shahaf
2023-01-20  2:53     ` Shohei Yoshida
2023-01-22 14:37       ` Daniel Shahaf

Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).