summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Smith <psmith@gnu.org>2019-05-11 10:30:26 -0400
committerPaul Smith <psmith@gnu.org>2019-05-12 16:28:26 -0400
commit4a31ca461ffa845ba85f5190b767c50285c00141 (patch)
tree777a2483c4dd5993ddb79be90c31d5d8a4d8b407
parent214865ed5c66d8e363b16ea74509f23d93456707 (diff)
downloadmake-git-4a31ca461ffa845ba85f5190b767c50285c00141.tar.gz
Add developer customizations
* .ccls: Configure the ccls LSP server * .dir-locals.el: Reset some parameters for ccls and lsp-mode * .gitignore: Update for GTAGS and ccls * maintMakefile: Don't search hidden directories for sources
-rw-r--r--.ccls28
-rw-r--r--.dir-locals.el17
-rw-r--r--.gitignore8
-rw-r--r--maintMakefile6
4 files changed, 54 insertions, 5 deletions
diff --git a/.ccls b/.ccls
new file mode 100644
index 00000000..0f31f5ea
--- /dev/null
+++ b/.ccls
@@ -0,0 +1,28 @@
+clang
+%c -std=c99
+%h --include=makeint.h
+-DHAVE_CONFIG_H
+-Isrc
+-Ilib
+-DLIBDIR="/usr/local/lib"
+-DINCLUDEDIR="/usr/local/include"
+-DLOCALEDIR="/usr/local/share/locale"
+-DMAKE_MAINTAINER_MODE
+-pthread
+-isystem
+/usr/include/guile/2.0
+-Wall
+-Wextra
+-Werror
+-Wwrite-strings
+-Wshadow
+-Wdeclaration-after-statement
+-Wbad-function-cast
+-Wformat-security
+-Wtype-limits
+-Wunused-but-set-parameter
+-Wlogical-op
+-Wpointer-arith
+-Wignored-qualifiers
+-Wformat-signedness
+-Wduplicated-cond
diff --git a/.dir-locals.el b/.dir-locals.el
new file mode 100644
index 00000000..f71d12d4
--- /dev/null
+++ b/.dir-locals.el
@@ -0,0 +1,17 @@
+(
+ (nil . ((bug-reference-bug-regexp . "\\(\\)\\bSV[- ]\\([0-9]+\\)")
+ (bug-reference-url-format . "https://savannah.gnu.org/bugs/?%s")
+ (ccls-initialization-options . (:index (:threads 6
+ :initialBlacklist ("/make-[0-9]" "tests/work/" "/\\.deps" "/\\..*cache" "/\\.git"))))
+ (lsp-file-watch-ignored . ("/\\.git$"
+ "/\\..*cache$"
+ ;; autotools content
+ "/\\.deps$"
+ "/autom4te\\.cache$"
+ "/build-aux$"
+ ;; make-specific content
+ "/doc/manual$"
+ "/tests/work$"
+ "/make-[0-9]"))
+ ))
+)
diff --git a/.gitignore b/.gitignore
index b304956e..429e2790 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,10 @@
# Development artifacts
ID
TAGS
+GPATH
+GRTAGS
+GTAGS
+.*cache
.*gdbinit
.gdb_history
.vscode
@@ -15,7 +19,7 @@ Makefile
Makefile.in
Basic.mk
aclocal.m4
-autom4te.cache
+autom4te.cache/
build-aux/
config.cache
config.h
@@ -28,7 +32,7 @@ stamp-h1
.dirstamp
# Build artifacts
-.deps
+.deps/
gmk-default.h
loadavg
make
diff --git a/maintMakefile b/maintMakefile
index 05578e6f..2e204a27 100644
--- a/maintMakefile
+++ b/maintMakefile
@@ -329,7 +329,7 @@ changelog-check:
po-check:
if test -f po/POTFILES.in; then \
grep '^[^#]' po/POTFILES.in | sort > $@-1; \
- $(PERL) -wn -e 'if (/\b_\(/) { $$ARGV eq "./src/makeint.h" || print "$$ARGV\n" and close ARGV }' `find . -name '*.[ch]'` | sed 's,^\./,,' | sort > $@-2; \
+ find [a-z]* -name '*.[ch]' | xargs grep -l '\b_(' | grep -v src/makeint.h | sort > $@-2; \
diff -u $@-1 $@-2 || exit 1; \
rm -f $@-1 $@-2; \
fi
@@ -371,8 +371,8 @@ gendocs: update-gnuweb update-makeweb
find '$(MAKEWEBDIR)'/manual \( -name CVS -prune \) -o \( -name '[!.]*' -type f -exec rm -f '{}' \; \)
cp -r doc/manual '$(MAKEWEBDIR)'
@echo 'Status of $(MAKEWEBDIR) repo:' && cd '$(MAKEWEBDIR)' \
- && cvs -q -n update | grep -v '^M ' \
- && echo '- cvs add <new files>' \
+ && cvs -q -n update | grep -v '^M '
+ @echo '- cvs add <new files>' \
&& echo '- cvs remove <deleted files>' \
&& echo '- cvs commit' \
&& echo '- cvs tag make-$(subst .,-,$(VERSION))'