diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-02-29 13:28:22 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-02-29 13:28:22 +0000 |
| commit | efeeb057a7857ee35319d129b7298274262c5c52 (patch) | |
| tree | b520be98f8a3938e79db379e980bfde8afd4bf5d /subr | |
| parent | fa4a80dd5993cc64a72c92a450b3a25e3949eb4f (diff) | |
| download | midipix_build-efeeb057a7857ee35319d129b7298274262c5c52.tar.bz2 midipix_build-efeeb057a7857ee35319d129b7298274262c5c52.tar.xz | |
Refactors dist packages into groups/999.dist.group and dist/dist_*.dist.
build.sh:buildp_dispatch_pkg_state(): fix `missing_pkg' log message.
subr/ex_pkg_env.subr:exp_pkg_env_set(): source from "dist/${_pkg_name}.dist" given `dist' group.
Diffstat (limited to 'subr')
| -rw-r--r-- | subr/build_init.subr | 4 | ||||
| -rw-r--r-- | subr/ex_pkg_env.subr | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/subr/build_init.subr b/subr/build_init.subr index 213bf7d6..aebe3b0e 100644 --- a/subr/build_init.subr +++ b/subr/build_init.subr @@ -231,7 +231,9 @@ buildp_init_vars() { if [ -z "${BUILD_GROUPS}" ]; then BUILD_GROUPS="${_default_build_groups}"; fi; - BUILD_GROUPS="$(rtl_lconcat "$(rtl_lfilter "${BUILD_GROUPS}" "invariants")" "invariants")"; + if [ -n "${ARG_DIST}" ]; then + BUILD_GROUPS="$(rtl_lconcat "$(rtl_lfilter "${BUILD_GROUPS}" "dist")" "dist")"; + fi; for _group in ${BUILD_GROUPS}; do if ! rtl_lmatch "${_groups}" "${_group}"; then _rc=1; _status="Error: unknown build group \`${_group}'."; break; diff --git a/subr/ex_pkg_env.subr b/subr/ex_pkg_env.subr index 7f58d3d0..9b0d9437 100644 --- a/subr/ex_pkg_env.subr +++ b/subr/ex_pkg_env.subr @@ -85,7 +85,11 @@ exp_pkg_env_set() { ex_pkg_env() { local _build_steps_default="${1}" _build_vars_default="${2}" _group_name="${3}" \ _pkg_name="${4}" _restart_at="${5}" _workdir="${6}" _vname=""; - rtl_fileop source_opt "vars/${_pkg_name}.vars"; + if [ "${_group_name}" = "dist" ]; then + rtl_fileop source_opt "dist/${_pkg_name}.dist"; + else + rtl_fileop source_opt "vars/${_pkg_name}.vars"; + fi; if ! exp_pkg_env_set "${_build_vars_default}" "${_group_name}" "${_pkg_name}"\ || ! exp_pkg_env_defaults "${_build_steps_default}" "${_pkg_name}" "${_workdir}"; then return "${?}"; |