--- trunk/mage/usr/lib/mage/smage2.sh	2005/08/19 02:24:12	191
+++ trunk/mage/usr/lib/mage/smage2.sh	2005/10/03 21:02:31	256
@@ -4,7 +4,7 @@
 # needs pkgbuild_dir (mage)
 
 # SMAGE2
-# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.22 2005-08-19 02:24:12 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.39 2005-10-03 21:02:31 niro Exp $
 
 #01.10.2004
 #	added ccache support
@@ -230,11 +230,6 @@
 	return 0
 }
 
-
-build_mage_script() {
-	return 0
-}
-
 mconfigure() {
 	if [ -x ./configure ]
 	then
@@ -411,7 +406,60 @@
 	fi
 }
 
-# alx_create_mage_file: helper functions for regen_mage_tree()
+
+# fixes given dependencies to match a MAGE_TARGET
+# fix_mage_deps -target s/depend # <-- note -target !
+fix_mage_deps() {
+	local target="$1"
+	local depend="$2"
+	local NDEPEND
+	local sym dep cat pver pname
+
+	# deps and provides are special
+	# they must be fixed to match the target
+
+	# run this only if target and depend is not empty
+	if [ -n "${target}" ] && [ -n "${depend}" ]
+	then
+		# fix DEPEND
+		while read sym dep
+		do
+			cat="$(dirname ${dep})"
+			# change if not virtual
+			if [[ ${cat} = virtual ]]
+			then
+				pname="$(basename ${dep})"
+			else
+				# fix pver to target-pver
+				# to get pname-target-pver
+
+				# doing it backwards !
+				pver="${dep##*-}"
+				# full pver
+				pname="$(basename ${dep/-${pver}/})${target}-${pver}"
+			fi
+
+			# do not add empty lines
+			if [ -z "${NDEPEND}" ]
+			then
+				NDEPEND="${sym} ${cat}/${pname}"
+			else
+				NDEPEND="${NDEPEND}
+	${sym} ${cat}/${pname}"
+			fi
+
+			unset cat pname pver
+		done << EOF
+${depend}
+EOF
+		# set NDEPEND to DEPEND
+		depend="${NDEPEND}"
+	fi
+
+	echo "${depend}"
+}
+
+# build_mage_script(): helper functions for regen_mage_tree()
 # generates an mage file with given information in smage file
 # needs at least:
 #   PNAME                 name of pkg
@@ -433,11 +481,13 @@
 #
 #   MAGE_TREE_DEST        target destination of the generated tree
 #   REGEN_MAGE_TREE       set to 'true' to enable this
-alx_create_mage_file()
+#
+# gets called with build_mage_script target
+build_mage_script()
 {
 	local magefile
 	local dest
-	local suffix
+	local target
 	local sym
 	local depname
 
@@ -445,13 +495,13 @@
 	: ${MAGE_TREE_DEST=${BUILDDIR}/mage-tree}
 
 	# determinate which suffix this mage file should get, if any
-	suffix="$1"
+	[ -n "$1" ] && target="-$1"
 
 	# name of magefile
-	magefile="${PNAME}${suffix}-${PVER}-${PBUILD}.mage"
+	magefile="${PNAME}${target}-${PVER}-${PBUILD}.mage"
 
 	# destination to magefile
-	dest="${MAGE_TREE_DEST}/${PCATEGORIE}/${PNAME}${suffix}/${magefile}"
+	dest="${MAGE_TREE_DEST}/${PCATEGORIE}/${PNAME}${target}/${magefile}"
 
 	# show what we are doing
 	echo "Generating Mage file:"
@@ -462,11 +512,11 @@
 	> ${dest}
 
 	# header
-	echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.22 2005-08-19 02:24:12 niro Exp $' >> ${dest}
+	echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.39 2005-10-03 21:02:31 niro Exp $' >> ${dest}
 	echo  >> ${dest}
 
 	# pgkname and state
-	echo "PKGNAME=\"${PNAME}${suffix}-${PVER}-\${ARCH}-${PBUILD}\"" >> ${dest}
+	echo "PKGNAME=\"${PNAME}${target}-${PVER}-\${ARCH}-${PBUILD}\"" >> ${dest}
 	echo "STATE=\"${STATE}\"" >> ${dest}
 	echo >> ${dest}
 
@@ -475,8 +525,26 @@
 	echo "HOMEPAGE=\"${HOMEPAGE}\"" >> ${dest}
 	echo >> ${dest}
 
-	# special tags
+	# special tags and vars
 	echo "PKGTYPE=\"${PKGTYPE}\""  >> ${dest}
+
+	# echo MAGE_TARGETS ## note -target is needed !
+	echo "MAGE_TARGETS=\"${target}\"" >> ${dest}
+	echo >> ${dest}
+
+	# add special vars
+	if [ -n "${SPECIAL_VARS}" ]
+	then
+		local i
+		for i in ${SPECIAL_VARS}
+		do
+			# being tricky here :)
+			echo "${i}=\"$(eval echo \$${i})\"" >> ${dest}
+		done
+		echo  >> ${dest}
+	fi
+
+	# add at least all includes
 	if [ -n "${INHERITS}" ]
 	then
 		echo -n "minclude"  >> ${dest}
@@ -490,8 +558,10 @@
 	echo >> ${dest}
 
 	# deps and provides
-	echo "DEPEND=\"${DEPEND}\"" >> ${dest}
-	echo "SDEPEND=\"${SDEPEND}\"" >> ${dest}
+	echo "DEPEND=\"$(fix_mage_deps "${target}" "${DEPEND}")\"" >> ${dest}
+	echo >> ${dest}
+	echo "SDEPEND=\"$(fix_mage_deps "${target}" "${SDEPEND}")\"" >> ${dest}
+	echo >> ${dest}
 	echo "PROVIDE=\"${PROVIDE}\"" >> ${dest}
 	echo >> ${dest}
 
@@ -503,9 +573,11 @@
 		do
 			# add to mage (quotes needed !)
 			typeset -f "${i}" >> ${dest}
+			echo >> ${dest}
 			# unset to be safe (quotes needed !)
-			unset "${i}"
+			#unset "${i}" <-- later to get every target built
 		done
+		echo  >> ${dest}
 	fi
 
 	# pre|post-install|removes
@@ -526,17 +598,38 @@
 	# build them only if requested
 	if [[ ${REGEN_MAGE_TREE} = true ]]
 	then
-		# build for each target an mage file
-		for i in ${MAGE_TARGETS}
-		do
+		# run it without targets
+		if [ -z "${MAGE_TARGETS}" ]
+		then
 			echo
-			alx_create_mage_file "${i}"
+			build_mage_script
 			echo
-		done
+		else
+
+			# build for each target an mage file
+			# run it with several targets
+			for i in ${MAGE_TARGETS}
+			do
+				echo
+				build_mage_script "${i}"
+				echo
+			done
+		fi
 	fi
 
 	# now unset all uneeded vars to be safe
-	unset PKGNAME
+	# unset PKGNAME <-- don't do that; smage needs this var
+	# unset to be safe (quotes needed !)
+	for i in ${SPECIAL_FUNCTIONS}
+	do
+		unset "${i}"
+	done
+	unset SPECIAL_FUNCTIONS
+	for i in ${SPECIAL_VARS}
+	do
+		unset "${i}"
+	done
+	unset SPECIAL_VARS
 	unset STATE
 	unset DESCRIPTION
 	unset HOMEPAGE
@@ -545,13 +638,102 @@
 	unset DEPEND
 	unset SDEPEND
 	unset PROVIDE
-	unset SPECIAL_FUNCTIONS
 	unset preinstall
 	unset postinstall
 	unset preremove
 	unset postremove
 }
 
+export_inherits()
+{
+	local include="$1"
+	shift
+
+	while [ "$1" ]
+	do
+		local functions="$1"
+
+		# sanity checks
+		[ -z "${include}" ] && die "export_inherits(): \$include not given."
+		[ -z "${functions}" ] && die "export_inherits(): \$functions not given."
+
+		eval "${functions}() { ${include}_${functions} ; }"
+
+		# debug
+		[[ ${MAGEDEBUG} = on ]] && typeset -f "${functions}"
+
+		shift
+	done
+}
+
+generate_package_md5sum()
+{
+	local dest
+	local pcat
+	local pname
+	local pver
+	local pbuild
+	local parch
+	local target
+	local pkgname
+
+	# very basic getops
+	for i in $*
+	do
+		case $1 in
+			--pcat|-c) shift; pcat="$1" ;;
+			--pname|-n) shift; pname="$1" ;;
+			--pver|-v) shift; pver="$1" ;;
+			--pbuild|-b) shift; pbuild="$1" ;;
+			--parch|a) shift; parch="$1" ;;
+			--target|t) shift; target="$1" ;;
+		esac
+		shift
+	done
+
+	# sanity checks; abort if not given
+	[ -z "${pcat}" ] && die "generate_package_md5sum() \$pcat not given."
+	[ -z "${pname}" ] && die "generate_package_md5sum() \$pname not given."
+	[ -z "${pver}" ] && die "generate_package_md5sum() \$pver not given."
+	[ -z "${pbuild}" ] && die "generate_package_md5sum() \$pbuild not given."
+	[ -z "${parch}" ] && die "generate_package_md5sum() \$parch not given."
+
+	# check needed global vars
+	[ -z "${PKGDIR}" ] && die "generate_package_md5sum() \$PKGDIR not set."
+	[ -z "${PKGSUFFIX}" ] && die "generate_package_md5sum() \$PKGSUFFIX not set."
+
+	# fix target as it may be empty !
+	[ -n "${target}" ] && target="-${target}"
+
+	# build pkgname
+	pkgname="${pname}${target}-${pver}-${parch}-${pbuild}"
+
+	# build pkg-md5-sum only if requested
+	if [[ ${REGEN_MAGE_TREE} = true ]]
+	then
+		echo -n "Generating a md5sum for ${pkgname}.${PKGSUFFIX} ... "
+
+		# abort if not exist
+		if [ ! -f ${PKGDIR}/${pkgname}.${PKGSUFFIX} ]
+		then
+			echo "! exists"
+			return 0
+		fi
+
+		# if MAGE_TREE_DEST not set use BUILDDIR
+		: ${MAGE_TREE_DEST=${BUILDDIR}/mage-tree}
+
+		# setup md5 dir
+		dest="${MAGE_TREE_DEST}/${pcat}/${pname}/md5"
+		install -d ${dest}
+
+		# gen md5sum
+		( cd ${PKGDIR}; md5sum "${pkgname}.${PKGSUFFIX}" ) \
+			> ${dest}/${pkgname}.md5
+		echo "done"
+	fi
+}
+
 # print out our version
 showversion
 echo
@@ -563,7 +745,7 @@
 	exit 1
 fi
 
-#updating smage2-scripts
+# updating smage2-scripts
 if [ "$1" == "update" ]
 then
 	if [ ! -d ${SOURCEDIR} ]
@@ -574,7 +756,7 @@
 	exit 0
 fi
 
-#creates md5sums for smages to given dir
+# creates md5sums for smages to given dir
 if [ "$1" == "calcmd5" ]
 then
 	if [ $# -ge 3 ]
@@ -644,7 +826,7 @@
 	exit 0
 fi
 
-#download sources
+# download sources
 if [ "$1" == "download" -a -n "$2" ]
 then
 	if [ ! -d ${SMAGESCRIPTSDIR} ]
@@ -661,6 +843,28 @@
 	exit 0
 fi
 
+# regen-mage-tree
+if [ "$1" == "only-regen-tree" -a -n "$2" ]
+then
+	# set correct SMAGENAME
+	SMAGENAME="$2"
+	MD5DIR="$(dirname ${SMAGENAME})/md5"
+	source ${SMAGENAME} || die "regen: smage2 not found"
+
+	regen_mage_tree
+
+	# build md5sum for existing packages
+	generate_package_md5sum \
+		--pcat "${PCATEGORIE}" \
+		--pname "${PNAME}" \
+		--pver "${PVER}" \
+		--pbuild "${PBUILD}" \
+		--parch "${ARCH}" \
+		--target "${target}"
+
+	exit 0
+fi
+
 if [ ! -e ${MLIBDIR}/pkgbuild_dir.sh ]
 then
 	die "Error: ${MLIBDIR}/pkgbuild_dir.sh not found. Aborting."
@@ -709,7 +913,7 @@
 
 
 source ${SMAGENAME} || die "source failed"
-PKGNAME="${PNAME}-${PVER}-${CHOST%%-*}-${PBUILD}"
+PKGNAME="${PNAME}-${PVER}-${ARCH}-${PBUILD}"
 MD5DIR="$(dirname ${SMAGENAME})/md5"
 
 xtitle "Compiling ${PKGNAME}"
@@ -718,15 +922,15 @@
 # auto regen mage tree if requested
 regen_mage_tree
 
-#download sources
+# download sources
 download_sources
 
-#fixes some issues with these functions
+# fixes some issues with these functions
 export -f src_prepare || die "src_prepare export failed"
 export -f src_compile || die "src_compile export failed"
 export -f src_install || die "src_install export failed"
 
-#fixes some compile issues
+# fixes some compile issues
 export CHOST="${CHOST}" || die "CHOST export failed"
 export CFLAGS="${CFLAGS}" || die "CFLAGS export failed"
 export CXXFLAGS="${CFLAGS}" || die "CXXFLAGS export failed"
@@ -734,14 +938,14 @@
 export MAKEOPTS="${MAKEOPTS}" || die "MAKEOPTS export failed"
 
 
-#setup distcc
-#distcc mus be setup *before* ccache, as ccache need to be before distcc in path
+# setup distcc
+# distcc mus be setup *before* ccache, as ccache need to be before distcc in path
 if [ "${SMAGE_USE_DISTCC}" == "true" ]
 then
 	setup_distcc_environment
 fi
 
-#setup ccache
+# setup ccache
 if [ "${SMAGE_USE_CCACHE}" == "true" ]
 then
 	setup_ccache_environment
@@ -762,33 +966,33 @@
 #read
 #debug end
 
-#cleans up build if a previously one exists
+# cleans up build if a previously one exists
 if [ -d ${BUILDDIR} ]
 then
 	rm -rf ${BUILDDIR}/* || die "couldn't cleanup \$BUILDDIR."
 fi
 install -d ${BUILDDIR} || die "couldn't create \$BUILDDIR."
 
-#cleans up srcdir if a previously unpacked one exists
+# cleans up srcdir if a previously unpacked one exists
 if [ -d ${SRCDIR} ]
 then
 	rm -rf ${SRCDIR}
 fi
 
-#cleans up bindir if a previous build exists or creates a new one
+# cleans up bindir if a previous build exists or creates a new one
 if [ -d ${BINDIR} ]
 then
 	rm -rf ${BINDIR}
 fi
 install -d ${BINDIR} || die "couldn't create \$BINDIR."
 
-#cleans up package temp dir if a previous build exists
+# cleans up package temp dir if a previous build exists
 if [ -d ${BUILDDIR}/${PKGNAME} ]
 then
 	rm -rf ${BUILDDIR}/${PKGNAME}
 fi
 
-#cleans up timestamp if one exists
+# cleans up timestamp if one exists
 if [ -f /var/tmp/timestamp ]
 then
 	mage rmstamp
@@ -799,7 +1003,7 @@
 src_install || die "src_install failed"
 
 
-#compressing doc, info & man files
+# compressing doc, info & man files
 echo -e "Compressing man-pages ..."
 if [ -d ${BUILDDIR}/builded/usr/share/man ]
 then
@@ -825,18 +1029,56 @@
 		;;
 esac
 
-#the new buildpkg command
+# the new buildpkg command
 case ${NOPKGBUILD} in
 	true|TRUE|yes|y)
 		echo -e "NOPGKBUILD=true detected; Package will not be build ..."
 		;;
-	*) 
-		${MLIBDIR}/pkgbuild_dir.sh ${PKGNAME} ${BINDIR} || die "package-build failed"
-		echo -e "\nPackage ${PKGNAME} successfully builded.\n"
+	*)
+		# build serveral targets
+		if [ -n "${MAGE_TARGETS}" ]
+		then
+			for target in ${MAGE_TARGETS}
+			do
+				# check if an special target_pkgbuild exists
+				if typeset -f ${target}_pkgbuild > /dev/null
+				then
+					# run it
+					${target}_pkgbuild
+				fi
+				# now create the target package
+				${MLIBDIR}/pkgbuild_dir.sh \
+					"${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD}" \
+					${BINDIR} || die "target: ${target} package-build failed"
+
+				# build pkg-md5-sum if requested
+				generate_package_md5sum \
+					--pcat "${PCATEGORIE}" \
+					--pname "${PNAME}" \
+					--pver "${PVER}" \
+					--pbuild "${PBUILD}" \
+					--parch "${ARCH}" \
+					--target "${target}"
+
+				echo -e "\nPackage ${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n"
+			done
+		else
+			${MLIBDIR}/pkgbuild_dir.sh ${PKGNAME} ${BINDIR} || die "package-build failed"
+
+			# build pkg-md5-sum if requested
+			generate_package_md5sum \
+				--pcat "${PCATEGORIE}" \
+				--pname "${PNAME}" \
+				--pver "${PVER}" \
+				--pbuild "${PBUILD}" \
+				--parch "${ARCH}"
+
+			echo -e "\nPackage ${PKGNAME} successfully builded.\n"
+		fi
 		;;
 esac
 
-#for sure
+# for sure
 unset NOPKGBUILD
 unset NOSTRIP