build.sh, etc/build.usage, subr/*: merges {-[ptz],--rpm} into -D {minipix,pkg,rpm,t{bz2,gz,xz},zipdist}.

subr/{build_args,pkg_clean}.subr: cleanup ${ARG_CLEAN_BUILDS} usage.
vars/build.vars:dist: merged into invariants.
vars/invariants_minipix.vars: adapted from vars/dist_minipix_dist.vars.
vars/{invariants_tarballs,midipix}.vars: don't produce source tarballs.

1 files changed, 46 insertions, 61 deletions

diff --git a/vars/invariants_tarballs.vars b/vars/invariants_tarballs.vars
index 1b89aeb0..998a1b54 100644
--- a/vars/invariants_tarballs.vars
+++ b/vars/invariants_tarballs.vars
@@ -2,103 +2,88 @@
 # set -o errexit -o noglob are assumed.
 #
 
-pkgp_dist_tarball_dist() {
-	TARBALL_FNAME="${DEFAULT_TARBALL_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.${DEFAULT_TARBALL_SUFFIX}";
+pkgp_invariants_tarball_dist() {
+	local _tarball_compress_cmd="${1}" _tarball_compress_args="${2}" _tarball_suffix="${3}";
+	local _tarball_fname="${DEFAULT_TARBALL_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.${_tarball_suffix}";
 	tar -cpf - $(find . -maxdepth 1 -mindepth 1 -type d				\
 			-not -path ./minipix						\
 			-not -path ./minipix_dist					\
 			-not -path ./rpm						\
 			-not -path ./tmp | sort)					\
 		midipix_shortcut.vbs midipix.sh	README SHA256SUMS			|\
-	"${TARBALL_COMPRESS_CMD}" ${TARBALL_COMPRESS_ARGS} -c > "${TARBALL_FNAME}";
+	"${_tarball_compress_cmd}" ${_tarball_compress_args} -c > "${_tarball_fname}";
 	ex_rtl_log_msg info "Finished building binary distribution tarball.";
 	if [ -x "$(which gpg 2>/dev/null)" -a -n "${DEFAULT_TARBALL_SIGN_GPG_KEY}" ] &&	\
 				gpg --list-keys "${DEFAULT_TARBALL_SIGN_GPG_KEY}" >/dev/null 2>&1; then
 		gpg --armor --passphrase-file /dev/null					\
-			--local-user "${DEFAULT_TARBALL_SIGN_GPG_KEY}" --sign "${TARBALL_FNAME}";
+			--local-user "${DEFAULT_TARBALL_SIGN_GPG_KEY}" --sign "${_tarball_fname}";
 		ex_rtl_log_msg info "Signed binary distribution tarball.";
 	fi;
 };
 
-pkgp_dist_tarball_toolchain() {
-	TARBALL_CROSS_FNAME="${DEFAULT_TARBALL_CROSS_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.${DEFAULT_TARBALL_SUFFIX}";
+pkgp_invariants_tarball_toolchain() {
+	local _tarball_compress_cmd="${1}" _tarball_compress_args="${2}" _tarball_suffix="${3}";
+	local _tarball_cross_fname="${DEFAULT_TARBALL_CROSS_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.${_tarball_suffix}";
 	tar -cpf - bin include lib lib64 libexec share "${PKG_TARGET}"			|\
-	"${TARBALL_COMPRESS_CMD}" ${TARBALL_COMPRESS_ARGS} -c > "${TARBALL_CROSS_FNAME}";
+	"${_tarball_compress_cmd}" ${_tarball_compress_args} -c > "${_tarball_cross_fname}";
 	ex_rtl_log_msg info "Finished building toolchain tarball.";
 	if [ -x "$(which gpg 2>/dev/null)" -a -n "${DEFAULT_TARBALL_SIGN_GPG_KEY}" ] &&		\
 				gpg --list-keys "${DEFAULT_TARBALL_SIGN_GPG_KEY}" >/dev/null 2>&1; then
 		gpg --armor --passphrase-file /dev/null					\
-			--local-user "${DEFAULT_TARBALL_SIGN_GPG_KEY}" --sign "${TARBALL_CROSS_FNAME}";
+			--local-user "${DEFAULT_TARBALL_SIGN_GPG_KEY}" --sign "${_tarball_cross_fname}";
 		ex_rtl_log_msg info "Signed toolchain tarball.";
 	fi;
 };
 
-pkgp_dist_tarball_minipix() {
-	TARBALL_MINIPIX_FNAME="${DEFAULT_TARBALL_MINIPIX_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.${DEFAULT_TARBALL_SUFFIX}";
+pkgp_invariants_tarball_minipix() {
+	local _tarball_compress_cmd="${1}" _tarball_compress_args="${2}" _tarball_suffix="${3}";
+	local _tarball_minipix_fname="${DEFAULT_TARBALL_MINIPIX_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.${_tarball_suffix}";
 	tar -cpf - minipix 								\
 		midipix_shortcut.vbs midipix.sh README					|\
-	"${TARBALL_COMPRESS_CMD}" ${TARBALL_COMPRESS_ARGS} -c > "${TARBALL_MINIPIX_FNAME}";
+	"${_tarball_compress_cmd}" ${_tarball_compress_args} -c > "${_tarball_minipix_fname}";
 	ex_rtl_log_msg info "Finished building binary Minipix distribution tarball.";
 	if [ -x "$(which gpg 2>/dev/null)" -a -n "${DEFAULT_TARBALL_SIGN_GPG_KEY}" ] &&		\
 				gpg --list-keys "${DEFAULT_TARBALL_SIGN_GPG_KEY}" >/dev/null 2>&1; then
 		gpg --armor --passphrase-file /dev/null					\
-			--local-user "${DEFAULT_TARBALL_SIGN_GPG_KEY}" --sign "${TARBALL_MINIPIX_FNAME}";
+			--local-user "${DEFAULT_TARBALL_SIGN_GPG_KEY}" --sign "${_tarball_minipix_fname}";
 		ex_rtl_log_msg info "Signed binary Minipix distribution tarball.";
 	fi;
 };
 
-pkgp_dist_tarball_src() {
-	local _build_tgt_lc="" _build_tgt_uc="" _find_filters="" _pkg_name_lc="" _pkg_name_uc="";
-	TARBALL_SRC_FNAME="${DEFAULT_TARBALL_SRC_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.tar.${DEFAULT_TARBALL_SUFFIX}";
-	ex_rtl_log_msg info "Building source tarball...";
-	for _build_tgt_lc in ${BUILD_TARGETS:-${TARGETS_DEFAULT}}; do
-		_build_tgt_uc="$(ex_rtl_toupper "${_build_tgt_lc}")";
-		for _pkg_name_lc in $(ex_rtl_get_var_unsafe ${_build_tgt_uc}_PACKAGES); do
-			_pkg_name_uc="$(ex_rtl_toupper "${_pkg_name_lc}")";
-			if [ "$(ex_rtl_get_var_unsafe ${_pkg_name_uc}_SRC_TARBALL_DISABLE)" = "1" ]; then
-				_find_filters="${_find_filters:+${_find_filters} }( -not -name ${_pkg_name}-\*-\* )";
-			fi;
-		done;
-	done;
-	tar -C "${BUILD_WORKDIR}" -cpf - $(cd "${BUILD_WORKDIR}" && find	\
-		-maxdepth 1 -mindepth 1 -name \*-\*-\*				\
-		${_find_filters})						|\
-	"${TARBALL_COMPRESS_CMD}" ${TARBALL_COMPRESS_ARGS} -c > "${TARBALL_SRC_FNAME}";
-	ex_rtl_log_msg info "Finished building source tarball.";
-	if [ -x "$(which gpg 2>/dev/null)" -a -n "${DEFAULT_TARBALL_SIGN_GPG_KEY}" ] &&	\
-				gpg --list-keys "${DEFAULT_TARBALL_SIGN_GPG_KEY}" >/dev/null 2>&1; then
-		gpg --armor --passphrase-file /dev/null				\
-			--local-user "${DEFAULT_TARBALL_SIGN_GPG_KEY}" --sign "${TARBALL_SRC_FNAME}";
-		ex_rtl_log_msg info "Signed source tarball.";
-	fi;
-};
-
 pkg_invariants_tarballs_all() {
-	if [ -z "${ARG_TARBALL}" ]; then
-		exit 0;
-	else
-		ex_rtl_log_msg info "Building distribution tarballs...";
+	local _tarball_compress_args="" _tarball_compress_cmd="" _tarball_suffix="" _tarball_suffixes="" _tarball_type="" _tarball_types="";
+	if ex_rtl_lmatch "${ARG_DIST}" , tbz2; then
+		_tarball_suffixes="${_tarball_suffixes:+${_tarball_suffixes} }bz2";
+	fi;
+	if ex_rtl_lmatch "${ARG_DIST}" , tgz; then
+		_tarball_suffixes="${_tarball_suffixes:+${_tarball_suffixes} }gz";
 	fi;
-	case "${DEFAULT_TARBALL_SUFFIX}" in
-	bz2)	if [ -n "$(which pbzip2 2>/dev/null)" ]; then
-			TARBALL_COMPRESS_CMD="pbzip2";
-		else
-			TARBALL_COMPRESS_CMD="bzip2";
-		fi; ;;
-	gz)	if [ -n "$(which pigz 2>/dev/null)" ]; then
-			TARBALL_COMPRESS_CMD="pigz";
-		else
-			TARBALL_COMPRESS_CMD="gzip";
-		fi; ;;
-	xz)	TARBALL_COMPRESS_CMD="xz";
-		TARBALL_COMPRESS_ARGS="-T0"; ;;
-	*)	ex_rtl_log_msg failexit "Unknown tarball suffix \`.${DEFAULT_TARBALL_SUFFIX}'.";
-	esac;
-	ex_rtl_fileop cd "${PREFIX}"; PREFIX_BASENAME="${PREFIX_NATIVE##*/}";
-	pkgp_dist_tarball_dist; pkgp_dist_tarball_toolchain; pkgp_dist_tarball_minipix;
-	if [ "${BUILD}" = "debug" ]; then
-		pkgp_dist_tarball_src;
+	if ex_rtl_lmatch "${ARG_DIST}" , txz; then
+		_tarball_suffixes="${_tarball_suffixes:+${_tarball_suffixes} }xz";
 	fi;
+	for _tarball_suffix in ${_tarball_suffixes}; do
+		ex_rtl_log_msg info "Building ${_tarball_suffix}-compressed distribution tarballs...";
+		case "${_tarball_suffix}" in
+		bz2)	if [ -n "$(which pbzip2 2>/dev/null)" ]; then
+				_tarball_compress_cmd="pbzip2";
+			else
+				_tarball_compress_cmd="bzip2";
+			fi; ;;
+		gz)	if [ -n "$(which pigz 2>/dev/null)" ]; then
+				_tarball_compress_cmd="pigz";
+			else
+				_tarball_compress_cmd="gzip";
+			fi; ;;
+		xz)	_tarball_compress_cmd="xz";
+			_tarball_compress_args="-T0"; ;;
+		*)	ex_rtl_log_msg failexit "Unknown tarball suffix \`${_tarball_suffix}'.";
+		esac;
+		ex_rtl_fileop cd "${PREFIX}"; PREFIX_BASENAME="${PREFIX_NATIVE##*/}";
+		_tarball_types="dist toolchain minipix";
+		for _tarball_type in ${_tarball_types}; do
+			pkgp_invariants_tarball_${_tarball_type} "${_tarball_compress_cmd}" "${_tarball_compress_args}" "${_tarball_suffix}";
+		done;
+	done;
 };
 
 # vim:filetype=sh