[GNUnet-SVN] [gnunet] branch master updated: Fix #5631

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new bd7147b59 Fix #5631
bd7147b59 is described below

commit bd7147b59925c3748529d04d7c58042a95821ee0
Author: ng0 <address@hidden>
AuthorDate: Wed Mar 6 17:00:50 2019 +0000

    Fix #5631
---
 Makefile.am                     | 42 +----------------------------------------
 Makefile.am => lint/Makefile.am | 34 +++------------------------------
 2 files changed, 4 insertions(+), 72 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 485ee16fd..abc6f9e42 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/include
 if DOCUMENTATION_ONLY
   SUBDIRS = doc
 else
-  SUBDIRS = m4 src po pkgconfig
+  SUBDIRS = m4 src po pkgconfig lint
 if DOCUMENTATION
   SUBDIRS += doc
 endif
@@ -27,43 +27,3 @@ docdir = $(datadir)/doc/gnunet/
 doc_DATA = COPYING README
 
 ACLOCAL_AMFLAGS = -I m4
-
-# Check for bashisms in shell scripts
-# Very verbose, need to exclude more files.
-check-bashism:
-       printf "Run checkbashism on all .sh files.\n"
-       printf "Currently this expects checkbashism.pl at a fixed location."
-       find . -type f ! -path '*/.*' ! -path '*/_*' -name '*.sh' -print0 | 
xargs -0 ~/src/scripts/src/checkbashisms.pl -f 2>&1 | tee 
$(top_srcdir)/bashism.log || true
-
-check-python:
-       printf "Running flake8 and 2to3 if detected.\n"
-       $(top_srcdir)/contrib/scripts/lint-python.sh || true
-
-check-man:
-       printf "Running lint-man.sh in doc/man.\n"
-       @cd $(top_srcdir)/doc/man ; 
$(top_srcdir)/../../contrib/scripts/lint-man.sh || true
-
-check-texinfo:
-       printf "Running basic texinfo linters\n"
-       # exception to add: ignore license files.
-       # exception to add: uref's can go above 79 chars.
-       printf "...line length over 79 chars?\n" 2>&1 | tee 
$(top_srcdir)/doc/handbook/texinfo_handbook.log || true
-       @cd $(top_srcdir)/doc/handbook ; find . -type f ! -path '*/.*' -name 
'*.texi' -print0 | xargs -0 awk 'length>79 {print FILENAME":"NR":"$$0}' > 
$(top_srcdir)/texinfo_handbook.log || true
-       printf "...line length over 79 chars?\n" 2>&1 | tee 
$(top_srcdir)/doc/tutorial/texinfo_tutorial.log || true
-       @cd $(top_srcdir)/doc/tutorial ; find . -type f ! -path '*/.*' -name 
'*.texi' -print0 | xargs -0 awk 'length>79 {print FILENAME":"NR":"$$0}' > 
$(top_srcdir)/texinfo_tutorial.log || true
-       printf "...lines containing macros incompatible with old makeinfo?\n" 
2>&1 | tee -a $(top_srcdir)/doc/handbook/texinfo_handbook.log || true
-       @cd $(top_srcdir)/doc/handbook ; find . -type f ! -path '*/.*' -name 
'*.texi' -print0 | xargs -0 awk '/@geq\{\}/ {print FILENAME":"NR":"$$0}' >> 
$(top_srcdir)/texinfo_handbook.log || true
-       printf "...lines containing macros incompatible with old makeinfo?\n" 
2>&1 | tee -a $(top_srcdir)/doc/tutorial/texinfo_tutorial.log || true
-       @cd $(top_srcdir)/doc/tutorial ; find . -type f ! -path '*/.*' -name 
'*.texi' -print0 | xargs -0 awk '/@geq\{\}/ {print FILENAME":"NR":"$$0}' >> 
$(top_srcdir)/texinfo_tutorial.log || true
-       printf "...lines containing macros incompatible with texi2mdoc?\n" 2>&1 
| tee -a $(top_srcdir)/doc/handbook/texinfo_handbook.log || true
-       @cd $(top_srcdir)/doc/handbook ; find . -type f ! -path '*/.*' -name 
'*.texi' -print0 | xargs -0 awk '/@footnote\{/ {print FILENAME":"NR":"$$0}' >> 
$(top_srcdir)/texinfo_handbook.log || true
-       printf "...lines containing macros incompatible with texi2mdoc?\n" 2>&1 
| tee -a $(top_srcdir)/doc/tutorial/texinfo_tutorial.log || true
-       @cd $(top_srcdir)/doc/tutorial ; find . -type f ! -path '*/.*' -name 
'*.texi' -print0 | xargs -0 awk '/@footnote\{/ {print FILENAME":"NR":"$$0}' >> 
$(top_srcdir)/texinfo_tutorial.log || true
-       printf "...lines telling us what is left TODO or to fix?\n" 2>&1 | tee 
-a $(top_srcdir)/doc/handbook/texinfo_handbook.log || true
-       @cd $(top_srcdir)/doc/handbook ; find . -type f ! -path '*/.*' -name 
'*.texi' -print0 | xargs -0 awk '/TODO/ {print FILENAME":"NR":"$$0}' >> 
$(top_srcdir)/texinfo_handbook.log || true
-       @cd $(top_srcdir)/doc/handbook ; find . -type f ! -path '*/.*' -name 
'*.texi' -print0 | xargs -0 awk '/XXX/ {print FILENAME":"NR":"$$0}' >> 
$(top_srcdir)/texinfo_handbook.log || true
-       printf "...lines telling us what is left TODO or to fix?\n" 2>&1 | tee 
-a $(top_srcdir)/doc/tutorial/texinfo_tutorial.log || true
-       @cd $(top_srcdir)/doc/tutorial ; find . -type f ! -path '*/.*' -name 
'*.texi' -print0 | xargs -0 awk '/TODO/ {print FILENAME":"NR":"$$0}' >> 
$(top_srcdir)/texinfo_tutorial.log || true
-       @cd $(top_srcdir)/doc/tutorial ; find . -type f ! -path '*/.*' -name 
'*.texi' -print0 | xargs -0 awk '/XXX/ {print FILENAME":"NR":"$$0}' >> 
$(top_srcdir)/texinfo_tutorial.log || true
-
-check-linters: check-bashism check-python check-man check-texinfo
diff --git a/Makefile.am b/lint/Makefile.am
similarity index 86%
copy from Makefile.am
copy to lint/Makefile.am
index 485ee16fd..093884214 100644
--- a/Makefile.am
+++ b/lint/Makefile.am
@@ -1,32 +1,4 @@
-# This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include
-
-if DOCUMENTATION_ONLY
-  SUBDIRS = doc
-else
-  SUBDIRS = m4 src po pkgconfig
-if DOCUMENTATION
-  SUBDIRS += doc
-endif
-endif
-
-if !TALER_ONLY
-  SUBDIRS += contrib
-endif
-
-EXTRA_DIST = \
- ABOUT-NLS \
- config.rpath \
- acinclude.m4 \
- README.1st
-
-gnunetincludedir = $(includedir)/gnunet
-gnunetinclude_HEADERS = gnunet_config.h
-
-docdir = $(datadir)/doc/gnunet/
-doc_DATA = COPYING README
-
-ACLOCAL_AMFLAGS = -I m4
+all: check-linters
 
 # Check for bashisms in shell scripts
 # Very verbose, need to exclude more files.
@@ -43,10 +15,10 @@ check-man:
        printf "Running lint-man.sh in doc/man.\n"
        @cd $(top_srcdir)/doc/man ; 
$(top_srcdir)/../../contrib/scripts/lint-man.sh || true
 
+# exception to add: ignore license files.
+# exception to add: uref's can go above 79 chars.
 check-texinfo:
        printf "Running basic texinfo linters\n"
-       # exception to add: ignore license files.
-       # exception to add: uref's can go above 79 chars.
        printf "...line length over 79 chars?\n" 2>&1 | tee 
$(top_srcdir)/doc/handbook/texinfo_handbook.log || true
        @cd $(top_srcdir)/doc/handbook ; find . -type f ! -path '*/.*' -name 
'*.texi' -print0 | xargs -0 awk 'length>79 {print FILENAME":"NR":"$$0}' > 
$(top_srcdir)/texinfo_handbook.log || true
        printf "...line length over 79 chars?\n" 2>&1 | tee 
$(top_srcdir)/doc/tutorial/texinfo_tutorial.log || true

-- 
To stop receiving notification emails like this one, please contact
address@hidden