the bootstrap_inner will not perform the git submodule init+update,
which most developers working with the master branch would want.
Signed-off-by: Øyvind Harboe <oyvind.har...@zylin.com>
---
bootstrap | 32 +++-----------------------------
bootstrap_inner | 30 ++++++++++++++++++++++++++++++
2 files changed, 33 insertions(+), 29 deletions(-)
create mode 100755 bootstrap_inner
diff --git a/bootstrap b/bootstrap
index 3452a31..bfe64d7 100755
--- a/bootstrap
+++ b/bootstrap
@@ -4,34 +4,8 @@
# Stop execution as soon as we have an unknown command
set -e
-if libtoolize --version >/dev/null 2>&1; then
- libtoolize="libtoolize"
-elif glibtoolize --version >/dev/null 2>&1; then
- libtoolize="glibtoolize"
-else
- echo "libtool is required" >&2
- exit 1
-fi
+./bootstrap_inner
-# bootstrap the autotools
-(
-set -x
-aclocal
-${libtoolize} --automake --copy
-autoconf
-autoheader
-automake --gnu --add-missing --copy
-)
+git submodule init
+git submodule update
-# 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
-echo "Bootstrap complete. Quick start build instructions:"
-echo ""
-echo "1. Fetch Jim Tcl"
-echo ""
-echo "git submodule init"
-echo "git submodule update"
-echo ""
-echo "2. Configure"
-echo "./configure --enable-maintainer-mode ...."
diff --git a/bootstrap_inner b/bootstrap_inner
new file mode 100755
index 0000000..f32ee38
--- /dev/null
+++ b/bootstrap_inner
@@ -0,0 +1,30 @@
+#!/bin/sh -e
+# Run the autotools bootstrap sequence to create the configure script
+
+# Stop execution as soon as we have an unknown command
+set -e
+
+if libtoolize --version >/dev/null 2>&1; then
+ libtoolize="libtoolize"
+elif glibtoolize --version >/dev/null 2>&1; then
+ libtoolize="glibtoolize"
+else
+ echo "libtool is required" >&2
+ exit 1
+fi
+
+# bootstrap the autotools
+(
+set -x
+aclocal
+${libtoolize} --automake --copy
+autoconf
+autoheader
+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
+echo "Bootstrap complete. Quick start build instructions:"
+echo "./configure --enable-maintainer-mode ...."
--
1.7.0.4
_______________________________________________
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development
