From 2f92060a27074e3446d9d3612b592c2e7f7d97a9 Mon Sep 17 00:00:00 2001 From: Tomek CEDRO Date: Wed, 22 Jun 2011 00:13:24 +0200 Subject: BOOTSTRAP: Moved git submodule routines before autotools are executed. Added comments.w --- bootstrap | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/bootstrap b/bootstrap index 8a3945e8..01fd7ea5 100755 --- a/bootstrap +++ b/bootstrap @@ -1,9 +1,9 @@ #!/bin/sh -# Run the autotools bootstrap sequence to create the configure script - +# Bootstrap script fetches external git submodules and run autotools. # Abort execution on error set -e +# Check if libtool is installed and what version. if which libtoolize > /dev/null; then libtoolize="libtoolize" elif which glibtoolize >/dev/null; then @@ -13,6 +13,8 @@ else exit 1 fi +# Submodules are external libraries downloaded from remote git repositories. +# To be build automaticaly with OpenOCD. Do we want to skip submodules? if [ "$1" = "nosubmodule" ]; then SKIP_SUBMODULE=1 elif [ -n "$1" ]; then @@ -21,7 +23,16 @@ elif [ -n "$1" ]; then exit 1 fi -# bootstrap the autotools +if [ -n "$SKIP_SUBMODULE" ]; then + echo "Skipping submodule setup" +else + echo "Setting up submodules" + git submodule init + git submodule update +fi + + +# Bootstrap the autotools (create Makefie.in files and configure script). ( set -x aclocal @@ -33,15 +44,6 @@ automake --gnu --add-missing --copy # AM_MAINTAINER_MODE requires --enable-maintainer-mode from everyone using # current source snapshots (working from GIT, or some source snapshot, etc) -# otherwise the documentation will fail to build due to missing version.texi - -if [ -n "$SKIP_SUBMODULE" ]; then - echo "Skipping submodule setup" -else - echo "Setting up submodules" - git submodule init - git submodule update -fi - +# otherwise the documentation will fail to build due to missing version.texi. echo "Bootstrap complete. Quick build instructions:" echo "./configure --enable-maintainer-mode ...." -- cgit v1.2.3