1 files changed, 35 insertions, 14 deletions

diff --git a/bootstrap b/bootstrap
index 984c56cb3..d5bf30af4 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 $(pwd)/contrib/conf/uncrustify.cfg uncrustify.cfg 2> /dev/null
+        ln -fs $(pwd)/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
@@ -79,10 +79,9 @@ check_libtool()
        existence libtoolize || \
        existence glibtoolize || \
        existence slibtool; then
-        autoreconf -if || exit 1
-        . "bin/pogen.sh" || exit 1
-    else
-        echo "*** No libtoolize (libtool) or libtool found, please install it ***" >&2;
+        autoreconf -if
+    elif ! existence meson; then
+        echo "*** No libtoolize (libtool) or libtool or meson found, please install it ***" >&2;
         exit 1
     fi
 }
@@ -97,25 +96,47 @@ submodules()
     if ! git --version >/dev/null; then
         echo "git not installed, skipping submodule update"
     else
-        git submodule update --init || exit 1
-        git submodule update --recursive || exit 1
-        git submodule sync || exit 1
+        git submodule update --init --force --remote
     fi
 }
 
-init_buildcommon_include()
+
+install_hooks()
 {
-    cp contrib/build-common/Makefile.inc contrib/Makefile.inc || exit 1
+  ln -fs $(pwd)/contrib/conf/prepare-commit-msg .git/hooks/prepare-commit-msg 2> /dev/null
+  ln -fs $(pwd)/contrib/conf/commit-msg .git/hooks/commit-msg 2> /dev/null
+}
+
+create_handbook()
+{
+    . "scripts/sphinx_update.sh" || exit 1
+}
+
+pogen()
+{
+    . "scripts/pogen.sh" || exit 1
+}
+
+update_gana()
+{
+    . "scripts/gana_update.sh" || exit 1
 }
 
 main()
 {
     cleanup
     submodules
-    init_buildcommon_include
     check_uncrustify
     check_yapf
-    check_libtool
+    create_handbook
+    update_gana
+    if [ "$1" = "meson" ]; then
+      echo "Skipping autoreconf"
+    else
+      check_libtool
+    fi
+    pogen
+    install_hooks
 }
 
 main "$@"