BUILD: Kill build-common

9 files changed, 47 insertions, 73 deletions

diff --git a/.gitmodules b/.gitmodules
index 9773fb9d7..e69de29bb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "contrib/build-common"]
-        path = contrib/build-common
-        url = https://git.taler.net/build-common.git
diff --git a/bootstrap b/bootstrap
index 984c56cb3..c6253048c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -40,8 +40,8 @@ check_uncrustify()
 {
     if existence uncrustify; then
         echo "Installing uncrustify hook and configuration"
-        ln -fs contrib/build-common/conf/uncrustify.cfg uncrustify.cfg 2> /dev/null
-        ln -fs contrib/build-common/conf/uncrustify_precommit .git/hooks/pre-commit 2> /dev/null
+        ln -fs contrib/conf/uncrustify.cfg uncrustify.cfg 2> /dev/null
+        ln -fs contrib/conf/uncrustify_precommit .git/hooks/pre-commit 2> /dev/null
     else
         echo "Uncrustify not detected, hook not installed."
         echo "Please install uncrustify if you plan on doing development"
@@ -65,7 +65,7 @@ check_yapf()
        existence yapf3.9 || \
        existence yapf4.0; then
         echo "Installing yapf symlink"
-        ln -fs contrib/build-common/conf/.style.yapf .style.yapf 2> /dev/null
+        ln -fs contrib/conf/.style.yapf .style.yapf 2> /dev/null
     else
         echo "yapf not detected, please install yapf if you plan on contributing python code"
     fi
@@ -103,16 +103,10 @@ submodules()
     fi
 }
 
-init_buildcommon_include()
-{
-    cp contrib/build-common/Makefile.inc contrib/Makefile.inc || exit 1
-}
-
 main()
 {
     cleanup
     submodules
-    init_buildcommon_include
     check_uncrustify
     check_yapf
     check_libtool
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index e0370d3c9..4e7928c7e 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -32,8 +32,7 @@ dist_pkgdata_DATA = \
   netjail/netjail_exec.sh \
   netjail/netjail_start.sh \
   netjail/netjail_stop.sh \
-  netjail/topo.sh \
-  $(BUILDCOMMON_SHLIB_FILES)
+  netjail/topo.sh
 
 INITD_FILES = \
   services/systemd/gnunet-user.service \
@@ -221,8 +220,7 @@ EXTRA_DIST = \
   patches/lrn-indent.diff \
   test_gnunet_prefix.c \
   $(PACKAGES_FILES) \
-  $(INITD_FILES) \
-  $(BUILD_COMMON_FILES)
+  $(INITD_FILES)
 
 check_PROGRAMS = \
   test_gnunet_prefix
diff --git a/contrib/build-common b/contrib/build-common
deleted file mode 160000
-Subproject 1915a74bbb4cd2ae9bc541a382dfebc37064a2f
diff --git a/contrib/conf/uncrustify.cfg b/contrib/conf/uncrustify.cfg
index 8c9df2c43..6ced05d7a 100644
--- a/contrib/conf/uncrustify.cfg
+++ b/contrib/conf/uncrustify.cfg
@@ -4,7 +4,7 @@ output_tab_size = 2
 indent_columns = 2
 indent_with_tabs = 0
 indent_case_brace = 2
-indent_label=-16
+indent_label=0
 
 code_width=80
 #cmd_width=80
@@ -49,12 +49,8 @@ nl_assign_brace=remove
 
 # No extra newlines that cause noisy diffs
 nl_start_of_file=remove
-nl_after_func_proto = 2
-nl_after_func_body = 3
 # If there's no new line, it's not a text file!
 nl_end_of_file=add
-nl_max_blank_in_func = 3
-nl_max = 3
 
 sp_inside_paren = remove
 
@@ -73,7 +69,6 @@ sp_between_ptr_star = remove
 sp_before_sparen = add
 
 sp_inside_fparen = remove
-sp_inside_sparen = remove
 
 # add space before function call and decl: "foo (x)"
 sp_func_call_paren = add
@@ -81,15 +76,3 @@ sp_func_proto_paren = add
 sp_func_proto_paren_empty = add
 sp_func_def_paren = add
 sp_func_def_paren_empty = add
-
-# We'd want it for "if ( (foo) || (bar) )", but not for "if (m())",
-# so as uncrustify doesn't give exactly what we want => ignore
-sp_paren_paren = ignore
-sp_inside_paren = remove
-sp_bool = force
-
-nl_func_type_name = force
-#nl_branch_else = add
-nl_else_brace = add
-nl_elseif_brace = add
-nl_for_brace = add
diff --git a/contrib/conf/uncrustify_precommit b/contrib/conf/uncrustify_precommit
index 24873330f..fd29998c3 100755
--- a/contrib/conf/uncrustify_precommit
+++ b/contrib/conf/uncrustify_precommit
@@ -30,6 +30,6 @@ if [ $RET = 1 ];
 then
   echo "Run"
   echo "uncrustify --no-backup -c uncrustify.cfg ${crustified}"
-  echo "before committing."
+  echo "before commiting."
 fi
 exit $RET
diff --git a/doc/man/produce_html.sh.in b/doc/man/produce_html.sh.in
index 8680c0106..e9581622f 100755
--- a/doc/man/produce_html.sh.in
+++ b/doc/man/produce_html.sh.in
@@ -1,13 +1,6 @@
 #!/bin/bash
 
-if test -e @PKGDATADIRECTORY@/existence.sh
-then
-    . @PKGDATADIRECTORY@/existence.sh
-else
-    . $dir/../../contrib/build-common/sh/lib.sh/existence.sh
-fi
-
-if existence mandoc;
+if command -v mandoc >/dev/null 2>&1;
 then
     for f in `find . -name \*\.[1-9]`;
     do
diff --git a/src/gns/gnunet-gns-proxy-setup-ca.in b/src/gns/gnunet-gns-proxy-setup-ca.in
index 9a298f24a..b3ebfd11d 100644
--- a/src/gns/gnunet-gns-proxy-setup-ca.in
+++ b/src/gns/gnunet-gns-proxy-setup-ca.in
@@ -48,33 +48,45 @@
 
 dir=$(dirname "$0")
 
-if test -e @PKGDATADIRECTORY@/progname.sh
-then
-    . @PKGDATADIRECTORY@/progname.sh
-else
-    . $dir/../../contrib/build-common/sh/lib.sh/progname.sh
-fi
+progname=${0##*/}
 
-if test -e @PKGDATADIRECTORY@/existence.sh
-then
-    . @PKGDATADIRECTORY@/existence.sh
-else
-    . $dir/../../contrib/build-common/sh/lib.sh/existence.sh
-fi
+existence() {
+  command -v "$1" >/dev/null 2>&1
+}
+
+statusmsg()
+{
+    ${runcmd} echo "${tab}$@" | tee -a "${results}"
+}
+
+infomsg()
+{
+    if [ x$verbosity = x1 ]; then
+        statusmsg "INFO:${tab}$@"
+    fi
+}
 
-if test -e @PKGDATADIRECTORY@/msg.sh
-then
-    . @PKGDATADIRECTORY@/msg.sh
-else
-    . $dir/../../contrib/build-common/sh/lib.sh/msg.sh
-fi
+warningmsg()
+{
+    statusmsg "WARNING:${tab}$@"
+}
 
-if test -e @PKGDATADIRECTORY@/version_gnunet.sh
-then
-    . @PKGDATADIRECTORY@/version_gnunet.sh
-else
-    . $dir/../../contrib/build-common/sh/lib.sh/version_gnunet.sh
-fi
+errormsg()
+{
+    statusmsg "ERROR:${tab}$@"
+}
+
+linemsg()
+{
+    statusmsg "========================================="
+}
+
+
+print_version()
+{
+    GNUNET_ARM_VERSION=`gnunet-arm -v | awk '{print $2 " " $3}'`
+    echo ${progname} $GNUNET_ARM_VERSION
+}
 
 # Whitespace normalization without depending on shell features:
 tab='   '
diff --git a/src/gns/test_gnunet_gns.sh.in b/src/gns/test_gnunet_gns.sh.in
index 8a96ff034..d0c07b4e4 100755
--- a/src/gns/test_gnunet_gns.sh.in
+++ b/src/gns/test_gnunet_gns.sh.in
@@ -8,12 +8,9 @@
 # but this works for now.
 dir=$(dirname "$0")
 
-if test -e @PKGDATADIRECTORY@/existence.sh
-then
-    . @PKGDATADIRECTORY@/existence.sh
-else
-    . $dir/../../contrib/build-common/sh/lib.sh/existence.sh
-fi
+existence() {
+  command -v "$1" >/dev/null 2>&1
+}
 
 LOCATION=`existence gnunet-config`
 if test -z $LOCATION; then