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

Parent Directory | Revision Log | Patch

	revision 196 by niro, Sat Aug 20 15:55:19 2005 UTC	revision 199 by niro, Sun Aug 21 21:23:48 2005 UTC
#	Line 4	Line 4
4	# needs pkgbuild_dir (mage)	# needs pkgbuild_dir (mage)
5
6	# SMAGE2	# SMAGE2
7	# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.27 2005-08-20 15:55:19 niro Exp $	# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.30 2005-08-21 21:23:48 niro Exp $
8
9	#01.10.2004	#01.10.2004
10	# added ccache support	# added ccache support
#	Line 408  setup_ccache_environment(){	Line 408  setup_ccache_environment(){
408
409
410	# fixes given dependencies to match a MAGE_TARGET	# fixes given dependencies to match a MAGE_TARGET
411	# fix_mage_deps target s/depend	# fix_mage_deps -target s/depend # <-- note -target !
412	fix_mage_deps() {	fix_mage_deps() {
413	local target="$1"	local target="$1"
414	local depend="$2"	local depend="$2"
#	Line 425  fix_mage_deps() {	Line 425  fix_mage_deps() {
425	while read sym dep	while read sym dep
426	do	do
427	cat="$(dirname ${dep})"	cat="$(dirname ${dep})"
428	# abort on virtual	# change if not virtual
429	[[ ${cat} = virtual ]] && continue	if [[ ${cat} != virtual ]]
430		then
431	# fix pver to target-pver	# fix pver to target-pver
432	# to get pname-target-pver	# to get pname-target-pver
433
434	# doing it backwards !	# doing it backwards !
435	pver="${dep##*-}"	pver="${dep##*-}"
436	pname=$(basename ${dep/-${pver}/})	pname=$(basename ${dep/-${pver}/})
437		fi
438
439	# do not add empty lines	# do not add empty lines
440	if [ -z "${NDEPEND}" ]	if [ -z "${NDEPEND}" ]
441	then	then
442	NDEPEND="${sym} ${cat}/${pname}-${target}-${pver}"	NDEPEND="${sym} ${cat}/${pname}${target}-${pver}"
443	else	else
444	NDEPEND="${NDEPEND}	NDEPEND="${NDEPEND}
445	${sym} ${cat}/${pname}-${target}-${pver}"	${sym} ${cat}/${pname}${target}-${pver}"
446	fi	fi
447
448	unset cat pname pver	unset cat pname pver
#	Line 508  build_mage_script()	Line 509  build_mage_script()
509	> ${dest}	> ${dest}
510
511	# header	# header
512	echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.27 2005-08-20 15:55:19 niro Exp $' >> ${dest}	echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.30 2005-08-21 21:23:48 niro Exp $' >> ${dest}
513	echo  >> ${dest}	echo  >> ${dest}
514
515	# pgkname and state	# pgkname and state
#	Line 523  build_mage_script()	Line 524  build_mage_script()
524
525	# special tags and vars	# special tags and vars
526	echo "PKGTYPE=\"${PKGTYPE}\""  >> ${dest}	echo "PKGTYPE=\"${PKGTYPE}\""  >> ${dest}
527	if [ -n "${INHERITS}" ]	# add special vars
528		if [ -n "${SPECIAL_VARS}" ]
529	then	then
	echo -n "minclude"  >> ${dest}
530	local i	local i
531	for i in ${INHERITS}	for i in ${SPECIAL_VARS}
532	do	do
533	echo -n " ${i}"  >> ${dest}	# being tricky here :)
534		echo "${i}=\"$(eval echo \$${i})\"" >> ${dest}
535	done	done
536	echo  >> ${dest}	echo  >> ${dest}
537	fi	fi
538	echo >> ${dest}	# add at least all includes
539		if [ -n "${INHERITS}" ]
	# add special vars
	if [ -n "${SPECIAL_VARS}" ]
540	then	then
541		echo -n "minclude"  >> ${dest}
542	local i	local i
543	for i in ${SPECIAL_VARS}	for i in ${INHERITS}
544	do	do
545	# being tricky here :)	echo -n " ${i}"  >> ${dest}
	echo "${i}=\"$(eval echo \$${i})\"" >> ${dest}
546	done	done
547	echo  >> ${dest}	echo  >> ${dest}
548	fi	fi
549		echo >> ${dest}
550
551	# deps and provides	# deps and provides
552	echo "DEPEND=\"$(fix_mage_deps "${target}" "${DEPEND}")\"" >> ${dest}	echo "DEPEND=\"$(fix_mage_deps "${target}" "${DEPEND}")\"" >> ${dest}

---

Colored Diff Long Colored Diff Full Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.196   changed lines   Added in v.199