Zsh Mailing List Archive
Messages sorted by: Reverse Date, Date, Thread, Author

Re: zsh make(1) completion on FreeBSD

Guilherme Salazar wrote on Tue, Oct 11, 2016 at 22:14:04 -0300:
> > That's precisely what the _pick_variant call at the top of the function
> > does, so you can just test $is_gnu instead.  Note that the enclosing if
> > already inspects that variable.
> $is_gnu will still give unix (on FreeBSD) in case `which make` is just
> a symlink to /usr/local/bin/gmake.

I went over this with Baptiste on IRC.  _pick_variant behaves as
expected; however, the freebsd* case was taken for both bmake and gmake
on that OS (when call-command is unset, which is the default).

This patch refactors the code to avoid that, adds the TARGETS+= and
-nsdg1Fstdout magic from the original patch, and also adds dragonfly and
netbsd support at Baptiste's suggestion.

I left call-comand out of the non-GNU path since that's how it was



diff --git a/Completion/Unix/Command/_make b/Completion/Unix/Command/_make
index d10c8ee..35a892c 100644
--- a/Completion/Unix/Command/_make
+++ b/Completion/Unix/Command/_make
@@ -263,17 +263,20 @@ _make() {
     if [[ -n "$file" ]]
-      if [[ $is_gnu == gnu ]] && zstyle -t ":completion:${curcontext}:targets" call-command
+      if [[ $is_gnu == gnu ]] 
-        _make-parseMakefile $PWD < <(_call_program targets "$words[1]" -nsp --no-print-directory -f "$file" .PHONY 2> /dev/null)
+        if zstyle -t ":completion:${curcontext}:targets" call-command; then
+          _make-parseMakefile $PWD < <(_call_program targets "$words[1]" -nsp --no-print-directory -f "$file" .PHONY 2> /dev/null)
+        else
+          _make-parseMakefile $PWD < $file
+        fi
-        case "$OSTYPE" in
-          freebsd*)
-          _make-parseMakefile $PWD < <(_call_program targets "$words[1]" -nsp -f "$file" .PHONY 2> /dev/null)
-    ;;
-    *)
+        if [[ $OSTYPE == (freebsd|dragonfly|netbsd)* || /$words[1] == */bmake* ]]; then
+          TARGETS+=(${=${(f)"$(_call_program targets "$words[1]" -s -f "$file" -V.ALLTARGETS 2> /dev/null)"}})
+          _make-parseMakefile $PWD < <(_call_program targets "$words[1]" -nsdg1Fstdout -f "$file" .PHONY 2> /dev/null)
+        else
           _make-parseMakefile $PWD < $file
-        esac
+        fi

> > In current master (before your patch), the 'call-command' style is
> > consulted only for GNU make but not for FreeBSD.  Do you know if that's
> > intentional, perhaps (going by the style's docs) because the GNU make
> > invocation has side-effects while the BSD make invocation has none?
> I'd expect the -n option to avoid side effects. Perhaps the reason is
> that the BSD make infrastructure is a lot different than GNU's and a
> single Makefile may not carry enough information by itself to generate
> good completion?

Messages sorted by: Reverse Date, Date, Thread, Author