wu-arch/chipyard
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

log commands in build_utils.sh

Browse Source
This commit is contained in:
Tim Snyder
2022-02-24 01:42:22 +00:00
parent aed5bb1990
commit 871dc29e0d
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
scripts/build-util.sh
View File

@@ -28,29 +28,30 @@ module_prepare() ( # <submodule> [ignored-submodule..]
echo "=> Starting ${name} build" echo "=> Starting ${name} build"
echo "==> Initializing ${name} submodule" echo "==> Initializing ${name} submodule"
if [ $# -gt 0 ] ; then if [ $# -gt 0 ] ; then
git submodule update --init "${dir}" (set -x; git submodule update --init "${dir}")
while [ -n "$1" ] ; do while [ -n "$1" ] ; do
git -C "${dir}" config submodule."${1}".update none (set -x; git -C "${dir}" config submodule."${1}".update none)
shift shift
done done
fi fi
git submodule update --init --recursive "${dir}" (set -x; git submodule update --init --recursive "${dir}")
) )
module_run() ( # <submodule> <command..> module_run() ( # <submodule> <command..>
set -e set -e
echo "=> cd ${SRCDIR}/${1}"
cd "${SRCDIR}/${1}" cd "${SRCDIR}/${1}"
shift shift
"$@" (set -x; "$@")
) )
module_make() ( # <submodule> <target..> module_make() ( # <submodule> <target..>
set -e -o pipefail set -e -o pipefail
cd "${SRCDIR}/${1}/build" build_dir="${SRCDIR}/${1}/build"
shift shift
"${MAKE}" "$@" | tee "build-${1:-make}.log" (set -x; "${MAKE}" -C "$build_dir" "$@") | tee "build-${1:-make}.log"
if [ -n "$CLEANAFTERINSTALL" ] ; then if [ -n "$CLEANAFTERINSTALL" ] ; then
"${MAKE}" clean # get rid of intermediate files (set -x; "${MAKE}" -C "$build_dir" clean) # get rid of intermediate files
fi fi
) )
@@ -59,33 +60,33 @@ module_build() ( # <submodule> [configure-arg..]
name=$1 name=$1
shift shift
echo "==> cd ${SRCDIR}/${name}"
cd "${SRCDIR}/${name}" cd "${SRCDIR}/${name}"
if [ -e build ] ; then if [ -e build ] ; then
echo "==> Removing existing ${name}/build directory" echo "==> Removing existing ${name}/build directory"
rm -rf build (set -x; rm -rf build)
fi fi
if ! [ -e configure ] ; then if ! [ -e configure ] ; then
echo "==> Updating autoconf files for ${name}" echo "==> Updating autoconf files for ${name}"
find . -iname configure.ac -type f -print0 | find . -iname configure.ac -type f -print0 |
while read -r -d '' file ; do while read -r -d '' file ; do
mkdir -p -- "${file%/*}/m4" (set -x; mkdir -p -- "${file%/*}/m4")
done done
autoreconf -i (set -x; autoreconf -i)
fi fi
mkdir -p build (set -x; mkdir -p build)
cd build
{ {
export PATH="${RISCV:+${RISCV}/bin:}${PATH}" export PATH="${RISCV:+${RISCV}/bin:}${PATH}"
echo "==> Configuring ${name}" echo "==> Configuring ${name}"
../configure "$@" (set -x; cd build && ../configure "$@")
echo "==> Building ${name}" echo "==> Building ${name}"
"${MAKE}" (set -x; "${MAKE}" -C build)
echo "==> Installing ${name}" echo "==> Installing ${name}"
"${MAKE}" install (set -x; "${MAKE}" -C build install)
if [ -n "$CLEANAFTERINSTALL" ] ; then if [ -n "$CLEANAFTERINSTALL" ] ; then
"${MAKE}" clean # get rid of intermediate files (set -x; "${MAKE}" -C build clean) # get rid of intermediate files
fi fi
} 2>&1 | tee build.log } 2>&1 | tee build.log
) )