[Asterisk-code-review] BuildSystem: Use single bootstrap.sh for Asterisk and menuse... (asterisk[15])

[Jenkins2]

Jenkins2 has submitted this change and it was merged. ( https://gerrit.asterisk.org/8245 )

Change subject: BuildSystem: Use single bootstrap.sh for Asterisk and menuselect.
......................................................................

BuildSystem: Use single bootstrap.sh for Asterisk and menuselect.

This causes the root bootstrap.sh script to generate configure scripts
for both Asterisk and menuselect.  This ensures that both configure
scripts are generated with the same version of autotools and avoids
situations where shared autoconf macros get modified without
regenerating the menuselect script.

Change-Id: I2bfd8537bbb63b3d46b11efabbb15eaaf9ef731a
---
M bootstrap.sh
D menuselect/bootstrap.sh
2 files changed, 12 insertions(+), 46 deletions(-)

Approvals:
  George Joseph: Looks good to me, but someone else must approve
  Joshua Colp: Looks good to me, but someone else must approve
  Kevin Harwell: Looks good to me, approved
  Jenkins2: Approved for Submit



diff --git a/bootstrap.sh b/bootstrap.sh
index fe39ea2..941dfc9 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -44,11 +44,18 @@
 check_for_app automake${MY_AM_VER}
 check_for_app aclocal${MY_AM_VER}
 
-echo "Generating the configure script ..."
+gen_configure() {
+	echo "Generating the configure script for $1 ..."
+	shift
 
-aclocal${MY_AM_VER} -I autoconf `find third-party -maxdepth 1 -type d | xargs -I {} echo -I {}`
-autoconf${MY_AC_VER}
-autoheader${MY_AC_VER}
-automake${MY_AM_VER} --add-missing --copy 2>/dev/null
+	aclocal${MY_AM_VER} -I "$@"
+	autoconf${MY_AC_VER}
+	autoheader${MY_AC_VER}
+	automake${MY_AM_VER} --add-missing --copy 2>/dev/null
+}
+
+gen_configure "Asterisk" autoconf `find third-party -maxdepth 1 -type d | xargs -I {} echo -I {}`
+cd menuselect
+gen_configure "menuselect" ../autoconf
 
 exit 0
diff --git a/menuselect/bootstrap.sh b/menuselect/bootstrap.sh
deleted file mode 100755
index 8cf5e71..0000000
--- a/menuselect/bootstrap.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-check_for_app() {
-	$1 --version 2>&1 >/dev/null
-	if [ $? != 0 ]
-	then
-		echo "Please install $1 and run bootstrap.sh again!"
-		exit 1
-	fi
-}
-
-uname -s | grep -q FreeBSD
-if [ $? = 0 ]
-then
-	check_for_app autoconf259
-	check_for_app autoheader259
-	check_for_app automake19
-	check_for_app aclocal19
-	echo "Generating the configure script ..."
-	aclocal19 -I ../autoconf 2>/dev/null
-	autoconf259
-	autoheader259
-	automake19 --add-missing --copy 2>/dev/null
-else
-	AUTOCONF_VERSION=2.59
-	AUTOMAKE_VERSION=1.9
-	export AUTOCONF_VERSION
-	export AUTOMAKE_VERSION
-
-	check_for_app autoconf
-	check_for_app autoheader
-	check_for_app automake
-	check_for_app aclocal
-	echo "Generating the configure script ..."
-	aclocal -I ../autoconf 2>/dev/null
-	autoconf
-	autoheader
-	automake --add-missing --copy 2>/dev/null
-fi
-
-exit 0

-- 
To view, visit https://gerrit.asterisk.org/8245
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 15
Gerrit-MessageType: merged
Gerrit-Change-Id: I2bfd8537bbb63b3d46b11efabbb15eaaf9ef731a
Gerrit-Change-Number: 8245
Gerrit-PatchSet: 1
Gerrit-Owner: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180219/bf31d964/attachment.html>