diff options
-rwxr-xr-x | bootstrap | 13 | ||||
-rw-r--r-- | contrib/Makefile.am | 1 | ||||
-rw-r--r-- | contrib/conf/.style.yapf | 5 |
3 files changed, 18 insertions, 1 deletions
@@ -21,8 +21,19 @@ else | |||
21 | echo "Uncrustify not detected, hook not installed. Please install uncrustify if you plan on doing development" | 21 | echo "Uncrustify not detected, hook not installed. Please install uncrustify if you plan on doing development" |
22 | fi | 22 | fi |
23 | 23 | ||
24 | echo "checking for libtoolize / libtool... " | ||
25 | 24 | ||
25 | # yapf can be a suffixed binary, don't change the essential logic | ||
26 | # of this if you change it. | ||
27 | 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 | ||
28 | echo "Installing yapf symlink" | ||
29 | # Install yapf style symlink (if possible) | ||
30 | ln -s contrib/conf/.style.yapf 2> /dev/null | ||
31 | else | ||
32 | echo "yapf not detected, please install yapf if you plan on contributing python code" | ||
33 | fi | ||
34 | |||
35 | |||
36 | echo "checking for libtoolize / libtool... " | ||
26 | 37 | ||
27 | if existence libtool || existence libtoolize || existence glibtoolize || existence slibtool; then | 38 | if existence libtool || existence libtoolize || existence glibtoolize || existence slibtool; then |
28 | autoreconf -if | 39 | 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 = \ | |||
19 | 19 | ||
20 | EXTRA_DIST = \ | 20 | EXTRA_DIST = \ |
21 | conf/colorit/colorit.conf \ | 21 | conf/colorit/colorit.conf \ |
22 | conf/.style.yapf \ | ||
22 | conf/editors/eclipse/gnunet_codingstyle.xml \ | 23 | conf/editors/eclipse/gnunet_codingstyle.xml \ |
23 | conf/gnunet/no_forcestart.conf \ | 24 | conf/gnunet/no_forcestart.conf \ |
24 | conf/gnunet/no_autostart_above_core.conf \ | 25 | 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 @@ | |||
1 | [style] | ||
2 | based_on_style = pep8 | ||
3 | coalesce_brackets=True | ||
4 | column_limit=80 | ||
5 | dedent_closing_brackets=True | ||