projects
/
lttng-ci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
jjb: Add env and os details printing to build jobs
[lttng-ci.git]
/
scripts
/
babeltrace
/
build.sh
diff --git
a/scripts/babeltrace/build.sh
b/scripts/babeltrace/build.sh
index b81adec457b88bdb54a4abf276838f07a810212e..a9ad856d344b837c1fac8f8c77d6955233a9d24d 100755
(executable)
--- a/
scripts/babeltrace/build.sh
+++ b/
scripts/babeltrace/build.sh
@@
-1,7
+1,7
@@
-#!/bin/bash
-exu
+#!/bin/bash
#
# Copyright (C) 2015 Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
#
# Copyright (C) 2015 Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
-#
2016-2019
Michael Jeanson <mjeanson@efficios.com>
+#
Copyright (C) 2016-2020
Michael Jeanson <mjeanson@efficios.com>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@
-16,6
+16,8
@@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+set -exu
+
# Version compare functions
vercomp () {
set +u
# Version compare functions
vercomp () {
set +u
@@
-69,6
+71,15
@@
verne() {
[ "$res" -ne "0" ]
}
[ "$res" -ne "0" ]
}
+failed_configure() {
+ # Assume we are in the configured build directory
+ echo "#################### BEGIN config.log ####################"
+ cat config.log
+ echo "#################### END config.log ####################"
+ exit 1
+}
+
+
# Required variables
WORKSPACE=${WORKSPACE:-}
# Required variables
WORKSPACE=${WORKSPACE:-}
@@
-206,6
+217,10
@@
cygwin)
;;
esac
;;
esac
+# Print build env details
+print_os || true
+print_tooling || true
+
# Enter the source directory
cd "$SRCDIR"
# Enter the source directory
cd "$SRCDIR"
@@
-288,7
+303,7
@@
oot)
builddir=$(mktemp -d)
cd "$builddir"
builddir=$(mktemp -d)
cd "$builddir"
- "$SRCDIR/configure" "${CONF_OPTS[@]}"
+ "$SRCDIR/configure" "${CONF_OPTS[@]}"
|| failed_configure
;;
dist)
;;
dist)
@@
-296,7
+311,7
@@
dist)
# Run configure and generate the tar file
# in the source directory
# Run configure and generate the tar file
# in the source directory
- ./configure
+ ./configure
|| failed_configure
$MAKE dist
# Create and enter a temporary build directory
$MAKE dist
# Create and enter a temporary build directory
@@
-308,7
+323,7
@@
dist)
$TAR xvf "$SRCDIR"/*.tar.* --strip 1
# Build in extracted source tree
$TAR xvf "$SRCDIR"/*.tar.* --strip 1
# Build in extracted source tree
- ./configure "${CONF_OPTS[@]}"
+ ./configure "${CONF_OPTS[@]}"
|| failed_configure
;;
oot-dist)
;;
oot-dist)
@@
-319,7
+334,7
@@
oot-dist)
cd "$builddir"
# Run configure out of tree and generate the tar file
cd "$builddir"
# Run configure out of tree and generate the tar file
- "$SRCDIR/configure"
+ "$SRCDIR/configure"
|| failed_configure
$MAKE dist
dist_srcdir="$(mktemp -d)"
$MAKE dist
dist_srcdir="$(mktemp -d)"
@@
-335,12
+350,12
@@
oot-dist)
# Run configure from the extracted distribution tar,
# out of the source tree
# Run configure from the extracted distribution tar,
# out of the source tree
- "$dist_srcdir/configure" "${CONF_OPTS[@]}"
+ "$dist_srcdir/configure" "${CONF_OPTS[@]}"
|| failed_configure
;;
*)
echo "Standard in-tree build"
;;
*)
echo "Standard in-tree build"
- ./configure "${CONF_OPTS[@]}"
+ ./configure "${CONF_OPTS[@]}"
|| failed_configure
;;
esac
;;
esac
This page took
0.079905 seconds
and
4
git commands to generate.