build.sh, subr/build_args.subr, etc/build.usage: remove meta-targets & fix target.. argument spec(s).

vars/build.vars: removes meta-targets, adds ${ALL_TARGETS}.

4 files changed, 17 insertions, 26 deletions

diff --git a/build.sh b/build.sh
index ca50d65a..b18730ee 100755
--- a/build.sh
+++ b/build.sh
@@ -3,7 +3,7 @@
 #
 
 buildp_dispatch() {
-	local _msg="${1}" _pkg_name="${2}" _tgt_name="${3}"						\
+	local _msg="${1}" _pkg_name="${2}" _tgt_name="${3}"					\
 		_build_tgt_meta _build_tgt_lc;
 	case "${_msg}" in
 	# Top-level
@@ -11,16 +11,13 @@ buildp_dispatch() {
 			ex_rtl_log_set_vnfo_lvl "${ARG_VERBOSE:-0}";
 			ex_rtl_log_msg info "Build started by ${BUILD_USER:=${USER}}@${BUILD_HNAME:=$(hostname)} at ${BUILD_DATE_START}.";
 			ex_rtl_log_env_vars "build (global)" ${DEFAULT_LOG_ENV_VARS};
-			for _build_tgt_meta in ${BUILD_TARGETS_META:-world}; do
-				for _build_tgt_lc in $(ex_rtl_get_var_unsafe				\
-						"$(ex_rtl_toupper "${_build_tgt_meta}")_TARGET"); do
-					ex_pkg_dispatch "${_build_tgt_lc}"				\
-							"${ARG_RESTART}" "${ARG_RESTART_AT}"		\
-							buildp_dispatch;
-					if [ ${?} -ne 0 ]; then
-						break;
-					fi;
-				done;
+			for _build_tgt_lc in ${BUILD_TARGETS:-${ALL_TARGETS}}; do
+				ex_pkg_dispatch "${_build_tgt_lc}"				\
+						"${ARG_RESTART}" "${ARG_RESTART_AT}"		\
+						buildp_dispatch;
+				if [ ${?} -ne 0 ]; then
+					break;
+				fi;
 			done;
 			buildp_dispatch finish_build; ;;
 	finish_build)	build_fini;
diff --git a/etc/build.usage b/etc/build.usage
index 97aeb23a..d3144847 100644
--- a/etc/build.usage
+++ b/etc/build.usage
@@ -35,7 +35,7 @@ usage: ./build.sh [-4|6] [-a nt32|nt64] [-b debug|release]
         -v[v[v]]                Be verbose; -vv: always print package logs; -vvv: logs fileops.
         -x                      Set xtrace during package builds; implies -vv.
         --debug-minipix         Don't strip(1) minipix binaries to facilitate debugging minipix.
-        <target>[ ..]           One of: dev, devroot, or world, or:
+        <target>[ ..]           One of:
                                 host or host_tools, host_toolchain_deps, host_toolchain, host_toolchain_mingw32,
                                 native or native_tools, native_toolchain_deps, native_toolchain, native_toolchain_mingw32, native_runtime,
                                 packages_deps or host_packages_deps, native_packages_deps, native_packages_deps_x11,
diff --git a/subr/build_args.subr b/subr/build_args.subr
index 34875047..0a3390c6 100644
--- a/subr/build_args.subr
+++ b/subr/build_args.subr
@@ -92,7 +92,7 @@ build_args() {
 	while [ ${#} -gt 0 ]; do
 	case "${1}" in
 	*=*)	ex_rtl_set_var_unsafe "${1%%=*}" "${1#*=}"; ;;
-	*)	BUILD_TARGETS_META="${BUILD_TARGETS_META:+${BUILD_TARGETS_META} }${1}"; ;;
+	*)	BUILD_TARGETS="${BUILD_TARGETS:+${BUILD_TARGETS} }${1}"; ;;
 	esac; shift; done;
 };
 
diff --git a/vars/build.vars b/vars/build.vars
index 5147671a..7664158b 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -1115,18 +1115,12 @@ DIST_TARGET_PACKAGES="dist_minipix_dist dist_etc dist_digest dist_tarballs";
 #
 # Build targets
 #
-DEV_TARGET="dev_packages";
-DIST_TARGET="dist_minipix dist_target";
-HOST_TARGET="host_tools host_toolchain_deps host_toolchain host_toolchain_mingw32";
-NATIVE_TARGET="native_tools native_toolchain_deps native_toolchain native_toolchain_mingw32 native_runtime";
-PACKAGES_DEPS_TARGET="host_packages_deps native_packages_deps native_packages_deps_x11";
-PACKAGES_TARGET="native_packages";
-
-#
-# Build meta-targets
-#
-DEV_TARGET="${HOST_TARGET} ${NATIVE_TARGET} ${DEV_TARGET}";
-DEVROOT_TARGET="${HOST_TARGET} ${NATIVE_TARGET}";
-WORLD_TARGET="${HOST_TARGET} ${NATIVE_TARGET} ${PACKAGES_DEPS_TARGET} ${PACKAGES_TARGET} ${DIST_TARGET}";
+ALL_TARGETS="
+dev_packages
+dist_minipix dist_target
+host_tools host_toolchain_deps host_toolchain host_toolchain_mingw32
+native_tools native_toolchain_deps native_toolchain native_toolchain_mingw32 native_runtime
+host_packages_deps native_packages_deps native_packages_deps_x11
+native_packages";
 
 # vim:filetype=sh textwidth=0