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 "". The branch, master has been updated via 48d1a2e792ace21613e19e378d3c2e26ee6d818d (commit) from 9c9d7b4da56fbac8bd3b1258198026ec6d0d91e2 (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 48d1a2e792ace21613e19e378d3c2e26ee6d818d Author: John Jenkins <[email protected]> Date: Fri Mar 27 10:10:55 2015 -0500 fix jenkins scripts problem ended up being a dependency on a Mercury development branch that got deleted ----------------------------------------------------------------------- Summary of changes: code/scripts/jenkins/build.sh | 13 +++++++++++-- code/scripts/jenkins/files.fetch | 2 +- code/scripts/jenkins/install-c-utils-git.sh | 15 +++++++++++++++ code/scripts/jenkins/repos.fetch | 5 ++++- 4 files changed, 31 insertions(+), 4 deletions(-) create mode 100755 code/scripts/jenkins/install-c-utils-git.sh Diff of changes: diff --git a/code/scripts/jenkins/build.sh b/code/scripts/jenkins/build.sh index 70d5013..f9039b3 100755 --- a/code/scripts/jenkins/build.sh +++ b/code/scripts/jenkins/build.sh @@ -180,10 +180,19 @@ echo -n " * Building and installing libev..." || exit 2 echo DONE +#echo -n " * Building and installing c-utils..." +#"${AUTOBUILDDIR}/install-c-utils.sh" \ + #"${DEPBUILDDIR}" \ + #"${FETCHDIR}/c-utils.tar.gz" \ + #"${DEPINSTALL}" \ + #> "${DEPBUILDDIR}/c-utils-log" \ + #|| exit 2 +#echo DONE + echo -n " * Building and installing c-utils..." -"${AUTOBUILDDIR}/install-c-utils.sh" \ +"${AUTOBUILDDIR}/install-c-utils-git.sh" \ "${DEPBUILDDIR}" \ - "${FETCHDIR}/c-utils.tar.gz" \ + "${FETCHDIR}/c-utils" \ "${DEPINSTALL}" \ > "${DEPBUILDDIR}/c-utils-log" \ || exit 2 diff --git a/code/scripts/jenkins/files.fetch b/code/scripts/jenkins/files.fetch index f35f21a..d8d1d58 100644 --- a/code/scripts/jenkins/files.fetch +++ b/code/scripts/jenkins/files.fetch @@ -10,7 +10,7 @@ d6eef4b4cacb2183f2bf265a5a03a354 boost.tar.bz2 http://sourceforge.net/projects/boost/files/boost/1.55.0/boost_1_55_0.tar.bz... # c-utils -2466f8d782b534a179d75cabab1ebd01 c-utils.tar.gz https://jenkins-ci.mcs.anl.gov/job/C-Utils/lastSuccessfulBuild/artifact/c-ut... +#2466f8d782b534a179d75cabab1ebd01 c-utils.tar.gz https://jenkins-ci.mcs.anl.gov/job/C-Utils/lastSuccessfulBuild/artifact/c-ut... # mercury #3f8414040fbb99d401f93d2447edfb75 mercury.tar.bz2 ftp://ftp.mcs.anl.gov/pub/mercury/releases/mercury-0.8.1p1.tar.bz2 diff --git a/code/scripts/jenkins/install-c-utils-git.sh b/code/scripts/jenkins/install-c-utils-git.sh new file mode 100755 index 0000000..03f6d8f --- /dev/null +++ b/code/scripts/jenkins/install-c-utils-git.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +echo "Building c-utils" + +DEPBUILDDIR="${1}/c-utils" +INPUT="$2" +PREFIX="$3" + +echo $* + +cd "${INPUT}" +./prepare +mkdir -p "${DEPBUILDDIR}" +cd "${DEPBUILDDIR}" +"$INPUT/configure" --disable-shared --enable-static --prefix="${PREFIX}" && make && make install diff --git a/code/scripts/jenkins/repos.fetch b/code/scripts/jenkins/repos.fetch index f156f66..c61d092 100644 --- a/code/scripts/jenkins/repos.fetch +++ b/code/scripts/jenkins/repos.fetch @@ -7,4 +7,7 @@ # tag is ok here too). # mercury -git git://git.mcs.anl.gov/radix/mercury mercury branch next +git git://git.mcs.anl.gov/radix/mercury mercury hash 11287d3 + +# cutils +git git://git.mcs.anl.gov/c-utils c-utils hooks/post-receive --