From 41aecf40551173f2fbd82ac877cc88e9ff012825 Mon Sep 17 00:00:00 2001 From: ng0 Date: Sat, 12 Oct 2019 18:25:20 +0000 Subject: add yapf style --- bootstrap | 13 ++++++++++++- contrib/Makefile.am | 1 + contrib/conf/.style.yapf | 5 +++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 contrib/conf/.style.yapf diff --git a/bootstrap b/bootstrap index 3972863be..12c7f41f3 100755 --- a/bootstrap +++ b/bootstrap @@ -21,8 +21,19 @@ else echo "Uncrustify not detected, hook not installed. Please install uncrustify if you plan on doing development" fi -echo "checking for libtoolize / libtool... " +# yapf can be a suffixed binary, don't change the essential logic +# of this if you change it. +if existence yapf || existence yapf3.0 || existence yapf3.1 || existence yapf3.2 || existence yapf3.3 || existence yapf3.4 || existence yapf3.5 || existence yapf3.6 || existence yapf3.7 || existence yapf3.8 || existence yapf3.9 || existence yapf4.0; then + echo "Installing yapf symlink" + # Install yapf style symlink (if possible) + ln -s contrib/conf/.style.yapf 2> /dev/null +else + echo "yapf not detected, please install yapf if you plan on contributing python code" +fi + + +echo "checking for libtoolize / libtool... " if existence libtool || existence libtoolize || existence glibtoolize || existence slibtool; then autoreconf -if diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 61cb5b714..83c68d828 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -19,6 +19,7 @@ INITD_FILES = \ EXTRA_DIST = \ conf/colorit/colorit.conf \ + conf/.style.yapf \ conf/editors/eclipse/gnunet_codingstyle.xml \ conf/gnunet/no_forcestart.conf \ conf/gnunet/no_autostart_above_core.conf \ diff --git a/contrib/conf/.style.yapf b/contrib/conf/.style.yapf new file mode 100644 index 000000000..3b39780ca --- /dev/null +++ b/contrib/conf/.style.yapf @@ -0,0 +1,5 @@ +[style] +based_on_style = pep8 +coalesce_brackets=True +column_limit=80 +dedent_closing_brackets=True -- cgit v1.2.3