1 files changed, 185 insertions, 95 deletions

diff --git a/subr.ex/ex_pkg.subr b/subr.ex/ex_pkg.subr
index c914360e..0458ed6d 100644
--- a/subr.ex/ex_pkg.subr
+++ b/subr.ex/ex_pkg.subr
@@ -13,25 +13,15 @@
 # @_workdir:		pathname to build-specific temporary directory
 #
 # Returns:		zero (0) given no outstanding dependencies, non-zero (>0) otherwise
-# Side effects:		${PKG_${_PKG_NAME}_DEPENDS_FULL} may be mutated
 #
 ex_pkg_check_depends() {
 	local	_epcd_checkfl="${1}" _epcd_rpkg_disabled="${2}" _epcd_rpkg_finished="${3#\$}"	\
 		_epcd_pkg_name="${4}" _epcd_rpkg_names="${5#\$}" _epcd_workdir="${6}"		\
 		_epcd_dependfl=0 _epcd_depends="" _epcd_pkg_name_depend="";
 
-	if [ "${_epcd_checkfl}" -eq 1 ]; then
-		if ! rtl_get_var_unsafe \$_epcd_depends -u "PKG_"${_epcd_pkg_name}"_DEPENDS_FULL"\
-		|| [ "${_epcd_depends:+1}" != 1 ];
-		then
-			if rtl_get_var_unsafe \$_epcd_depends -u "PKG_"${_epcd_pkg_name}"_DEPENDS";
-			then
-				eval PKG_"${_epcd_pkg_name}"_DEPENDS_FULL='$(rtl_uniq ${_epcd_depends})';
-			else
-				return 0;
-			fi;
-		fi;
-
+	if [ "${_epcd_checkfl}" -eq 1 ]\
+	&& rtl_get_var_unsafe \$_epcd_depends -u "PKG_"${_epcd_pkg_name}"_DEPENDS"\
+	&& [ "${_epcd_depends:+1}" = 1 ]; then
 		for _epcd_pkg_name_depend in ${_epcd_depends}; do
 			if ! rtl_lmatch "${_epcd_rpkg_disabled}" "${_epcd_pkg_name_depend}"\
 			&& ! ex_pkg_state_test2 "${_epcd_workdir}" "${_epcd_pkg_name_depend}" finish;
@@ -49,6 +39,60 @@ ex_pkg_check_depends() {
 };
 
 #
+# ex_pkg_check_depends_unknown() - check single named package for unknown dependencies
+# @_pkg_name:		single package name
+# @_rpkg_names_set:	in reference to variable of set of package names
+# @_rpkg_unknown:	out reference to variable of list of finished packages
+#
+# Returns:		zero (0) given no unknown dependencies, non-zero (>0) otherwise
+#
+ex_pkg_check_depends_unknown() {
+	local	_epcdu_pkg_name="${1}" _epcdu_rpkg_names_set="${2#\$}"		\
+		_epcdu_rpkg_unknown="${3#\$}"					\
+		_epcdu_defined=0 _epcdu_depends="" _epcdu_pkg_name_depend=""	\
+		_epcdu_rc=0;
+
+	if rtl_get_var_unsafe \$_epcdu_depends -u "PKG_"${_epcdu_pkg_name}"_DEPENDS"\
+	&& [ "${_epcdu_depends:+1}" = 1 ]; then
+		for _epcdu_pkg_name_depend in ${_epcdu_depends}; do
+			if ! rtl_get_var_unsafe \$_epcdu_defined "${_epcdu_rpkg_names_set}_${_epcdu_pkg_name_depend}"\
+			|| [ "${_epcdu_defined:-0}" -eq 0 ]; then
+				rtl_lconcat "${_epcdu_rpkg_unknown}" "${_epcdu_pkg_name_depend}";
+				_epcdu_rc=1;
+			fi;
+		done;
+	fi;
+
+	return "${_epcdu_rc}";
+};
+
+#
+# ex_pkg_copy_group_vars() - copy build group variables into build group
+# @_group_name_src:		single source build group name
+# @_group_name_dst:		single destination build group name
+# @[_build_vars_default]:	optional list of default build variables, defaults to ${DEFAULT_BUILD_VARS}
+#
+# Returns:			zero (0) on success, non-zero (>0) on failure.
+#
+ex_pkg_copy_group_vars() {
+	local	_epcgv_group_name_src="${1#\$}" _epcgv_group_name_dst="${2#\$}"	\
+		_epcgv_build_vars_default="${3:-${DEFAULT_BUILD_VARS}}"		\
+		_epcgv_group_name_dst_uc="" _epcgv_group_name_src_uc=""		\
+		_epcgv_vname="" _epcgv_vval="";
+	rtl_toupper2 \$_epcgv_group_name_dst \$_epcgv_group_name_dst_uc;
+	rtl_toupper2 \$_epcgv_group_name_src \$_epcgv_group_name_src_uc;
+
+	for _epcgv_vname in ${_epcgv_build_vars_default}; do
+		if rtl_get_var_unsafe \$_epcgv_vval "${_epcgv_group_name_src_uc}_${_epcgv_vname}"\
+		&& [ "${_epcgv_vval:+1}" = 1 ]; then
+			rtl_set_var_unsafe "${_epcgv_group_name_dst_uc}_${_epcgv_vname}" "${_epcgv_vval}";
+		fi;
+	done;
+
+	return 0;
+};
+
+#
 # ex_pkg_find_package() - find build group a single named package belongs to
 # @_rgroup_name:	out reference to variable of build group name
 # @_group_names:	build group names
@@ -180,7 +224,7 @@ ex_pkg_get_package_vars() {
 
 	eval ${_epgpv_rpkg_vnames}='${_epgpv_vnames}';
 	return 0;
-}
+};
 
 #
 # ex_pkg_load_vars() - load build variables
@@ -249,77 +293,97 @@ ex_pkg_load_vars() {
 # Returns:		zero (0) on success, non-zero (>0) on failure.
 #
 ex_pkg_load_groups() {
-	local	_eplg_rgroups="${1#\$}" _eplg_rgroups_noauto="${2#\$}"		\
-		_eplg_build_groups="" _eplg_build_groups_noauto=""		\
-		_eplg_fname="" _eplg_group="" _eplg_group_noautofl=0		\
-		_eplg_group_target="" _eplg_group_target_uc=""			\
-		_eplg_group_target_appendfl=0 _eplg_groups="" _eplg_pkg_name=""	\
-		_eplg_pkg_names="";
+	local	_eplg_rgroups="${1#\$}" _eplg_rgroups_noauto="${2#\$}"	\
+		_eplg_build_groups="" _eplg_build_groups_noauto="" _eplg_fname="";
 
+	EXP_PKG_REGISTER_GROUP_RGROUPS="${_eplg_rgroups}";
+	EXP_PKG_REGISTER_GROUP_RGROUPS_NOAUTO="${_eplg_rgroups_noauto}";
 	for _eplg_fname in $(find ./groups.d -name *.group | sort); do
-		rtl_fileop source_opt "${_eplg_fname}";
-
-		_eplg_group="${_eplg_fname##*/}";
-		_eplg_group="${_eplg_group%.group}";
-		_eplg_group="${_eplg_group#*.}";
+		rtl_fileop source_with_fnamevar "${_eplg_fname}";
+	done;
+	unset EXP_PKG_REGISTER_GROUP_RGROUPS;
+	unset EXP_PKG_REGISTER_GROUP_RGROUPS_NOAUTO;
 
-		if [ "${GROUP_TARGET_APPEND:+1}" = 1 ]; then
-			_eplg_group_target="${GROUP_TARGET_APPEND}";
-			_eplg_group_target_appendfl=1;
-			unset GROUP_TARGET_APPEND;
-		else
-			_eplg_group_target="${_eplg_group}";
-			_eplg_group_target_appendfl=0;
-		fi;
+	for _eplg_fname in $(find ./groups.d -mindepth 2 -name *.package | sort); do
+		rtl_fileop source_with_fnamevar "${_eplg_fname}";
+	done;
 
-		_eplg_group_noautofl=0;
-		if ! rtl_lmatch \$_eplg_groups "${_eplg_group_target}"; then
-			rtl_lconcat \$_eplg_groups "${_eplg_group_target}";
-			if eval [ \"\${GROUP_AUTO:+1}\" = 1 ]; then
-				if eval [ \"\${GROUP_AUTO:-0}\" -ne 0 ]; then
-					_eplg_group_noautofl=0;
-					rtl_lconcat \$_eplg_build_groups "${_eplg_group_target}";
-				else
-					_eplg_group_noautofl=1;
-					rtl_lconcat \$_eplg_build_groups_noauto "${_eplg_group_target}";
-				fi;
-				unset GROUP_AUTO;
-			else
-				rtl_lconcat \$_eplg_build_groups "${_eplg_group_target}";
-			fi;
-		fi;
+	return 0;
+};
 
-		if rtl_get_var_unsafe \$_eplg_pkg_names -u "${_eplg_group}_PACKAGES"\
-		&& [ "${_eplg_pkg_names:+1}" = 1 ]; then
-			if [ "${_eplg_group_target_appendfl}" -eq 1 ]; then
-				rtl_toupper2 \$_eplg_group_target \$_eplg_group_target_uc;
-				rtl_lconcat "\$${_eplg_group_target_uc}_PACKAGES" "${_eplg_pkg_names}";
-			fi;
+#
+# ex_pkg_register() - register single package
+# @_pkg_name:		single package name
+# @_fname:		pathname to file package is defined in, relative to midipix_build root
+# @[_group_name]:	optional build group name; inferred from @_fname if not specified
+#
+# Returns:		zero (0) on success, non-zero (>0) on failure.
+#
+ex_pkg_register() {
+	local	_epr_pkg_name="${1}" _epr_fname="${2}" _epr_group_name="${3:-}"	\
+		_epr_group_name_uc="" _epr_group_noautofl=0;
+
+	if [ "${_epr_group_name:+1}" != 1 ]; then
+		_epr_group_name="${_epr_fname#./*/}";
+		_epr_group_name="${_epr_group_name%%/*}";
+		_epr_group_name="${_epr_group_name%.d}";
+		_epr_group_name="${_epr_group_name#*.}";
+	fi;
 
-			if [ "${_eplg_group_noautofl}" -eq 0 ]; then
-				for _eplg_pkg_name in ${_eplg_pkg_names}; do
-					rtl_set_var_unsafe -u "PKG_${_eplg_pkg_name}_GROUP" "${_eplg_group}";
-					rtl_set_var_unsafe -u "PKG_${_eplg_pkg_name}_GROUP_FNAME" "${_eplg_fname}";
-				done;
-			fi;
-		fi;
-	done;
+	rtl_toupper2 \$_epr_group_name \$_epr_group_name_uc;
+	rtl_lconcat "\$${_epr_group_name_uc}_PACKAGES" "${_epr_pkg_name}";
+	rtl_set_var_unsafe -u "PKG_${_epr_pkg_name}_GROUP" "${_epr_group_name}";
+	rtl_set_var_unsafe -u "PKG_${_epr_pkg_name}_GROUP_FNAME" "${_epr_fname}";
 
-	_eplg_build_groups="$(rtl_uniq "${_eplg_build_groups}")";
-	eval ${_eplg_rgroups}=\"${_eplg_build_groups}\";
+	return 0;
+};
 
-	if [ "${_eplg_rgroups_noauto:+1}" = 1 ]; then
-		_eplg_build_groups_noauto="$(rtl_uniq "${_eplg_build_groups_noauto}")";
-		eval ${_eplg_rgroups_noauto}=\"${_eplg_build_groups_noauto}\";
+#
+# ex_pkg_register_group() - register single group
+# @_group_name:					single group name
+# @_fname:					pathname to file group is defined in, relative to midipix_build root
+# @[_ownerfl]:					"owner" for groups that own their packages, "copy" for shorthand groups referring to packages from other groups
+# @[_autofl]:					"auto" for groups to build by default, "noauto" for optional groups only built when requested
+# ${EXP_PKG_REGISTER_GROUP_RGROUPS}:		inout reference to variable of build groups
+# ${EXP_PKG_REGISTER_GROUP_RGROUPS_NOAUTO}:	inout reference to variable of build groups only built when requested
+#
+# Returns:					zero (0) on success, non-zero (>0) on failure.
+#
+ex_pkg_register_group() {
+	local	_eprg_group_name="${1}" _eprg_fname="${2}"		\
+		_eprg_ownerfl="${3:-owner}" _eprg_autofl="${4:-auto}"	\
+		_eprg_pkg_name="" _eprg_pkg_names="" _eprg_rgroups="";
+
+	case "${_eprg_autofl}" in
+	auto)	_eprg_rgroups="${EXP_PKG_REGISTER_GROUP_RGROUPS}"; ;;
+	noauto)	_eprg_rgroups="${EXP_PKG_REGISTER_GROUP_RGROUPS_NOAUTO}"; ;;
+	*)	;;
+	esac;
+	if ! rtl_lmatch "${_eprg_rgroups}" "${_eprg_group_name}"; then
+		rtl_lconcat "${_eprg_rgroups}" "${_eprg_group_name}";
 	fi;
 
+	case "${_eprg_ownerfl}" in
+	owner)
+		if rtl_get_var_unsafe \$_eprg_pkg_names -u "${_eprg_group_name}_PACKAGES"\
+		&& [ "${_eprg_pkg_names:+1}" = 1 ]; then
+			for _eprg_pkg_name in ${_eprg_pkg_names}; do
+				rtl_set_var_unsafe -u "PKG_${_eprg_pkg_name}_GROUP" "${_eprg_group_name}";
+				rtl_set_var_unsafe -u "PKG_${_eprg_pkg_name}_GROUP_FNAME" "${_eprg_fname}";
+			done;
+		fi;
+		;;
+	copy)	;;
+	*)	;;
+	esac;
+
 	return 0;
 };
 
 #
 # ex_pkg_unfold_depends() - unfold list of package names into dependency-expanded set of complete, disabled, finished, and outstanding package names
-# @_rdisabled:		in reference toout variable of disabled packages
-# @_rfinished:		in reference toout variable of finished packages
+# @_rdisabled:		in reference to out variable of disabled packages
+# @_rfinished:		in reference to out variable of finished packages
 # @_rnames:		out reference to variable of package names
 # @_checkfl:		enable (1) or inhibit (0) dependency expansion
 # @_forcefl:		enable (1) or inhibit (0) forcibly rebuilding finished packages
@@ -336,8 +400,9 @@ ex_pkg_unfold_depends() {
 		_epud_checkfl="${4}" _epud_forcefl="${5}" _epud_group_name="${6}"		\
 		_epud_pkg_names="${7}" _epud_restart="${8}" _epud_test_finished="${9}"		\
 		_epud_workdir="${10}"								\
-		_epud_pkg_disabled="" _epud_pkg_force="" _epud_pkg_name=""			\
-		_epud_pkg_names_new=""	_epud_restartfl=0;
+		_epud_depends="" _epud_pkg_disabled="" _epud_pkg_force="" _epud_pkg_name=""	\
+		_epud_pkg_name_depend="" _epud_pkg_names_new="" _epud_pkg_names_set=""		\
+		_epud_pkg_unknown="" _epud_restartfl=0 _epud_unknown_depends=0;
 
 	if [ "${_epud_restart:+1}" = 1 ]\
 	&& ! rtl_lmatch \$_epud_restart "ALL LAST"; then
@@ -349,7 +414,19 @@ ex_pkg_unfold_depends() {
 		_epud_pkg_names="$(rtl_uniq ${_epud_pkg_names})";
 	fi;
 
+	rtl_llift_set \$_epud_pkg_names \$_epud_pkg_names_set;
 	for _epud_pkg_name in ${_epud_pkg_names}; do
+		if rtl_get_var_unsafe \$_epud_depends -u "PKG_"${_epud_pkg_name}"_DEPENDS"\
+		&& [ "${_epud_depends:+1}" = 1 ]; then
+			_epud_pkg_unknown="";
+			if ! ex_pkg_check_depends_unknown "${_epud_pkg_name}" \$_epud_pkg_names_set \$_epud_pkg_unknown; then
+				for _epud_pkg_name_depend in ${_epud_pkg_unknown}; do
+					rtl_log_msgV "warning" "${MSG_build_unknown_dep}" "${_epud_pkg_name_depend}" "${_epud_pkg_name}";
+				done;
+				_epud_unknown_depends=1;
+			fi;
+		fi;
+
 		if [ "${_epud_restart}" = "ALL" ]\
 		|| rtl_lmatch \$_epud_restart "${_epud_pkg_name}"; then
 			_epud_restartfl=1;
@@ -375,6 +452,11 @@ ex_pkg_unfold_depends() {
 			rtl_lconcat \$_epud_pkg_names_new "${_epud_pkg_name}";
 		fi;
 	done;
+	rtl_llift_unset \$_epud_pkg_names_set;
+
+	if [ "${_epud_unknown_depends}" -eq 1 ]; then
+		rtl_log_msgV "warning" "${MSG_build_unknown_deps}";
+	fi;
 
 	eval ${_epud_rdisabled}='$(rtl_uniq2 "${_epud_rdisabled}")';
 	eval ${_epud_rfinished}='$(rtl_uniq2 "${_epud_rfinished}")';
@@ -385,24 +467,25 @@ ex_pkg_unfold_depends() {
 
 #
 # ex_pkg_unfold_rdepends() - unfold list of package names into reverse dependency-expanded set of complete, disabled, finished, and outstanding package names
-# @_rdisabled:		in reference toout variable of disabled packages
-# @_rfinished:		in reference toout variable of finished packages
+# @_rdisabled:		in reference to out variable of disabled packages
+# @_rfinished:		in reference to out variable of finished packages
 # @_rnames:		out reference to variable of package names
 # @_group_name:		build group name
 # @_pkg_names:		list of package names
 # @_restart:		optional whitespace-separated list of package names to rebuild
 # @_test_finished:	only exclude disabled packages (0,) split finished packages
 # @_workdir:		pathname to build-specific temporary directory
+# @_recursefl:		resolve recursively ("recurse") or non-recursively ("norecurse")
 #
 # Returns:		zero (0) on success, non-zero (>0) on failure.
 #
 ex_pkg_unfold_rdepends() {
 	local	_epur_rdisabled="${1#\$}" _epur_rfinished="${2#\$}" _epur_rnames="${3#\$}"	\
 		_epur_group_name="${4}" _epur_pkg_names="${5}" _epur_restart="${6}"		\
-		_epur_test_finished="${7}" _epur_workdir="${8}"					\
+		_epur_test_finished="${7}" _epur_workdir="${8}" _epur_recursefl="${9}"		\
 		_epur_depends="" _epur_disabled=0 _epur_force=0 _epur_pkg_depends=""		\
 		_epur_pkg_name="" _epur_pkg_names_new="" _epur_pkg_name_depend=""		\
-		_epur_pkg_rdepends="";
+		_epur_pkg_name_rdepend="" _epur_pkg_rdepends="";
 
 	for _epur_pkg_name_depend in ${_epur_restart}; do
 		for _epur_pkg_name in ${_epur_pkg_names}; do
@@ -414,25 +497,32 @@ ex_pkg_unfold_rdepends() {
 			  && [ "${_epur_pkg_depends:+1}" = 1 ]\
 			  && rtl_lmatch \$_epur_pkg_depends "${_epur_pkg_name_depend}";
 			then
-				if rtl_get_var_unsafe \$_epur_disabled -u "PKG_${_epur_pkg_name}_DISABLED"\
-				&& [ "${_epur_disabled}" = 1 ];
-				then
-					rtl_lconcat "${_epur_rdisabled}" "${_epur_pkg_name}";
-
-				elif [ "${_epur_test_finished}" -eq 1 ]\
-				&&   ex_pkg_state_test2 "${_epur_workdir}" "${_epur_pkg_name}" finish\
-				&&   rtl_get_var_unsafe \$_epur_force -u "${_epur_group_name}_FORCE"\
-				&&   [ "${_epur_force}" != 1 ];
-				then
-					rtl_lconcat "${_epur_rfinished}" "${_epur_pkg_name}";
-
-				elif [ "${_epur_test_finished:-1}" -eq 0 ]\
-				||   ! ex_pkg_state_test2 "${_epur_workdir}" "${_epur_pkg_name}" finish\
-				||   ( rtl_get_var_unsafe \$_epur_force -u "${_epur_group_name}_FORCE"\
-				&&   [ "${_epur_force}" = 1 ] );
-				then
-					rtl_lconcat \$_epur_pkg_names_new "${_epur_pkg_name}";
-				fi;
+				case "${_epur_recursefl}" in
+				recurse)	_epur_pkg_rdepends="${_epur_pkg_name} ${_epur_pkg_depends}"; ;;
+				norecurse)	_epur_pkg_rdepends="${_epur_pkg_name}"; ;;
+				esac;
+
+				for _epur_pkg_name_rdepend in ${_epur_pkg_rdepends}; do
+					if rtl_get_var_unsafe \$_epur_disabled -u "PKG_${_epur_pkg_name_rdepend}_DISABLED"\
+					&& [ "${_epur_disabled}" = 1 ];
+					then
+						rtl_lconcat "${_epur_rdisabled}" "${_epur_pkg_name_rdepend}";
+
+					elif [ "${_epur_test_finished}" -eq 1 ]\
+					&&   ex_pkg_state_test2 "${_epur_workdir}" "${_epur_pkg_name_rdepend}" finish\
+					&&   rtl_get_var_unsafe \$_epur_force -u "${_epur_group_name}_FORCE"\
+					&&   [ "${_epur_force}" != 1 ];
+					then
+						rtl_lconcat "${_epur_rfinished}" "${_epur_pkg_name_rdepend}";
+
+					elif [ "${_epur_test_finished:-1}" -eq 0 ]\
+					||   ! ex_pkg_state_test2 "${_epur_workdir}" "${_epur_pkg_name_rdepend}" finish\
+					||   ( rtl_get_var_unsafe \$_epur_force -u "${_epur_group_name}_FORCE"\
+					&&   [ "${_epur_force}" = 1 ] );
+					then
+						rtl_lconcat \$_epur_pkg_names_new "${_epur_pkg_name_rdepend}";
+					fi;
+				done;
 			fi;
 		done;
 	done;