add license identifier to tweetnacl

[oweals/gnunet.git] / bootstrap

diff --git a/bootstrap b/bootstrap
index af4f4d01f514ddafcb4aa675abba83ef78cb9b76..073308c4373fde1d0eebe63d0cb101bdd67c4cf2 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -23,10 +23,8 @@ check_uncrustify()
 {
     if existence uncrustify; then
         echo "Installing uncrustify hook and configuration"
-        # Install uncrustify format symlink (if possible)
-        ln -s contrib/uncrustify.cfg uncrustify.cfg 2> /dev/null
-        # Install pre-commit hook (if possible)
-        ln -s ../../contrib/uncrustify_precommit .git/hooks/pre-commit 2> /dev/null
+        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
     else
         echo "Uncrustify not detected, hook not installed."
         echo "Please install uncrustify if you plan on doing development"
@@ -38,19 +36,19 @@ check_uncrustify()
 check_yapf()
 {
     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
+       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"
-        ln -s contrib/conf/.style.yapf 2> /dev/null
+        ln -fs contrib/build-common/conf/.style.yapf .style.yapf 2> /dev/null
     else
         echo "yapf not detected, please install yapf if you plan on contributing python code"
     fi
@@ -61,9 +59,9 @@ check_libtool()
     echo "checking for libtoolize / libtool... "
 
     if existence libtool || \
-            existence libtoolize || \
-            existence glibtoolize || \
-            existence slibtool; then
+       existence libtoolize || \
+       existence glibtoolize || \
+       existence slibtool; then
         autoreconf -if
         . "bin/pogen.sh"
     else
@@ -72,14 +70,34 @@ check_libtool()
     fi
 }
 
+submodules()
+{
+    # Try to update the submodule. Since bootstrap
+    # is also invoked by distributors, we must
+    # ignore any failing of this function as we
+    # could have no outgoing network connection
+    # in a restricted environment.
+    if ! git --version >/dev/null; then
+        echo "git not installed, skipping submodule update"
+    else
+        git submodule update --init || true
+        git submodule update --recursive --remote || true
+        git submodule sync || true
+    fi
+}
+
+init_buildcommon_include()
+{
+    cp contrib/build-common/Makefile.inc contrib/Makefile.inc || true
+}
+
 main()
 {
     cleanup
-    sleep 1
+    submodules
+    init_buildcommon_include
     check_uncrustify
-    sleep 1
     check_yapf
-    sleep 1
     check_libtool
 }