--- trunk/mage/usr/lib/mage/smage2.sh	2006/07/17 20:52:38	386
+++ trunk/mage/usr/lib/mage/smage2.sh	2007/01/19 23:11:17	412
@@ -4,7 +4,7 @@
 # needs pkgbuild_dir (mage)
 
 # SMAGE2
-# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.44 2006-07-17 20:52:38 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.49 2007-01-19 23:11:17 niro Exp $
 
 #01.10.2004
 #	added ccache support
@@ -12,6 +12,7 @@
 
 ## setup ##
 PKGSUFFIX="mpk"
+SRCPKGSUFFIX="mpks"
 SMAGENAME="$1"
 SMAGESUFFIX="smage2"
 MLIBDIR=/usr/lib/mage
@@ -310,6 +311,8 @@
 		DEST=$2
 	fi
 
+	[[ ! -d ${DEST} ]] && install -d ${DEST}
+
 	case "${SRCFILE##*.}" in
 		bz2)
 			IFTAR="$(basename $SRCFILE .bz2)"
@@ -532,7 +535,7 @@
 	> ${dest}
 
 	# header
-	echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.44 2006-07-17 20:52:38 niro Exp $' >> ${dest}
+	echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.49 2007-01-19 23:11:17 niro Exp $' >> ${dest}
 	echo  >> ${dest}
 
 	# pgkname and state
@@ -754,6 +757,35 @@
 	fi
 }
 
+source_pkg_build()
+{
+	if [[ ${PKGTYPE} = virtual ]]
+	then
+		echo "Virtual package detected; src-pkg-tarball not necessary ..."
+		return 0
+	fi
+
+	if [[ ! -d ${SOURCEDIR}/${PNAME} ]]
+	then
+		echo "No SRC_URI defined; src-pkg-tarball not necessary ..."
+		return 0
+	fi
+
+	[ -z "${SRCPKGDIR}" ] && die "\$SRCPKGDIR not found. Please setup your mage.rc correctly."
+
+	echo -e "${COLGREEN}Creating source package tarball ... ${COLDEFAULT}"
+
+	# include the smage2 file
+	cp ${SMAGENAME} ${SOURCEDIR}/${PNAME}
+
+	( cd ${SOURCEDIR}; tar cvjf ${BUILDDIR}/${PNAME}-${PVER}-${PBUILD}.tar.bz2 ${PNAME}; )
+	[[ ! -d ${SRCPKGDIR} ]] && install -d ${SRCPKGDIR}
+	mv ${BUILDDIR}/${PNAME}-${PVER}-${PBUILD}.tar.bz2 ${SRCPKGDIR}/${PNAME}-${PVER}-${PBUILD}.${SRCPKGSUFFIX}
+
+	echo -e "${COLGREEN}Source package ${COLBLUE}${PNAME}-${PVER}-${PBUILD}.${SRCPKGSUFFIX} ${COLGREEN}successfully builded.${COLDEFAULT}"
+}
+
+
 # print out our version
 showversion
 echo
@@ -885,6 +917,52 @@
 	exit 0
 fi
 
+if [ "$1" == "--create-src-tarball" -a -n "$2" ]
+then
+	# set correct SMAGENAME
+	SMAGENAME="$2"
+	MD5DIR="$(dirname ${SMAGENAME})/md5"
+
+	echo -e "${COLGREEN}create-src-tarball called for ${COLBLUE}${SMAGENAME}${COLGREEN} ...${COLDEFAULT}"
+
+	source ${SMAGENAME} || die "regen: smage2 not found"
+
+	if [[ -d ${SOURCEDIR}/${PNAME} ]]
+	then
+		echo -e "${COLGREEN}Deleting old sourcefiles ${COLBLUE}${SOURCEDIR}/${PNAME}${COLGREEN} ...${COLDEFAULT}"
+		rm -rf ${SOURCEDIR}/${PKGNAME}
+	fi
+
+	download_sources
+	source_pkg_build ${SMAGENAME}
+	exit 0
+fi
+
+if [ "$1" == "--src-tarball" -a -n "$2" ] || [ "$1" == "-st" -a -n "$2" ]
+then
+	SRCPKGTARBALL="${2}"
+	USE_SRC_PKG_TARBALL=true
+
+	# abort if given file is not a source pkg
+	[[ ${SRCPKGTARBALL##*.} != ${SRCPKGSUFFIX} ]] && die "${SRCPKGTARBALL} is not a valid src-pkg file."
+
+	# set correct SMAGENAME; use the one that the src_pkg provide
+	# /path/to/SOURCEDIR/PNAME/SMAGENAME
+	SMAGENAME="${SOURCEDIR}/$(basename ${SRCPKGTARBALL%-*-*})/$(basename ${SRCPKGTARBALL} .${SRCPKGSUFFIX}).${SMAGESUFFIX}"
+
+	echo -e "${COLGREEN}Using src-tarball ${COLBLUE}${SRCPKGTARBALL}${COLGREEN} ...${COLDEFAULT}"
+
+	[[ ! -d ${SOURCEDIR} ]] && install -d ${SOURCEDIR}
+
+	# unpack srctarball
+	[[ ! -f ${SRCPKGTARBALL} ]] && die "Error: ${SRCPKGTARBALL} does not exist. Aborting."	
+
+	tar xvjf ${SRCPKGTARBALL} -C ${SOURCEDIR} || die  "Error unpackung src-tarball ${SRCPKGTARBALL}"
+
+	[[ ! -f ${SMAGENAME} ]] && die "Included smage2 file in src-tarball not found: ${SMAGENAME}"
+fi
+
+
 [ ! -e ${MLIBDIR}/pkgbuild_dir.sh ] && die "Error: ${MLIBDIR}/pkgbuild_dir.sh not found. Aborting."
 [ -z "$(basename ${SMAGENAME} | grep .${SMAGESUFFIX})" ] &&
 	die "File '$(basename ${SMAGENAME})' is not a sMage v${SMAGEVERSION} file. Aborting."
@@ -906,8 +984,17 @@
 # auto regen mage tree if requested
 regen_mage_tree
 
+if [[ ${CREATE_SRC_PKG_TARBALL} = true ]]
+then
+	if [[ -d ${SOURCEDIR}/${PNAME} ]]
+	then
+		echo -e "${COLGREEN}Deleting old sourcefiles ${COLBLUE}${SOURCEDIR}/${PNAME}${COLGREEN} ...${COLDEFAULT}"
+		rm -rf ${SOURCEDIR}/${PNAME}
+	fi
+fi
+
 # download sources
-download_sources
+[[ ${USE_SRC_PKG_TARBALL} != true ]] && download_sources
 
 # fixes some issues with these functions
 export -f src_prepare || die "src_prepare export failed"
@@ -1041,6 +1128,9 @@
 
 			echo -e "\nPackage ${PKGNAME} successfully builded.\n"
 		fi
+
+		# build src-pkg-tarball if requested
+		[[ ${CREATE_SRC_PKG_TARBALL} = true ]] && source_pkg_build ${SMAGENAME}
 		;;
 esac