From e2fea1701c9f50beef117f881721626d3f94c5dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?= =?UTF-8?q?p=29?= Date: Fri, 3 Feb 2017 23:49:26 +0100 Subject: build.sh, subr/{build,pre_*}.subr: general cleanup. --- subr/post_build_files.subr | 15 +++++++++++++++ subr/pre_build_files.subr | 15 +++++++++++++++ subr/pre_setup_env.subr | 20 ++++++++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 subr/post_build_files.subr create mode 100644 subr/pre_build_files.subr create mode 100644 subr/pre_setup_env.subr (limited to 'subr') diff --git a/subr/post_build_files.subr b/subr/post_build_files.subr new file mode 100644 index 00000000..0f629eb1 --- /dev/null +++ b/subr/post_build_files.subr @@ -0,0 +1,15 @@ +# +# . ./build.vars and set -o errexit -o noglob are assumed. +# + +post_build_files() { + : $((BUILD_TIMES_SECS=$(command date +%s)-${BUILD_TIMES_SECS})); + : $((BUILD_TIMES_HOURS=${BUILD_TIMES_SECS}/3600)); + : $((BUILD_TIMES_MINUTES=(${BUILD_TIMES_SECS}%3600)/60)); + : $((BUILD_TIMES_SECS=(${BUILD_TIMES_SECS}%3600)%60)); + if [ -f "${BUILD_STATUS_IN_PROGRESS_FNAME}" ]; then + build_fileop rm ${BUILD_STATUS_IN_PROGRESS_FNAME}; + fi; +}; + +# vim:filetype=sh diff --git a/subr/pre_build_files.subr b/subr/pre_build_files.subr new file mode 100644 index 00000000..ea0e6b95 --- /dev/null +++ b/subr/pre_build_files.subr @@ -0,0 +1,15 @@ +# +# . ./build.vars and set -o errexit -o noglob are assumed. +# + +pre_build_files() { + if [ -e ${BUILD_LOG_FNAME} ]; then + mv -- ${BUILD_LOG_FNAME} ${BUILD_LOG_LAST_FNAME}; + fi; + touch ${BUILD_STATUS_IN_PROGRESS_FNAME}; + BUILD_DATE_START="$(date %Y-%m-%d-%H-%M-%S)"; + BUILD_NFINI=${BUILD_NSKIP:=${BUILD_NFAIL:=${BUILD_NBUILT:=0}}}; + BUILD_TIMES_SECS=$(command date +%s); +}; + +# vim:filetype=sh diff --git a/subr/pre_setup_env.subr b/subr/pre_setup_env.subr new file mode 100644 index 00000000..c454393e --- /dev/null +++ b/subr/pre_setup_env.subr @@ -0,0 +1,20 @@ +# +# . ./build.vars and set -o errexit -o noglob are assumed. +# + +pre_setup_env() { + if [ -z "${BUILD_CPUS}" ]\ + && [ -e /proc/cpuinfo ]; then + BUILD_CPUS=$(awk '/^processor/{cpus++} END{print cpus}' /proc/cpuinfo); + fi; + for __ in ${HOME}/midipix_build.vars ../midipix_build.vars ./vars/build.vars; do + [ -e ${__} ] && . ${__}; + done; + for __ in $(export | sed -e 's/^export //' -e 's/=.*$//'); do + if ! match_list "${CLEAR_ENV_VARS_EXCEPT}" " " "${__}"; then + unset "${__}"; + fi; + done; +}; + +# vim:filetype=sh -- cgit v1.2.3