--- trunk/mage/usr/lib/mage/smage2.sh	2011/05/27 12:54:34	1291
+++ trunk/mage/usr/lib/mage/smage2.sh	2011/12/28 10:51:52	1577
@@ -1,50 +1,19 @@
 #!/bin/bash
+# $Id$
 
 # compiles/installs .smage2 source install scripts
 # needs pkgbuild_dir (mage)
 
-# SMAGE2
-# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.62 2007-11-28 10:47:50 niro Exp $
+# TODO: record dynlib, gz | xz database
 
-#01.10.2004
-#	added ccache support
-#	added distcc support
 
 # set default user mage.rc
 : ${MAGERC="/etc/mage.rc"}
 
 ## setup ##
-PKGSUFFIX="mpk"
-SRCPKGSUFFIX="mpks"
 SMAGENAME="$1"
-SMAGESUFFIX="smage2"
-MLIBDIR=/usr/lib/mage
 SMAGEVERSION="$( < ${MLIBDIR}/version)"
 
-## only for tests -> normally in /etc/rc.d/init.d/functions
-COLRED="\033[1;6m\033[31m"
-COLGREEN="\033[1;6m\033[32m"
-COLYELLOW="\033[1;6m\033[33m"
-COLBLUE="\033[1;6m\033[34m"
-COLMAGENTA="\033[1;6m\033[35m"
-COLWHITE="\033[1;6m\033[37m"
-COLGRAY="\033[0;6m\033[37m"
-COLBOLD="\033[1m"
-COLDEFAULT="\033[0m"
-
-if [[ ${NOCOLORS} = true ]]
-then
-	COLRED=""
-	COLGREEN=""
-	COLYELLOW=""
-	COLBLUE=""
-	COLMAGENTA=""
-	COLWHITE=""
-	COLGRAY=""
-	COLBOLD=""
-	COLDEFAULT=""
-fi
-
 # export default C locale
 export LC_ALL=C
 
@@ -60,6 +29,33 @@
 	export BINDIR=${MROOT}/${BINDIR}
 fi
 
+# sources the smage file and uses state from distribution file if exist
+# may helpful for repository support later on
+smagesource()
+{
+	local file="$1"
+	local mystate
+	local mycodename
+
+	source ${file}
+
+	[[ -n ${STATE} ]] && mystate="${STATE}"
+
+	# do not overide if local state was broken or disabled!
+	case ${STATE} in
+		broken) return ;;
+		disabled) return ;;
+	esac
+
+	if [ -f ${SMAGESCRIPTSDIR}/distribution ]
+	then
+		source ${SMAGESCRIPTSDIR}/distribution
+		[[ -n ${STATE} ]] && mystate="${STATE}"
+	fi
+	# now switch state and export it
+	STATE="${mystate}"
+}
+
 showversion()
 {
 	echo -en "Magellan Source Install v${SMAGEVERSION} "
@@ -325,27 +321,31 @@
 	unset SRC_URI
 }
 
-# dummy function, used if that not exist in smage file
+# dummy function, used if that does not exist in smage file
 src_prepare()
 {
 	echo "no src_prepare defined"
-	sleep 2
 	return 0
 }
 
-# dummy function, used if that not exist in smage file
+# dummy function, used if that does not exist in smage file
 src_compile()
 {
 	echo "no src_compile defined"
-	sleep 2
 	return 0
 }
 
-# dummy function, used if that not exist in smage file
+# dummy function, used if that does not exist in smage file
+src_check()
+{
+	echo "no src_check defined"
+	return 0
+}
+
+# dummy function, used if that does not exist in smage file
 src_install()
 {
 	echo "no src_install defined"
-	sleep 2
 	return 0
 }
 
@@ -442,12 +442,27 @@
 				popd > /dev/null
 			fi
 			;;
+		xz)
+			IFTAR="$(basename $SRCFILE .xz)"
+			IFTAR="${IFTAR##*.}"
+			if [[ ${IFTAR} = tar ]]
+			then
+				tar --no-same-owner -xvJf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".tar.xz unpack failed."
+			else
+				pushd ${DEST} > /dev/null
+				xzcat ${SOURCEDIR}/${PNAME}/${SRCFILE} > ${DEST}/$(basename ${SRCFILE} .xz) || die ".xz unpack failed."
+				popd > /dev/null
+			fi
+			;;
 		tbz2|mpks|mpk)
 			tar --no-same-owner -xvjf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".tbz2 unpack failed."
 			;;
 		tgz)
 			tar --no-same-owner -xvzf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".tgz unpack failed."
 			;;
+		txz|mpkzs|mpkz)
+			tar --no-same-owner -xvJf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".txz unpack failed."
+			;;
 		rar)
 			unrar x ${SOURCEDIR}/${PNAME}/${SRCFILE} ${DEST}  || die ".rar unpack failed."
 			;;
@@ -501,7 +516,7 @@
 mlibtoolize()
 {
 	local opts="$@"
-	[[ -z ${opts} ]] && opts="--copy --force"
+	[[ -z ${opts} ]] && opts="--verbose --install --force"
 
 	libtoolize ${opts} || die "running: mlibtoolize ${opts}"
 }
@@ -541,7 +556,7 @@
 	local stripdir="$@"
 
 	[ -z "${stripdir}" ] && stripdir=${BINDIR}
-	find ${stripdir} | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+	find ${stripdir} | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip ${STRIP_DYN_LIB} 2> /dev/null
 }
 
 mstripbins()
@@ -549,7 +564,15 @@
 	local stripdir="$@"
 
 	[ -z "${stripdir}" ] && stripdir=${BINDIR}
-	find ${stripdir} | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+	find ${stripdir} | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip ${STRIP_DYN_BIN} 2> /dev/null
+}
+
+mstripstatic()
+{
+	local stripdir="$@"
+
+	[ -z "${stripdir}" ] && stripdir=${BINDIR}
+	find ${stripdir} | xargs file | grep "ar archive" | cut -f 1 -d : | xargs strip ${STRIP_STATIC_LIB} 2> /dev/null
 }
 
 mcompressdocs()
@@ -724,30 +747,22 @@
 	# now build the mage file
 	> ${dest}
 
-	# header
-	echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.62 2007-11-28 10:47:50 niro Exp $' >> ${dest}
-	echo  >> ${dest}
-
 	# pgkname and state
 	echo "PKGNAME=\"${PNAME}${target}-${PVER}-\${ARCH}-${PBUILD}\"" >> ${dest}
 	echo "STATE=\"${STATE}\"" >> ${dest}
-	echo >> ${dest}
 
 	# description and homepage
 	echo "DESCRIPTION=\"${DESCRIPTION}\"" >> ${dest}
 	echo "HOMEPAGE=\"${HOMEPAGE}\"" >> ${dest}
-	echo >> ${dest}
 
 	# special tags and vars
 	echo "PKGTYPE=\"${PKGTYPE}\""  >> ${dest}
 
 	# echo MAGE_TARGETS ## note -target is needed !
 	echo "MAGE_TARGETS=\"${target}\"" >> ${dest}
-	echo >> ${dest}
 
 	# split package base
 	echo "SPLIT_PACKAGE_BASE=\"${split_pkg_base}\"" >> ${dest}
-	echo >> ${dest}
 
 	# add special vars
 	if [ -n "${SPECIAL_VARS}" ]
@@ -758,7 +773,6 @@
 			# being tricky here :)
 			echo "${i}=\"$(eval echo \$${i})\"" >> ${dest}
 		done
-		echo  >> ${dest}
 	fi
 
 	# add at least all includes
@@ -770,17 +784,14 @@
 		do
 			echo -n " ${i}"  >> ${dest}
 		done
-		echo  >> ${dest}
+		# a CRLF is needed here!
+		echo >> ${dest}
 	fi
-	echo >> ${dest}
 
 	# deps and provides
 	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}
 
 	# add special functions
 	if [ -n "${SPECIAL_FUNCTIONS}" ]
@@ -790,27 +801,21 @@
 		do
 			# add to mage (quotes needed !)
 			typeset -f "${i}" >> ${dest}
-			echo >> ${dest}
 			# unset to be safe (quotes needed !)
 			#unset "${i}" <-- later to get every target built
 		done
-		echo  >> ${dest}
 	fi
 
 	# pre|post-install|removes
 	typeset -f preinstall >> ${dest}
-	echo  >> ${dest}
 	typeset -f postinstall >> ${dest}
-	echo  >> ${dest}
 	typeset -f preremove >> ${dest}
-	echo  >> ${dest}
 	typeset -f postremove >> ${dest}
-	echo  >> ${dest}
 }
 
 regen_mage_tree()
 {
-	local i
+	local subpackage
 
 	# build them only if requested
 	if [[ ${REGEN_MAGE_TREE} = true ]]
@@ -821,9 +826,9 @@
 			# build for each target a mage file
 			# run it with several targets
 			echo
-			for i in ${MAGE_TARGETS}
+			for subpackage in ${MAGE_TARGETS}
 			do
-				build_mage_script --target "${i}"
+				build_mage_script --target "${subpackage}"
 			done
 			echo
 
@@ -836,12 +841,16 @@
 			# build for each subpackage a mage file
 			# run it with several targets
 			echo
-			for i in ${SPLIT_PACKAGES}
+			for subpackage in ${SPLIT_PACKAGES}
 			do
 				# get the right variables for the split
-				export PNAME="${i}"
-				split_info_${i}
+				export PNAME="${subpackage}"
+				split_info_${subpackage}
+				# get the preinstall etc
+				split_export_inherits ${subpackage}
 				build_mage_script --split-pkg-base "${split_pkg_base}"
+				# delete split preinstall etc
+				split_delete_inherits ${subpackage}
 				# restore smage environment
 				split_restore_variables
 			done
@@ -1027,6 +1036,37 @@
 	unset -f SAVED_postremove
 }
 
+split_export_inherits()
+{
+	local subpackage="$1"
+	local func
+	local newfunc
+
+	for func in preinstall postinstall preremove postremove
+	do
+		if [[ ! -z $(typeset -f ${func}_${subpackage}) ]]
+		then
+			newfunc=$(typeset -f ${func}_${subpackage})
+			newfunc="${newfunc/_${subpackage} (/ (}"
+			eval "${newfunc}"
+		fi
+	done
+}
+
+split_delete_inherits()
+{
+	 local subpackage="$1"
+	 local func
+
+	for func in preinstall postinstall preremove postremove
+	do
+		if [[ ! -z $(typeset -f ${func}_${subpackage}) ]]
+		then
+			unset -f ${func}
+		fi
+	done
+ }
+
 export_inherits()
 {
 	local include="$1"
@@ -1188,7 +1228,7 @@
 		MD5DIR="$3"
 		[[ -z ${MD5DIR} ]] && MD5DIR="$(dirname ${SMAGENAME})/md5"
 
-		source ${SMAGENAME} || die "download source failed"
+		smagesource ${SMAGENAME} || die "download source failed"
 
 		# overridable sourcedir; must be declared after source of the smage2
 		CALC_SOURCEDIR="${CALC_SOURCEDIR:="${SOURCEDIR}/${PNAME}"}"
@@ -1262,7 +1302,7 @@
 	# get smage
 	SMAGENAME="$2"
 	MD5DIR="$(dirname ${SMAGENAME})/md5"
-	source ${SMAGENAME} || die "download source failed"
+	smagesource ${SMAGENAME} || die "download source failed"
 
 	download_sources
 	exit 0
@@ -1274,7 +1314,7 @@
 	# set correct SMAGENAME
 	SMAGENAME="$2"
 	MD5DIR="$(dirname ${SMAGENAME})/md5"
-	source ${SMAGENAME} || die "regen: smage2 not found"
+	smagesource ${SMAGENAME} || die "regen: smage2 not found"
 
 	regen_mage_tree
 
@@ -1336,7 +1376,7 @@
 
 	echo -e "${COLGREEN}create-src-tarball called for ${COLBLUE}${SMAGENAME}${COLGREEN} ...${COLDEFAULT}"
 
-	source ${SMAGENAME} || die "regen: smage2 not found"
+	smagesource ${SMAGENAME} || die "regen: smage2 not found"
 
 	if [[ -d ${SOURCEDIR}/${PNAME} ]]
 	then
@@ -1385,7 +1425,7 @@
 [ -z "${CFLAGS}" ] && die "no CFLAGS variable found in ${MAGERC}"
 [ -z "${CXXFLAGS}" ] && die "no CXXFLAGS variable found in ${MAGERC}"
 
-source ${SMAGENAME} || die "source failed"
+smagesource ${SMAGENAME} || die "source failed"
 PKGNAME="${PNAME}-${PVER}-${ARCH}-${PBUILD}"
 MD5DIR="$(dirname ${SMAGENAME})/md5"
 SMAGE_LOG_CMD="tee -a /var/log/smage/${PKGNAME}.log"
@@ -1411,6 +1451,7 @@
 # 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_check || die "src_check export failed"
 export -f src_install || die "src_install export failed"
 
 # fixes some compile issues
@@ -1428,23 +1469,20 @@
 # setup ccache
 [[ ${SMAGE_USE_CCACHE} = true ]] && setup_ccache_environment
 
-# small sleep to show our settings
-sleep 1
-
-# cleans up build if a previously one exists
+# clean up builddir if a previously one exist
 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
+# clean up srcdir if a previously unpacked one exist
 if [ -d ${SRCDIR} ]
 then
 	rm -rf ${SRCDIR}
 fi
 
-# cleans up bindir if a previous build exists or creates a new one
+# clean up bindir if a previous build exist or create a new one
 if [ -d ${BINDIR} ]
 then
 	rm -rf ${BINDIR}
@@ -1457,13 +1495,7 @@
 	rm -rf ${BUILDDIR}/${PKGNAME}
 fi
 
-# cleans up timestamp if one exists
-if [ -f /var/tmp/timestamp ]
-then
-	mage rmstamp
-fi
-
-# setup build loggins
+# setup build logging
 [[ ! -d /var/log/smage ]] && install -d /var/log/smage
 echo -e "### Build started on $(date) ###\n" > /var/log/smage/${PKGNAME}.log
 
@@ -1475,6 +1507,17 @@
 die_pipestatus 0 "src_compile failed"
 step_by_step $_
 
+# only run checks if requested
+if [[ ${MAGE_CHECK} != true ]]
+then
+	echo "MAGE_CHECK not requested; src_check() will not be run!" | ${SMAGE_LOG_CMD}
+	step_by_step src_check
+else
+	src_check | ${SMAGE_LOG_CMD}
+	die_pipestatus 0 "src_check failed"
+	step_by_step $_
+fi
+
 # build several subpackages
 if [[ -n ${SPLIT_PACKAGES} ]]
 then
@@ -1536,14 +1579,18 @@
 			do
 				echo -e "${COLBLUE}===${COLGREEN} stripping binaries for '${subpackage}' ...${COLDEFAULT}"
 				mstripbins ${BINDIR}_${subpackage}
-				echo -e "${COLBLUE}===${COLGREEN} stripping libraries for '${subpackage}' ...${COLDEFAULT}"
+				echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries for '${subpackage}' ...${COLDEFAULT}"
 				mstriplibs ${BINDIR}_${subpackage}
+				echo -e "${COLBLUE}===${COLGREEN} stripping static libraries for '${subpackage}' ...${COLDEFAULT}"
+				mstripstatic ${BINDIR}_${subpackage}
 			done
 		else
 				echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}"
 				mstripbins ${BINDIR}
-				echo -e "${COLBLUE}===${COLGREEN} stripping libraries ...${COLDEFAULT}"
+				echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries ...${COLDEFAULT}"
 				mstriplibs ${BINDIR}
+				echo -e "${COLBLUE}===${COLGREEN} stripping static libraries ...${COLDEFAULT}"
+				mstripstatic ${BINDIR}
 		fi
 		;;
 esac
@@ -1559,7 +1606,7 @@
 		then
 			for target in ${MAGE_TARGETS}
 			do
-				# check if an special target_pkgbuild exists
+				# check if a special target_pkgbuild exists
 				if typeset -f ${target}_pkgbuild > /dev/null
 				then
 					# run it