From 341fd49b42855e5b197ecfd98bafc66e65eccfa8 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@n0.is>
Date: Mon, 14 Oct 2019 12:10:35 +0000
Subject: 'make pretty' rule using uncrustify, detect uncrustify in configure
 script.

closes #5904
---
 Makefile.am | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index d69dd3a82..f2b48b358 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,3 +38,8 @@ docdir = $(datadir)/doc/gnunet/
 doc_DATA = COPYING README
 
 ACLOCAL_AMFLAGS = -I m4
+
+if HAVE_UNCRUSTIFY
+pretty:
+	find $(top_srcdir) -type f ! -path '*/.*' ! -path '*/_*' -name '*.c' -name '*.h' -print0 | xargs -0 uncrustify -c $(top_srcdir) --replace --no-backup 2>&1 || true
+endif
-- 
cgit v1.2.3


From dc57bfc9ab69749453269c9bfce354a6c63a4648 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@n0.is>
Date: Mon, 14 Oct 2019 14:06:58 +0000
Subject: fix the previous uncrustify commit.

---
 Makefile.am  | 4 ++--
 configure.ac | 8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index f2b48b358..e8bd98da1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,7 +39,7 @@ doc_DATA = COPYING README
 
 ACLOCAL_AMFLAGS = -I m4
 
-if HAVE_UNCRUSTIFY
+if HAVE_UNCRUSTIFY_BINARY
 pretty:
-	find $(top_srcdir) -type f ! -path '*/.*' ! -path '*/_*' -name '*.c' -name '*.h' -print0 | xargs -0 uncrustify -c $(top_srcdir) --replace --no-backup 2>&1 || true
+	find $(top_srcdir) -type f -name '*.c' -or -name '*.h' -print0 | xargs -0 uncrustify -c $(top_srcdir)/contrib/uncrustify.cfg --replace --no-backup 2>&1 || true
 endif
diff --git a/configure.ac b/configure.ac
index e486a893d..5ca5f55d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -315,11 +315,9 @@ AS_IF([test x"$VAR_UPNPC_BINARY" != x"false"],
 
 
 # uncrustify
-AC_PATH_TARGET_TOOL(VAR_UNCRUSTIFY_BINARY, uncrustify, false)
-
-AS_IF([test x"$VAR_UNCRUSTIFY_BINARY" != x"false"],
-  [AC_DEFINE_UNQUOTED([HAVE_UNCRUSTIFY], "$VAR_UNCRUSTIFY_BINARY", [Path to uncrustify binary])],
-  [AC_MSG_WARN([warning: 'uncrustify' binary not found.])])
+# TODO: maybe add flag to pass location
+AC_CHECK_PROG(UNCRUSTIFY_BINARY, uncrustify, true)
+AM_CONDITIONAL(HAVE_UNCRUSTIFY_BINARY, $UNCRUSTIFY_BINARY)
 
 
 AC_CHECK_MEMBER(struct tm.tm_gmtoff,
-- 
cgit v1.2.3


From 3d968d36122b64b374feb1be0fd131f6691995f0 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@n0.is>
Date: Mon, 14 Oct 2019 14:52:33 +0000
Subject: add yapf to make pretty

---
 Makefile.am  | 4 ++++
 configure.ac | 5 +++++
 2 files changed, 9 insertions(+)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index e8bd98da1..579939b09 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,7 +39,11 @@ doc_DATA = COPYING README
 
 ACLOCAL_AMFLAGS = -I m4
 
+# TODO: better nesting.
 if HAVE_UNCRUSTIFY_BINARY
 pretty:
 	find $(top_srcdir) -type f -name '*.c' -or -name '*.h' -print0 | xargs -0 uncrustify -c $(top_srcdir)/contrib/uncrustify.cfg --replace --no-backup 2>&1 || true
+if HAVE_YAPF_BINARY
+	find $(top_srcdir) -type f -name '*.py' -or -name '*.py.in' -print0 | xargs -0 $(YAPF_BINARY) -i 2>&1 || true
+endif
 endif
diff --git a/configure.ac b/configure.ac
index 5ca5f55d1..f56d2f508 100644
--- a/configure.ac
+++ b/configure.ac
@@ -319,6 +319,11 @@ AS_IF([test x"$VAR_UPNPC_BINARY" != x"false"],
 AC_CHECK_PROG(UNCRUSTIFY_BINARY, uncrustify, true)
 AM_CONDITIONAL(HAVE_UNCRUSTIFY_BINARY, $UNCRUSTIFY_BINARY)
 
+# yapf
+# TODO: less repetition, add flag to pass name
+AC_CHECK_PROGS(YAPF_BINARY, [yapf yapf3.0 yapf3.1 yapf3.2 yapf3.3 yapf3.4 yapf3.5 yapf3.6 yapf3.7 yapf3.8 yapf3.9 yapf4.0], false)
+AM_CONDITIONAL(HAVE_YAPF_BINARY, test x$YAPF_BINARY != xfalse)
+
 
 AC_CHECK_MEMBER(struct tm.tm_gmtoff,
   [AC_DEFINE(HAVE_TM_GMTOFF, 1,
-- 
cgit v1.2.3