Switch to autoreconf instead of autogen.sh

Update the buildbot config accordingly to avoid erroneous errors of
erroneosity.

Signed-off-by: Dan Scott <dscott@laurentian.ca>

diff --git a/README b/README
index 9f6d73a..b0b6541 100644 (file)
--- a/README
+++ b/README
@@ -81,7 +81,7 @@ source directory to generate the configure script and Makefiles:
 
 [source, bash]
 ------------------------------------------------------------------------------
-./autogen.sh
+autoreconf -f -i
 ------------------------------------------------------------------------------
 
 Configuration and compilation instructions

diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755 (executable)
index ff28cf2..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-# autogen.sh - generates configure using the autotools
-
-OS=`uname`
-if [ "$OS" = "Darwin" ]; then
-    : ${LIBTOOLIZE=glibtoolize}
-elif [ "$OS" = "Linux" ]; then
-    : ${LIBTOOLIZE=libtoolize}
-fi
-
-: ${ACLOCAL=aclocal}
-: ${AUTOHEADER=autoheader}
-: ${AUTOMAKE=automake}
-: ${AUTOCONF=autoconf}
-
-
-${LIBTOOLIZE} --force --copy
-${ACLOCAL}
-${AUTOMAKE} --add-missing --copy
-
-
-${AUTOCONF}
-
-SILENT=`which ${LIBTOOLIZE} ${ACLOCAL} ${AUTOHEADER} ${AUTOMAKE} ${AUTOCONF}`
-case "$?" in
-    0 )
-        echo All build tools found.
-        ;;
-    1)
-        echo
-        echo "--------------------------------------------------------------"
-        echo "          >>> Some build tools are missing! <<<"
-        echo Please make sure your system has the GNU autoconf and automake
-        echo toolchains installed.
-        echo "--------------------------------------------------------------"
-        exit 1
-        ;;
-esac
-
-echo 
-echo "---------------------------------------------"
-echo "autogen finished running, now run ./configure"
-echo "---------------------------------------------"

diff --git a/examples/buildbot.cfg b/examples/buildbot.cfg
index 253e478..a29c4f8 100644 (file)
--- a/examples/buildbot.cfg
+++ b/examples/buildbot.cfg
@@ -148,8 +148,11 @@ osrf_factory.addStep(source.Git(
     )
 )
 
-# bootstrap the code
-osrf_factory.addStep(shell.ShellCommand(command=["./autogen.sh"]))
+# bootstrap the code - old branches require autogen.sh
+if (step.build.getProperty('branch') == 'rel_2_0'):
+    osrf_factory.addStep(shell.ShellCommand(command=["./autogen.sh"]))
+else:
+    osrf_factory.addStep(shell.ShellCommand(command=["autoreconf -f -i"]))
 
 # configure (default args for now)
 osrf_factory.addStep(shell.Configure())
@@ -197,8 +200,13 @@ eg_factory.addStep(source.Git(
     )
 )
 
-# bootstrap the code
-eg_factory.addStep(shell.ShellCommand(command=["./autogen.sh"]))
+# bootstrap the code - old branches require autogen.sh
+if (step.build.getProperty('branch') == 'rel_2_0' or
+    step.build.getProperty('branch') == 'rel_2_1'
+):
+    eg_factory.addStep(shell.ShellCommand(command=["./autogen.sh"]))
+else:
+    eg_factory.addStep(shell.ShellCommand(command=["autoreconf -f -i"]))
 
 # configure (default args for now)
 eg_factory.addStep(shell.Configure())