[OpenSRF-GIT] OpenSRF branch master updated. 03be6e83d39547927073a115bb66ff39d7f80708

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenSRF".

The branch, master has been updated
       via  03be6e83d39547927073a115bb66ff39d7f80708 (commit)
      from  d1c53813c3b6cbe8751123c6e32dd829d1895194 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 03be6e83d39547927073a115bb66ff39d7f80708
Author: Dan Scott <dscott at laurentian.ca>
Date:   Mon Apr 23 12:52:57 2012 -0400

    Switch to autoreconf instead of autogen.sh
    
    Update the buildbot config accordingly to avoid erroneous errors of
    erroneosity.
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>

diff --git a/README b/README
index 9f6d73a..b0b6541 100644
--- 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
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
--- 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())

-----------------------------------------------------------------------

Summary of changes:
 README                |    2 +-
 autogen.sh            |   43 -------------------------------------------
 examples/buildbot.cfg |   16 ++++++++++++----
 3 files changed, 13 insertions(+), 48 deletions(-)
 delete mode 100755 autogen.sh


hooks/post-receive
-- 
OpenSRF