* [PATCH] _make: Better option handling of GNU make
@ 2013-07-24 16:14 Jun T.
0 siblings, 0 replies; only message in thread
From: Jun T. @ 2013-07-24 16:14 UTC (permalink / raw)
To: zsh-workers
Take care of mutually exclusive options.
Add _description using $state_descr.
Add completions for --debug=flag.
Fix typo (pointed out by Daniel Shahaf).
---
Completion/Unix/Command/_make | 76 ++++++++++++++++++++++++-----------------
1 file changed, 44 insertions(+), 32 deletions(-)
diff --git a/Completion/Unix/Command/_make b/Completion/Unix/Command/_make
index 355c68e..0c5371d 100644
--- a/Completion/Unix/Command/_make
+++ b/Completion/Unix/Command/_make
@@ -148,7 +148,7 @@ _make-findBasedir () {
_make() {
local prev="$words[CURRENT-1]" file expl tmp is_gnu dir incl match
- local context state line
+ local context state state_descr line
local -a option_specs
local -A TARGETS VARIABLES opt_args
local ret=1
@@ -159,35 +159,35 @@ _make() {
then
incl="(-|)include"
option_specs=(
- {-B,--always-make}'[Unconditionally make all targets]'
- '*'{-C,--directory=}'[change directory first]:directory:->dir'
- '-d[Print lots of debug information]'
- '--debug=-[Print various types of debug information]:FLAGS'
- {-e,--environment-overrides}'[Environment variables override makefiles]'
- '--eval=-[Evaluate STRING as a makefile statement]:STRING'
- {-f,--file=,--makefile=}'[Read FILE as a makefile]:file:->file'
- '-h[Print this message and exit]'
- {-i,--ignore-errors}'[Ignore errors from recipes]'
- '*'{-I,--include-dir=}'[Search DIRECTORY for included makefiles]:directory:->dir'
- {-j,--jobs=}'[Allow N jobs at once; infinite jobs with no arg]:number of jobs'
- {-k,--keep-going}"[Keep going when some targets can't be made]"
- {-l,--load-average=,--max-load}"[Don't start multiple jobs unless load is below N]:load"
- {-L,--check-symlink-times}'[Use the latest mtime between symlinks and target]'
- {-n,--just-print,--dry-run,--recon}"[Don't actually run any recipe; just print them]"
- '*'{-o,--old-file=,--assume-old=}"[Consider FILE to be very old and don't remake it]:file not to remake:->file"
- {-p,--print-data-base}'[Print makes internal database]'
- {-q,--question}'[Run no recipe; exit status says if up to date]'
- {-r,--no-builtin-rules}'[Disable the built-in implicit rules]'
- {-R,--no-builtin-variables}'[Disable the built-in variable settings]'
- {-s,--silent,--quiet}"[Don't echo recipes]"
- {-S,--no-keep-going,--stop}'[Turns off -k]'
- {-t,--touch}'[Touch targets instead of remaking them]'
- {-v,--version}'[Print the version number of make and exit]'
- {-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=,--asume-new=}'[Consider 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]'
+ '(-B --always-make)'{-B,--always-make}'[unconditionally make all targets]'
+ '*'{-C,--directory=}'[change directory first]:change to directory:->dir'
+ '-d[print lots of debug information]'
+ '--debug=-[print various types of debug information]:debug options:->debug'
+ '(-e --environment-overrides)'{-e,--environment-overrides}'[environment variables override makefiles]'
+ '--eval=-[evaluate STRING as a makefile statement]:STRING'
+ '(-f --file --makefile)'{-f,--file=,--makefile=}'[read FILE as a makefile]:makefile:->file'
+ '(- *)'{-h,--help}'[print help message and exit]'
+ '(-i --ignore-errors)'{-i,--ignore-errors}'[ignore errors from recipes]'
+ '*'{-I,--include-dir=}'[search DIRECTORY for included makefiles]:search path for included makefile:->dir'
+ '(-j --jobs)'{-j,--jobs=}'[allow N jobs at once; infinite jobs with no arg]:number of jobs'
+ '(-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 N]:load"
+ '(-L --check-symlik-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 FILE to be very old and don't remake it]:file not to remake:->file"
+ '(-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]'
+ '(-R --no-builtin-variables)'{-R,--no-builtin-variables}'[disable the built-in variable settings]'
+ '(-s --silent --quiet)'{-s,--silent,--quiet}"[don't echo recipes]"
+ '(-S --no-keep-going --stop)'{-S,--no-keep-going,--stop}'[turns off -k]'
+ '(-t --touch)'{-t,--touch}'[touch targets instead of remaking them]'
+ '(- *)'{-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 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.
@@ -206,11 +206,23 @@ _make() {
case $state in
(dir)
- _files -W ${(q)$(_make-findBasedir ${words[1,CURRENT-1]})} -/ && ret=0
+ _description directories expl "$state_descr"
+ _files "$expl[@]" -W ${(q)$(_make-findBasedir ${words[1,CURRENT-1]})} -/ && ret=0
;;
(file)
- _files -W ${(q)$(_make-findBasedir $words)} && ret=0
+ _description files expl "$state_descr"
+ _files "$expl[@]" -W ${(q)$(_make-findBasedir $words)} && ret=0
+ ;;
+
+ (debug)
+ _values -s , 'debug options' \
+ '(b v i j m)a[all debugging output]' \
+ 'b[basic debugging output]' \
+ '(b)v[one level above basic]' \
+ '(b)i[describe implicit rule searches (implies b)]' \
+ 'j[show details on invocation of subcommands]' \
+ 'm[enable debugging while remaking makefiles]' && ret=0
;;
(target)
--
1.7.9.6 (Apple Git-31.1)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-07-24 17:17 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-07-24 16:14 [PATCH] _make: Better option handling of GNU make Jun T.
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).