[OpenSRF-GIT] OpenSRF branch rel_2_1 updated. osrf_rel_2_1_0-rc1-3-g2bdd580
Evergreen Git
git at git.evergreen-ils.org
Mon Apr 23 13:53:49 EDT 2012
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, rel_2_1 has been updated
via 2bdd580e2bcc6660b073b6853dc1544d5c68a6fd (commit)
via f21b0a5aa647e7303cc0d6d3fb70cadf0e8fc812 (commit)
via 4d58c3d24b65f96e0648e37a3f4da82051a58917 (commit)
from 5849a119bd363b152b41ed7a39c787f009412572 (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 2bdd580e2bcc6660b073b6853dc1544d5c68a6fd
Author: Dan Scott <dscott at laurentian.ca>
Date: Mon Apr 23 13:45:14 2012 -0400
Name the bootstrapping steps in buildbot
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/examples/buildbot.cfg b/examples/buildbot.cfg
index 52a2e8e..40b7b72 100644
--- a/examples/buildbot.cfg
+++ b/examples/buildbot.cfg
@@ -190,13 +190,15 @@ osrf_factory.addStep(source.Git(
# bootstrap the code - old branches require autogen.sh
osrf_factory.addStep(
shell.ShellCommand(command=["./autogen.sh"],
- doStepIf=osrf_requires_autogen
+ doStepIf=osrf_requires_autogen,
+ name="Bootstrap via autogen"
)
)
osrf_factory.addStep(
- shell.ShellCommand(command=["autoreconf -f -i"],
- doStepIf=osrf_requires_autoreconf
+ shell.ShellCommand(command=["autoreconf", "-f", "-i"],
+ doStepIf=osrf_requires_autoreconf,
+ name="Bootstrap via autoreconf"
)
)
@@ -254,13 +256,15 @@ eg_factory.addStep(source.Git(
# bootstrap the code - old branches require autogen.sh
eg_factory.addStep(
shell.ShellCommand(command=["./autogen.sh"],
- doStepIf=eg_requires_autogen
+ doStepIf=eg_requires_autogen,
+ name="Bootstrap via autogen"
)
)
eg_factory.addStep(
- shell.ShellCommand(command=["autoreconf -f -i"],
- doStepIf=eg_requires_autoreconf
+ shell.ShellCommand(command=["autoreconf", "-f", "-i"],
+ doStepIf=eg_requires_autoreconf,
+ name="Bootstrap via autoreconf"
)
)
commit f21b0a5aa647e7303cc0d6d3fb70cadf0e8fc812
Author: Dan Scott <dscott at laurentian.ca>
Date: Mon Apr 23 13:16:25 2012 -0400
Fix buildbot configuration
Need to define our tests before they're called; also, can't blindly
invoke a step out of the proper scope. Duh.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Conflicts:
examples/buildbot.cfg
diff --git a/examples/buildbot.cfg b/examples/buildbot.cfg
index 3b23913..52a2e8e 100644
--- a/examples/buildbot.cfg
+++ b/examples/buildbot.cfg
@@ -135,6 +135,39 @@ c['schedulers'].append(SingleBranchScheduler(name="evergreen-master",
"evergreen-master-ubuntu-10.04-x86"
]))
+#### Build step tests
+def eg_requires_autogen(step):
+ 'Old versions of Evergreen require autogen.sh to bootstrap'
+ if (step.build.getProperty('branch') == 'rel_2_0' or
+ step.build.getProperty('branch') == 'rel_2_1'
+ ):
+ return True
+ return False
+
+def eg_requires_autoreconf(step):
+ 'Modern versions of Evergreen use autoreconf to bootstrap'
+ if eg_requires_autogen(step):
+ return False
+ return True
+
+def has_perl_unit_tests(step):
+ 'Only run Perl tests if there are tests'
+ if (step.build.getProperty('branch') == 'rel_2_0'):
+ return False
+ return True
+
+def osrf_requires_autogen(step):
+ 'Old versions of OpenSRF require autogen.sh to bootstrap'
+ if (step.build.getProperty('branch') == 'rel_2_0'):
+ return True
+ return False
+
+def osrf_requires_autoreconf(step):
+ 'Modern versions of OpenSRF use autoreconf to bootstrap'
+ if osrf_requires_autogen(step):
+ return False
+ return True
+
####### BUILDERS
# The 'builders' list defines the Builders, which tell Buildbot how to perform a build:
@@ -155,10 +188,17 @@ osrf_factory.addStep(source.Git(
)
# 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"]))
+osrf_factory.addStep(
+ shell.ShellCommand(command=["./autogen.sh"],
+ doStepIf=osrf_requires_autogen
+ )
+)
+
+osrf_factory.addStep(
+ shell.ShellCommand(command=["autoreconf -f -i"],
+ doStepIf=osrf_requires_autoreconf
+ )
+)
# configure (default args for now)
osrf_factory.addStep(shell.Configure())
@@ -212,12 +252,17 @@ eg_factory.addStep(source.Git(
)
# 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"]))
+eg_factory.addStep(
+ shell.ShellCommand(command=["./autogen.sh"],
+ doStepIf=eg_requires_autogen
+ )
+)
+
+eg_factory.addStep(
+ shell.ShellCommand(command=["autoreconf -f -i"],
+ doStepIf=eg_requires_autoreconf
+ )
+)
# configure (default args for now)
eg_factory.addStep(shell.Configure())
@@ -231,14 +276,6 @@ class PerlModuleTestMFHDMadness(shell.PerlModuleTest):
command = ['prove', '--lib', 'lib', '-I', 'lib/OpenILS/Utils/MFHD/test', '-r', 't']
total = 0
-def has_perl_unit_tests(step):
- 'Only run Perl tests if there are tests'
- if (step.build.getProperty('branch') == 'rel_1_6_1'):
- return False
- elif (step.build.getProperty('branch') == 'rel_2_0'):
- return False
- return True
-
# run the Perl unit tests
eg_factory.addStep(PerlModuleTestMFHDMadness(
doStepIf=has_perl_unit_tests,
commit 4d58c3d24b65f96e0648e37a3f4da82051a58917
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 8a87ef8..ac95ce6 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 4361a32..3b23913 100644
--- a/examples/buildbot.cfg
+++ b/examples/buildbot.cfg
@@ -154,8 +154,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())
@@ -208,8 +211,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 | 73 +++++++++++++++++++++++++++++++++++++++++--------
3 files changed, 62 insertions(+), 56 deletions(-)
delete mode 100755 autogen.sh
hooks/post-receive
--
OpenSRF
More information about the opensrf-commits
mailing list