/[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 1291 by niro,
Fri May 27 12:54:34 2011 UTC
+revision 1435 by niro,
Mon Jul 25 11:01:48 2011 UTC
 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 442 
 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 501 
 mpatch()
+Line 543 
 mpatch()
  mlibtoolize()
  {
  	local opts="$@"
- 	[[ -z ${opts} ]] && opts="--copy --force"
+ 	[[ -z ${opts} ]] && opts="--verbose --install --force"
  	libtoolize ${opts} || die "running: mlibtoolize ${opts}"
  }
-Line 724 
 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}
- 	echo >> ${dest}
  	# add special vars
  	if [ -n "${SPECIAL_VARS}" ]
-Line 758 
 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 770 
 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 790 
 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 1188 
 then
+Line 1212 
 then
  		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}"}"
-Line 1262 
 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 1274 
 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
-Line 1336 
 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 1385 
 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"

 Legend:



Removed from v.1291
 


changed lines


 
Added in v.1435
 Legend:



Removed from v.1291
 


changed lines


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