/[magellan-source]/trunk/mage/usr/lib/mage/smage2.sh

Diff of /trunk/mage/usr/lib/mage/smage2.sh

Parent Directory | Revision Log | View Patch Patch

-revision 891 by niro,
Tue Aug  4 19:51:42 2009 UTC
+revision 1435 by niro,
Mon Jul 25 11:01:48 2011 UTC
 Line 20 
 SMAGENAME="$1"
  SMAGESUFFIX="smage2"
  MLIBDIR=/usr/lib/mage
  SMAGEVERSION="$( < ${MLIBDIR}/version)"
- SMAGE_LOG_CMD="tee -a /var/log/smage/${PKGNAME}.log"
  ## only for tests -> normally in /etc/rc.d/init.d/functions
  COLRED="\033[1;6m\033[31m"
-Line 52 
 export LC_ALL=C
+Line 50 
 export LC_ALL=C
  source /etc/mage.rc.global
  source ${MAGERC}
+ source ${MLIBDIR}/mage4.functions.sh
  # set PKGDIR and BUILDDIR and BINDIR to MROOT
  if [[ -n ${MROOT} ]]
-Line 61 
 then
+Line 60 
 then
  	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} "
-Line 75 
 die()
+Line 101 
 die()
  	exit 1
  }
+ die_pipestatus()
+ {
+ 	# the status change if we do any parameter declarations!!
+ 	# dont do this anymore, keep this in mind!
+ 	#
+ 	# local pos="$1"
+ 	# local comment="$2"
+ 	#
+ 	# [ ${PIPESTATUS[${pos}]} -ne 0 ] && die "${comment}"
+ 	#
+ 	[ ${PIPESTATUS[$1]} -ne 0 ] && die "$2"
+ }
  xtitle()
  {
  	if [[ ${TERM} = xterm ]]
-Line 142 
 download_sources()
+Line 181 
 download_sources()
  	local DB_MD5_SUM_FILE="${MD5DIR}/$(basename ${SMAGENAME} .${SMAGESUFFIX}).md5"
  	local FETCHING
  	local i mirror
+ 	local wget_opts
+ 	# filter wget command if busybox was found
+ 	wget_opts="$(busybox_filter_wget_options ${WGET_FETCH_OPTIONS})"
  	# install SRCDIR/PNAME if not exist
  	[ ! -d ${SOURCEDIR}/${PNAME} ] && install -d ${SOURCEDIR}/${PNAME}
  	# check if FETCHING is needed
- 	( cd ${SOURCEDIR}/${PNAME}; md5sum --check ${DB_MD5_SUM_FILE} &> /dev/null )
+ 	( cd ${SOURCEDIR}/${PNAME}; md5sum -c ${DB_MD5_SUM_FILE} &> /dev/null )
  	if [[ $? = 0 ]]
  	then
  		# md5's ok, no fetching needed
-Line 187 
 download_sources()
+Line 229 
 download_sources()
  				then
  					echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"
  					wget \
- 						--passive-ftp \
+ 						${wget_opts} \
- 						--tries 3 \
- 						--continue \
- 						--progress bar \
  						--output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI_MIRROR})" \
  						"${my_SRC_URI_MIRROR}"
  					if [[ $? = 0 ]]
-Line 211 
 download_sources()
+Line 250 
 download_sources()
  				then
  					echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"
  					wget \
- 						--passive-ftp \
+ 						${wget_opts} \
- 						--tries 3 \
- 						--continue \
- 						--progress bar \
  						--output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI_MIRROR})" \
  						"${my_SRC_URI_MIRROR}"
  					if [[ $? = 0 ]]
-Line 235 
 download_sources()
+Line 271 
 download_sources()
  				then
  					echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"
  					wget \
- 						--passive-ftp \
+ 						${wget_opts} \
- 						--tries 3 \
- 						--continue \
- 						--progress bar \
  						--output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI_MIRROR})" \
  						"${my_SRC_URI_MIRROR}"
  					if [[ $? = 0 ]]
-Line 259 
 download_sources()
+Line 292 
 download_sources()
  				then
  					echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"
  					wget \
- 						--passive-ftp \
+ 						${wget_opts} \
- 						--tries 3 \
- 						--continue \
- 						--progress bar \
  						--output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI_MIRROR})" \
  						"${my_SRC_URI_MIRROR}"
  					if [[ $? = 0 ]]
-Line 283 
 download_sources()
+Line 313 
 download_sources()
  				then
  					echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"
  					wget \
- 						--passive-ftp \
+ 						${wget_opts} \
- 						--tries 3 \
- 						--continue \
- 						--progress bar \
  						--output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI_MIRROR})" \
  						"${my_SRC_URI_MIRROR}"
  					if [[ $? = 0 ]]
-Line 302 
 download_sources()
+Line 329 
 download_sources()
  			then
  				echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI}${COLDEFAULT}"
  				wget \
- 					--passive-ftp \
+ 					${wget_opts} \
- 					--tries 3 \
- 					--continue \
- 					--progress bar \
  					--output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI})" \
  					"${my_SRC_URI}"
  			fi
-Line 321 
 download_sources()
+Line 345 
 download_sources()
  	# recheck md5 sums
  	echo
  	echo -e "${COLBLUE}===${COLGREEN} Checking MD5 sums:${COLDEFAULT}"
- 	( cd ${SOURCEDIR}/${PNAME}; md5sum --check ${DB_MD5_SUM_FILE} ) || die "md5 failed"
+ 	( cd ${SOURCEDIR}/${PNAME}; md5sum -c ${DB_MD5_SUM_FILE} ) || die "md5 failed"
  	echo
  	# not needed anymore
-Line 445 
 munpack()
+Line 469 
 munpack()
  				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."
  			;;
-Line 504 
 mpatch()
+Line 543 
 mpatch()
  mlibtoolize()
  {
  	local opts="$@"
- 	[[ -z ${opts} ]] && opts="--copy --force"
+ 	[[ -z ${opts} ]] && opts="--verbose --install --force"
  	libtoolize ${opts} || die "running: mlibtoolize ${opts}"
  }
+ mautoreconf()
+ {
+ 	local opts="$@"
+ 	[[ -z ${opts} ]] && opts="--verbose --install --force"
+ 	autoreconf ${opts} || die "running: mautoreconf ${opts}"
+ }
  minstalldocs()
  {
  	local docfiles
-Line 519 
 minstalldocs()
+Line 566 
 minstalldocs()
  		install -d ${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "creating doc dirs."
  	fi
+ 	local i
  	for i in ${docfiles}
  	do
- 		cat ${i} | gzip -9c > ${i}.gz || die "gzipping docs."
+ 		if [ -f ${i} ]
- 		install -m 0644 ${SRCDIR}/${i}.gz \
+ 		then
- 			${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "coping docs."
+ 			cat ${i} | gzip -9c > ${i}.gz || die "gzipping docs."
+ 			install -m 0644 ${SRCDIR}/${i}.gz \
+ 				${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "coping docs."
+ 		fi
  	done
  }
-Line 543 
 mstripbins()
+Line 594 
 mstripbins()
  	find ${stripdir} | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
  }
+ mcompressdocs()
+ {
+ 	local bindir="$@"
+ 	if [ -d ${bindir}/usr/share/man ]
+ 	then
+ 		echo -e "${COLBLUE}===${COLGREEN} compressing man-pages ...${COLDEFAULT}"
+ 		${MLIBDIR}/compressdoc -g -9 ${bindir}/usr/share/man
+ 	fi
+ 	if [ -d ${bindir}/usr/share/info ]
+ 	then
+ 		echo -e "${COLBLUE}===${COLGREEN} compressing info-pages ...${COLDEFAULT}"
+ 		${MLIBDIR}/compressdoc -g -9 ${bindir}/usr/share/info
+ 	fi
+ }
  sminclude()
  {
  	local i
-Line 658 
 EOF
+Line 726 
 EOF
  #   INHERITS              which functions get included
  #   SPECIAL_FUNCTIONS     special functions which should also be added
  #                         warning: they get killed before the build starts !
+ #   SPLIT_PACKAGES        names of all subpackages which are splitted from parent
+ #   SPLIT_PACKAGE_BASE    base package name for splitpackages
+ #                         (only in the resulting magefile}
  #
  #   MAGE_TREE_DEST        target destination of the generated tree
  #   REGEN_MAGE_TREE       set to 'true' to enable this
-Line 668 
 build_mage_script()
+Line 739 
 build_mage_script()
  	local magefile
  	local dest
  	local target
+ 	local split_pkg_base
  	local sym
  	local depname
-Line 675 
 build_mage_script()
+Line 747 
 build_mage_script()
  	: ${MAGE_TREE_DEST=${BUILDDIR}/mage-tree}
  	# determinate which suffix this mage file should get, if any
- 	[ -n "$1" ] && target="-$1"
+ 	[[ $1 = --target ]] && shift && target="-$1"
+ 	# mark package as splitpackage
+ 	[[ $1 = --split-pkg-base ]] && shift && split_pkg_base="$1"
  	# name of magefile
  	magefile="${PNAME}${target}-${PVER}-${PBUILD}.mage"
-Line 691 
 build_mage_script()
+Line 766 
 build_mage_script()
  	# 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}
  	# add special vars
  	if [ -n "${SPECIAL_VARS}" ]
-Line 721 
 build_mage_script()
+Line 792 
 build_mage_script()
  			# being tricky here :)
  			echo "${i}=\"$(eval echo \$${i})\"" >> ${dest}
  		done
- 		echo  >> ${dest}
  	fi
  	# add at least all includes
-Line 733 
 build_mage_script()
+Line 803 
 build_mage_script()
  		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}" ]
-Line 753 
 build_mage_script()
+Line 820 
 build_mage_script()
  		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()
-Line 779 
 regen_mage_tree()
+Line 840 
 regen_mage_tree()
  	if [[ ${REGEN_MAGE_TREE} = true ]]
  	then
  		# run it without targets
- 		if [ -z "${MAGE_TARGETS}" ]
+ 		if [[ -n ${MAGE_TARGETS} ]]
  		then
+ 			# build for each target a mage file
+ 			# run it with several targets
  			echo
- 			build_mage_script
+ 			for i in ${MAGE_TARGETS}
+ 			do
+ 				build_mage_script --target "${i}"
+ 			done
  			echo
- 		else
- 			# build for each target an mage file
+ 		# run it for splitpackages
+ 		elif [[ -n ${SPLIT_PACKAGES} ]]
+ 		then
+ 			local split_pkg_base="${PNAME}"
+ 			# save smage environment
+ 			split_save_variables
+ 			# build for each subpackage a mage file
  			# run it with several targets
- 			for i in ${MAGE_TARGETS}
+ 			echo
+ 			for i in ${SPLIT_PACKAGES}
  			do
- 				echo
+ 				# get the right variables for the split
- 				build_mage_script "${i}"
+ 				export PNAME="${i}"
- 				echo
+ 				split_info_${i}
+ 				build_mage_script --split-pkg-base "${split_pkg_base}"
+ 				# restore smage environment
+ 				split_restore_variables
  			done
+ 			echo
+ 			# unset all saved smage variables
+ 			split_unset_variables
+ 		else
+ 			echo
+ 			build_mage_script
+ 			echo
  		fi
  	fi
-Line 824 
 regen_mage_tree()
+Line 907 
 regen_mage_tree()
  	unset postremove
  }
+ split_save_variables()
+ {
+ 	export SAVED_PNAME="${PNAME}"
+ 	export SAVED_PVER="${PVER}"
+ 	export SAVED_PBUILD="${PBUILD}"
+ 	export SAVED_PCATEGORIE="${PCATEGORIE}"
+ 	export SAVED_DESCRIPTION="${DESCRIPTION}"
+ 	export SAVED_HOMEPAGE="${HOMEPAGE}"
+ 	export SAVED_SPECIAL_VARS="${SPECIAL_VARS}"
+ 	export SAVED_STATE="${STATE}"
+ 	export SAVED_PKGTYPE="${PKGTYPE}"
+ 	export SAVED_INHERITS="${INHERITS}"
+ 	export SAVED_DEPEND="${DEPEND}"
+ 	export SAVED_SDEPEND="${SDEPEND}"
+ 	export SAVED_PROVIDE="${PROVIDE}"
+ 	export SAVED_NOPKGBUILD="${NOPKGBUILD}"
+ 	# bindir too
+ 	export SAVED_BINDIR="${BINDIR}"
+ 	# export the SPLIT_PACKAGE_BASE
+ 	export SPLIT_PACKAGE_BASE="${SAVED_PNAME}"
+ 	# functions
+ 	if [[ ! -z $(typeset -f preinstall) ]]
+ 	then
+ 		# rename the old one
+ 		local saved_preinstall
+ 		saved_preinstall=SAVED_$(typeset -f preinstall)
+ 		eval "${saved_preinstall}"
+ 		export -f SAVED_preinstall
+ 	fi
+ 	if [[ ! -z $(typeset -f postinstall) ]]
+ 	then
+ 		# rename the old one
+ 		local saved_postinstall
+ 		saved_postinstall=SAVED_$(typeset -f postinstall)
+ 		eval "${saved_postinstall}"
+ 		export -f SAVED_postinstall
+ 	fi
+ 	if [[ ! -z $(typeset -f preremove) ]]
+ 	then
+ 		# rename the old one
+ 		local saved_preremove
+ 		saved_preremove=SAVED_$(typeset -f preremove)
+ 		eval "${saved_preremove}"
+ 		export -f SAVED_preremove
+ 	fi
+ 	if [[ ! -z $(typeset -f postremove) ]]
+ 	then
+ 		# rename the old one
+ 		local saved_postremove
+ 		saved_postremove=SAVED_$(typeset -f postremove)
+ 		eval "${saved_postremove}"
+ 		export -f SAVED_postremove
+ 	fi
+ }
+ split_restore_variables()
+ {
+ 	export PNAME="${SAVED_PNAME}"
+ 	export PVER="${SAVED_PVER}"
+ 	export PBUILD="${SAVED_PBUILD}"
+ 	export PCATEGORIE="${SAVED_PCATEGORIE}"
+ 	export DESCRIPTION="${SAVED_DESCRIPTION}"
+ 	export HOMEPAGE="${SAVED_HOMEPAGE}"
+ 	export SPECIAL_VARS="${SAVED_SPECIAL_VARS}"
+ 	export STATE="${SAVED_STATE}"
+ 	export PKGTYPE="${SAVED_PKGTYPE}"
+ 	export INHERITS="${SAVED_INHERITS}"
+ 	export DEPEND="${SAVED_DEPEND}"
+ 	export SDEPEND="${SAVED_SDEPEND}"
+ 	export PROVIDE="${SAVED_PROVIDE}"
+ 	export NOPKGBUILD="${SAVED_NOPKGBUILD}"
+ 	# bindir too
+ 	export BINDIR="${SAVED_BINDIR}"
+ 	# functions
+ 	if [[ ! -z $(typeset -f SAVED_preinstall) ]]
+ 	then
+ 		# rename the old one
+ 		local saved_preinstall
+ 		saved_preinstall=$(typeset -f SAVED_preinstall)
+ 		eval "${saved_preinstall/SAVED_/}"
+ 		export -f preinstall
+ 	fi
+ 	if [[ ! -z $(typeset -f SAVED_postinstall) ]]
+ 	then
+ 		# rename the old one
+ 		local saved_postinstall
+ 		saved_postinstall=$(typeset -f SAVED_postinstall)
+ 		eval "${saved_postinstall/SAVED_/}"
+ 		export -f postinstall
+ 	fi
+ 	if [[ ! -z $(typeset -f SAVED_preremove) ]]
+ 	then
+ 		# rename the old one
+ 		local saved_preremove
+ 		saved_preremove=$(typeset -f SAVED_preremove)
+ 		eval "${saved_preremove/SAVED_/}"
+ 		export -f preremove
+ 	fi
+ 	if [[ ! -z $(typeset -f SAVED_postremove) ]]
+ 	then
+ 		# rename the old one
+ 		local saved_postremove
+ 		saved_postremove=$(typeset -f SAVED_postremove)
+ 		eval "${saved_postremove/SAVED_/}"
+ 		export -f postremove
+ 	fi
+ }
+ split_unset_variables()
+ {
+ 	# unset saved vars; not needed anymore
+ 	unset SAVED_PNAME
+ 	unset SAVED_PVER
+ 	unset SAVED_PBUILD
+ 	unset SAVED_PCATEGORIE
+ 	unset SAVED_DESCRIPTION
+ 	unset SAVED_HOMEPAGE
+ 	unset SAVED_SPECIAL_VARS
+ 	unset SAVED_STATE
+ 	unset SAVED_PKGTYPE
+ 	unset SAVED_INHERITS
+ 	unset SAVED_DEPEND
+ 	unset SAVED_SDEPEND
+ 	unset SAVED_PROVIDE
+ 	unset SAVED_BINDIR
+ 	unset SAVED_NOPKGBUILD
+ 	unset SPLIT_PACKAGE_BASE
+ 	unset -f SAVED_preinstall
+ 	unset -f SAVED_postinstall
+ 	unset -f SAVED_preremove
+ 	unset -f SAVED_postremove
+ }
  export_inherits()
  {
  	local include="$1"
-Line 947 
 step_by_step()
+Line 1174 
 step_by_step()
  {
  	if [[ ${STEP_BY_STEP} = true ]]
  	then
- 		echo "${COLRED}Step-by-step enabled! Paused after $1.${COLDEFAULT}"
+ 		echo -e "${COLRED}Step-by-step enabled! Paused after $1.${COLDEFAULT}"
  		echo "Press [enter] to continue"
  		read
  	fi
-Line 979 
 fi
+Line 1206 
 fi
  # creates md5sums for smages to given dir
  if [[ $1 = calcmd5 ]]
  then
- 	if [ $# -ge 3 ]
+ 	if [ $# -ge 2 ]
  	then
  		SMAGENAME="$2"
  		MD5DIR="$3"
- 		source ${SMAGENAME} || die "download source failed"
+ 		[[ -z ${MD5DIR} ]] && MD5DIR="$(dirname ${SMAGENAME})/md5"
+ 		smagesource ${SMAGENAME} || die "download source failed"
  		# overridable sourcedir; must be declared after source of the smage2
  		CALC_SOURCEDIR="${CALC_SOURCEDIR:="${SOURCEDIR}/${PNAME}"}"
-Line 1035 
 then
+Line 1264 
 then
  		echo
  	else
  		echo "Usage: Calculating MD5 Sums:"
- 		echo "    $(basename $0) calcmd5 /path/to/SMAGENAME /path/to/MD5DIR"
+ 		echo "    $(basename $0) calcmd5 /path/to/SMAGENAME [/path/to/MD5DIR]"
  		echo
  		echo
  		echo "Export the CALC_SOURCEDIR variable to override current SOURCEDIRs."
-Line 1057 
 then
+Line 1286 
 then
  	# get smage
  	SMAGENAME="$2"
  	MD5DIR="$(dirname ${SMAGENAME})/md5"
- 	source ${SMAGENAME} || die "download source failed"
+ 	smagesource ${SMAGENAME} || die "download source failed"
  	download_sources
  	exit 0
-Line 1069 
 then
+Line 1298 
 then
  	# 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
  	# build several targets
- 	if [ -n "${MAGE_TARGETS}" ]
+ 	if [[ -n ${MAGE_TARGETS} ]]
  	then
  		for target in ${MAGE_TARGETS}
  		do
-Line 1087 
 then
+Line 1316 
 then
  				--parch "${ARCH}" \
  				--target "${target}"
  		done
+ 	# build several subpackages
+ 	elif [[ -n ${SPLIT_PACKAGES} ]]
+ 	then
+ 		split_save_variables
+ 		for subpackage in ${SPLIT_PACKAGES}
+ 		do
+ 			# get the right variables for the split
+ 			export PNAME="${subpackage}"
+ 			split_info_${subpackage}
+ 			# build md5sum for existing packages
+ 			generate_package_md5sum \
+ 				--pcat "${PCATEGORIE}" \
+ 				--pname "${PNAME}" \
+ 				--pver "${PVER}" \
+ 				--pbuild "${PBUILD}" \
+ 				--parch "${ARCH}"
+ 			# restore smage environment
+ 			split_restore_variables
+ 		done
+ 		# unset all saved smage variables
+ 		split_unset_variables
  	else
  		# build md5sum for existing packages
  		generate_package_md5sum \
-Line 1094 
 then
+Line 1346 
 then
  			--pname "${PNAME}" \
  			--pver "${PVER}" \
  			--pbuild "${PBUILD}" \
- 			--parch "${ARCH}" \
+ 			--parch "${ARCH}"
- 			--target "${target}"
  	fi
  	exit 0
-Line 1109 
 then
+Line 1360 
 then
  	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
-Line 1158 
 fi
+Line 1409 
 fi
  [ -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"
  xtitle "Compiling ${PKGNAME}"
  echo -e "${COLGREEN}Compiling ${PKGNAME}${COLDEFAULT}"
-Line 1239 
 fi
+Line 1491 
 fi
  [[ ! -d /var/log/smage ]] && install -d /var/log/smage
  echo -e "### Build started on $(date) ###\n" > /var/log/smage/${PKGNAME}.log
- src_prepare || die "src_prepare failed" | ${SMAGE_LOG_CMD}
+ src_prepare | ${SMAGE_LOG_CMD}
- step_by_step $_
+ die_pipestatus 0 "src_prepare failed"
- src_compile || die "src_compile failed" | ${SMAGE_LOG_CMD}
- step_by_step $_
- src_install || die "src_install failed" | ${SMAGE_LOG_CMD}
  step_by_step $_
+ src_compile | ${SMAGE_LOG_CMD}
+ die_pipestatus 0 "src_compile failed"
+ step_by_step $_
- # compressing doc, info & man files
+ # build several subpackages
- if [ -d ${BUILDDIR}/builded/usr/share/man ]
+ if [[ -n ${SPLIT_PACKAGES} ]]
  then
- 	echo -e "${COLBLUE}===${COLGREEN} compressing man-pages ...${COLDEFAULT}"
+ 	# save bindir & pname
- 	${MLIBDIR}/compressdoc -g -9 ${BUILDDIR}/builded/usr/share/man
+ 	split_save_variables
+ 	export SAVED_BINDIR="${BINDIR}"
+ 	for subpackage in ${SPLIT_PACKAGES}
+ 	do
+ 		if typeset -f src_install_${subpackage} > /dev/null
+ 		then
+ 			# export subpackage bindir
+ 			export BINDIR="${SAVED_BINDIR}_${subpackage}"
+ 			# export PNAME, several internal function and include
+ 			# rely on this variable
+ 			export PNAME="${subpackage}"
+ 			echo
+ 			echo -en "${COLBLUE}*** ${COLDEFAULT}"
+ 			echo -en "  Running ${COLGREEN}split src_install()${COLDEFAULT}"
+ 			echo -en " for subpkg: ${COLBLUE}${PNAME}${COLDEFAULT}"
+ 			echo -e " - basepkg: ${COLBLUE}${SPLIT_PACKAGE_BASE}${COLDEFAULT} ..."
+ 			src_install_${subpackage} | ${SMAGE_LOG_CMD}
+ 			die_pipestatus 0 "src_install_${subpackage} failed"
+ 			step_by_step $_
+ 		fi
+ 	done
+ 	# restore bindir & pname
+ 	split_restore_variables
+ 	# unset all saved smage variables
+ 	split_unset_variables
+ else
+ 	src_install | ${SMAGE_LOG_CMD}
+ 	die_pipestatus 0 "src_install failed"
+ 	step_by_step $_
  fi
- if [ -d ${BUILDDIR}/builded/usr/share/info ]
+ # compressing doc, info & man files
+ if [[ -n ${SPLIT_PACKAGES} ]]
  then
- 	echo -e "${COLBLUE}===${COLGREEN} compressing info-pages ...${COLDEFAULT}"
+ 	for subpackage in ${SPLIT_PACKAGES}
- 	${MLIBDIR}/compressdoc -g -9 ${BUILDDIR}/builded/usr/share/info
+ 	do
+ 		mcompressdocs ${BINDIR}_${subpackage}
+ 	done
+ else
+ 	mcompressdocs ${BINDIR}
  fi
  # stripping all bins and libs
  case ${NOSTRIP} in
  	true|TRUE|yes|y)
  		echo -e "NOSTRIP=true detected; Package will not be stripped ..."
  		;;
  	*)
- 		echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}"
+ 		if [[ -n ${SPLIT_PACKAGES} ]]
- 		mstripbins ${BINDIR}
+ 		then
- 		echo -e "${COLBLUE}===${COLGREEN} stripping libraries ...${COLDEFAULT}"
+ 			for subpackage in ${SPLIT_PACKAGES}
- 		mstriplibs ${BINDIR}
+ 			do
+ 				echo -e "${COLBLUE}===${COLGREEN} stripping binaries for '${subpackage}' ...${COLDEFAULT}"
+ 				mstripbins ${BINDIR}_${subpackage}
+ 				echo -e "${COLBLUE}===${COLGREEN} stripping libraries for '${subpackage}' ...${COLDEFAULT}"
+ 				mstriplibs ${BINDIR}_${subpackage}
+ 			done
+ 		else
+ 				echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}"
+ 				mstripbins ${BINDIR}
+ 				echo -e "${COLBLUE}===${COLGREEN} stripping libraries ...${COLDEFAULT}"
+ 				mstriplibs ${BINDIR}
+ 		fi
  		;;
  esac
-Line 1280 
 case ${NOPKGBUILD} in
+Line 1579 
 case ${NOPKGBUILD} in
  		;;
  	*)
  		# build several targets
- 		if [ -n "${MAGE_TARGETS}" ]
+ 		if [[ -n ${MAGE_TARGETS} ]]
  		then
  			for target in ${MAGE_TARGETS}
  			do
-Line 1306 
 case ${NOPKGBUILD} in
+Line 1605 
 case ${NOPKGBUILD} in
  				echo -e "${COLGREEN}\nPackage ${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"
  			done
+ 		# build several subpackages
+ 		elif [[ -n ${SPLIT_PACKAGES} ]]
+ 		then
+ 			split_save_variables
+ 			for subpackage in ${SPLIT_PACKAGES}
+ 			do
+ 				# get the right variables for the split
+ 				export PNAME="${subpackage}"
+ 				split_info_${PNAME}
+ 				# jump to next one if NOPKGBUILD is set in split_info
+ 				case ${NOPKGBUILD} in
+ 					true|TRUE|yes|y) continue ;;
+ 				esac
+ 				# check if an special subpackage_pkgbuild exists
+ 				if typeset -f ${PNAME}_pkgbuild > /dev/null
+ 				then
+ 					# run it
+ 					${PNAME}_pkgbuild
+ 				fi
+ 				# now create the target package
+ 				${MLIBDIR}/pkgbuild_dir.sh \
+ 					"${PNAME}-${PVER}-${ARCH}-${PBUILD}" \
+ 					"${BINDIR}_${PNAME}" || die "split_package: ${PNAME} package-build failed"
+ 				# build pkg-md5-sum if requested
+ 				generate_package_md5sum \
+ 					--pcat "${PCATEGORIE}" \
+ 					--pname "${PNAME}" \
+ 					--pver "${PVER}" \
+ 					--pbuild "${PBUILD}" \
+ 					--parch "${ARCH}"
+ 				echo -e "${COLGREEN}\nPackage ${PNAME}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"
+ 				# restore smage environment
+ 				split_restore_variables
+ 			done
+ 			# unset all saved smage variables
+ 			split_unset_variables
  		else
  			${MLIBDIR}/pkgbuild_dir.sh ${PKGNAME} ${BINDIR} || die "package-build failed"

 Legend:



Removed from v.891
 


changed lines


 
Added in v.1435
 Legend:



Removed from v.891
 


changed lines


 
Added in v.1435
-Removed from v.891
+Added in v.1435