/[magellan-source]/branches/mage-next/src/smage2.in

Diff of /branches/mage-next/src/smage2.in

Parent Directory | Revision Log | View Patch Patch

-revision 194 by niro,
Sat Aug 20 15:32:59 2005 UTC
+revision 204 by niro,
Mon Aug 22 00:07:32 2005 UTC
 Line 4
  # needs pkgbuild_dir (mage)
  # SMAGE2
- # $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.25 2005-08-20 15:32:59 niro Exp $
+ # $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.34 2005-08-22 00:07:32 niro Exp $
  #01.10.2004
  #	added ccache support
 Line 408 
 setup_ccache_environment(){
  # fixes given dependencies to match a MAGE_TARGET
- # fix_mage_deps -target s/depend # <-- '-' is essential ! (build_mage_script needs this)
+ # fix_mage_deps -target s/depend # <-- note -target !
  fix_mage_deps() {
  	local target="$1"
  	local depend="$2"
 Line 425 
 fix_mage_deps() {
  		while read sym dep
  		do
  			cat="$(dirname ${dep})"
- 			# abort on virtual
+ 			# change if not virtual
- 			[[ ${cat} = virtual ]] && continue
+ 			if [[ ${cat} = virtual ]]
+ 			then
- 			# fix pver to target-pver
+ 				pname="$(basename ${dep})"
- 			# to get pname-target-pver
+ 			else
+ 				# fix pver to target-pver
+ 				# to get pname-target-pver
- 			# doing it backwards !
+ 				# doing it backwards !
- 			pver="${dep##*-}"
+ 				pver="${dep##*-}"
- 			pname=$(basename ${dep/-${pver}/})
+ 				# full pver
+ 				pname="$(basename ${dep/-${pver}/})${target}-${pver}"
+ 			fi
  			# do not add empty lines
  			if [ -z "${NDEPEND}" ]
  			then
- 				NDEPEND="${sym} ${cat}/${pname}${target}-${pver}"
+ 				NDEPEND="${sym} ${cat}/${pname}"
  			else
  				NDEPEND="${NDEPEND}
- 	${sym} ${cat}/${pname}${target}-${pver}"
+ 	${sym} ${cat}/${pname}"
  			fi
  			unset cat pname pver
-Line 478 
 EOF
+Line 482 
 EOF
  #   MAGE_TREE_DEST        target destination of the generated tree
  #   REGEN_MAGE_TREE       set to 'true' to enable this
  #
- # gets called with build_mage_script target # <-- '-' is essential !
+ # gets called with build_mage_script target
  build_mage_script()
  {
  	local magefile
-Line 491 
 build_mage_script()
+Line 495 
 build_mage_script()
  	: ${MAGE_TREE_DEST=${BUILDDIR}/mage-tree}
  	# determinate which suffix this mage file should get, if any
- 	target="$1"
+ 	[ -n "$1" ] && target="-$1"
  	# name of magefile
  	magefile="${PNAME}${target}-${PVER}-${PBUILD}.mage"
-Line 508 
 build_mage_script()
+Line 512 
 build_mage_script()
  	> ${dest}
  	# header
- 	echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.25 2005-08-20 15:32:59 niro Exp $' >> ${dest}
+ 	echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.34 2005-08-22 00:07:32 niro Exp $' >> ${dest}
  	echo  >> ${dest}
  	# pgkname and state
-Line 521 
 build_mage_script()
+Line 525 
 build_mage_script()
  	echo "HOMEPAGE=\"${HOMEPAGE}\"" >> ${dest}
  	echo >> ${dest}
- 	# special tags
+ 	# special tags and vars
  	echo "PKGTYPE=\"${PKGTYPE}\""  >> ${dest}
+ 	# add special vars
+ 	if [ -n "${SPECIAL_VARS}" ]
+ 	then
+ 		local i
+ 		for i in ${SPECIAL_VARS}
+ 		do
+ 			# being tricky here :)
+ 			echo "${i}=\"$(eval echo \$${i})\"" >> ${dest}
+ 		done
+ 		echo  >> ${dest}
+ 	fi
+ 	# add at least all includes
  	if [ -n "${INHERITS}" ]
  	then
  		echo -n "minclude"  >> ${dest}
-Line 537 
 build_mage_script()
+Line 553 
 build_mage_script()
  	# 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}
-Line 552 
 build_mage_script()
+Line 570 
 build_mage_script()
  			# unset to be safe (quotes needed !)
  			#unset "${i}" <-- later to get every target built
  		done
- 	fi
+ 		echo  >> ${dest}
- 	# add special vars
- 	if [ -n "${SPECIAL_VARS}" ]
- 	then
- 		local i
- 		for i in ${SPECIAL_VARS}
- 		do
- 			# being tricky here :)
- 			echo "${i}=\"$(eval echo \$${i})\"" >> ${dest}
- 		done
  	fi
  	# pre|post-install|removes
-Line 574 
 build_mage_script()
+Line 582 
 build_mage_script()
  	echo  >> ${dest}
  	typeset -f postremove >> ${dest}
  	echo  >> ${dest}
+ 	# echo MAGE_TARGETS ## note -target is needed !
+ 	echo "MAGE_TARGETS=\"${targets}\"" >> ${dest}
  }
  regen_mage_tree()
-Line 583 
 regen_mage_tree()
+Line 594 
 regen_mage_tree()
  	# build them only if requested
  	if [[ ${REGEN_MAGE_TREE} = true ]]
  	then
- 		# build for each target an mage file
+ 		# run it without targets
- 		for i in ${MAGE_TARGETS}
+ 		if [ -z "${MAGE_TARGETS}" ]
- 		do
+ 		then
  			echo
- 			build_mage_script "-${i}"
+ 			build_mage_script
  			echo
- 		done
+ 		else
+ 			# build for each target an mage file
+ 			# run it with several targets
+ 			for i in ${MAGE_TARGETS}
+ 			do
+ 				echo
+ 				build_mage_script "${i}"
+ 				echo
+ 			done
+ 		fi
  	fi
  	# now unset all uneeded vars to be safe
-Line 728 
 then
+Line 749 
 then
  	exit 0
  fi
+ # regen-mage-tree
+ if [ "$1" == "only-regen-tree" -a -n "$2" ]
+ then
+ 	# set correct SMAGENAME
+ 	SMAGENAME="$2"
+ 	MD5DIR="$(dirname ${SMAGENAME})/md5"
+ 	source ${SMAGENAME} || die "regen: smage2 not found"
+ 	regen_mage_tree
+ 	exit 0
+ fi
  if [ ! -e ${MLIBDIR}/pkgbuild_dir.sh ]
  then
  	die "Error: ${MLIBDIR}/pkgbuild_dir.sh not found. Aborting."

 Legend:



Removed from v.194
 


changed lines


 
Added in v.204
 Legend:



Removed from v.194
 


changed lines


 
Added in v.204
-Removed from v.194
+Added in v.204