Patch 8.1.2247

13 views
Skip to first unread message

Bram Moolenaar

unread,
Nov 3, 2019, 12:39:20 PM11/3/19
to vim...@googlegroups.com

Patch 8.1.2247
Problem: "make vimtags" does not work in runtime/doc.
Solution: Test existence with "which" instead of "test -x". (Ken Takata)
Files: runtime/doc/Makefile


*** ../vim-8.1.2246/runtime/doc/Makefile 2019-11-02 22:45:28.727242517 +0100
--- runtime/doc/Makefile 2019-11-03 18:23:41.979755043 +0100
***************
*** 323,329 ****
# Use Vim to generate the tags file. Can only be used when Vim has been
# compiled and installed. Supports multiple languages.
vimtags: $(DOCS)
! @if test -x $(VIMEXE); then $(VIMEXE) --clean -eX -u doctags.vim; \
else echo "vim executable $(VIMEXE) not found"; fi

# Use "doctags" to generate the tags file. Only works for English!
--- 323,330 ----
# Use Vim to generate the tags file. Can only be used when Vim has been
# compiled and installed. Supports multiple languages.
vimtags: $(DOCS)
! @if which $(VIMEXE) >/dev/null; then \
! $(VIMEXE) --clean -eX -u doctags.vim >/dev/null; \
else echo "vim executable $(VIMEXE) not found"; fi

# Use "doctags" to generate the tags file. Only works for English!
*** ../vim-8.1.2246/src/version.c 2019-11-03 16:17:08.987705274 +0100
--- src/version.c 2019-11-03 18:25:25.079405906 +0100
***************
*** 743,744 ****
--- 743,746 ----
{ /* Add new patch number below this line */
+ /**/
+ 2247,
/**/

--
How To Keep A Healthy Level Of Insanity:
8. Don't use any punctuation marks.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

Tony Mechelynck

unread,
Nov 3, 2019, 2:11:59 PM11/3/19
to vim_dev
On Sun, Nov 3, 2019 at 6:39 PM Bram Moolenaar <Br...@moolenaar.net> wrote:
>
>
> Patch 8.1.2247
> Problem: "make vimtags" does not work in runtime/doc.
> Solution: Test existence with "which" instead of "test -x". (Ken Takata)
> Files: runtime/doc/Makefile

Vim is still not run, not even after "touch runtime/doc/help.txt": the
tags file has a date of yesterday 15:04, one minute later than
motion.txt, options.txt, syntax.txt, term.txt, terminal.txt, todo.txt
and windows.txt (that's in runtime/doc in the "build" structure; under
$VIMRUNTIME all helpfiles are dated a couple of minutes ago). Here's a
log extract:

cd ../runtime/doc; if test -z "" -a -f tags; then \
mv -f tags tags.dist; ficd ../runtime/doc; if test -z "" -a -f
tags; then \
mv -f tags tags.dist; fi
generating help tags
make[1]: Entering directory '/root/.build/vim/vim-hg/runtime/doc'
make[1]: Leaving directory '/root/.build/vim/vim-hg/runtime/doc'
cd ../runtime/doc; \
files=`ls *.txt tags`; \
files="$files `ls *.??x tags-?? 2>/dev/null || true`"; \
cp $files /usr/local/share/vim/vim81/doc; \
cd /usr/local/share/vim/vim81/doc; \
chmod 644 $files
cp ../runtime/doc/*.pl /usr/local/share/vim/vim81/doc
chmod 755 /usr/local/share/vim/vim81/doc/*.pl
cd ../runtime/doc; if test -f tags.dist; then mv -f tags.dist tags; fi


Best regards,
Tony.

Bram Moolenaar

unread,
Nov 3, 2019, 3:25:10 PM11/3/19
to vim...@googlegroups.com, Tony Mechelynck
How do you know Vim didn't run? The command isn't printed.
That it doesn't mention it can't find Vim is good.
Well, I can add a message that the tags got updated to avoid confusion.

--
Giving a commit hash to refer to a patch is like giving longitude and
lattitude to refer to a city.

Tony Mechelynck

unread,
Nov 3, 2019, 3:32:27 PM11/3/19
to Bram Moolenaar, vim_dev
I know it wasn't run because the last update date of runtime/doc/tags
after that wasn't "a few minutes ago" but it was "yesterday".
Previously the vim command was printed.

Besty regards,
Tony.
Reply all
Reply to author
Forward
0 new messages