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

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

Parent Directory | Revision Log | View Patch Patch

-revision 192 by niro,
Fri Aug 19 03:43:56 2005 UTC
+revision 199 by niro,
Sun Aug 21 21:23:48 2005 UTC
 Line 4
  # needs pkgbuild_dir (mage)
  # SMAGE2
- # $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.23 2005-08-19 03:43:56 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 $
  #01.10.2004
  #	added ccache support
 Line 406 
 setup_ccache_environment(){
  	fi
  }
+ # fixes given dependencies to match a MAGE_TARGET
+ # fix_mage_deps -target s/depend # <-- note -target !
+ fix_mage_deps() {
+ 	local target="$1"
+ 	local depend="$2"
+ 	local NDEPEND
+ 	local sym dep cat pver pname
+ 	# deps and provides are special
+ 	# they must be fixed to match the target
+ 	# run this only if target and depend is not empty
+ 	if [ -n "${target}" ] && [ -n "${depend}" ]
+ 	then
+ 		# fix DEPEND
+ 		while read sym dep
+ 		do
+ 			cat="$(dirname ${dep})"
+ 			# change if not virtual
+ 			if [[ ${cat} != virtual ]]
+ 			then
+ 				# fix pver to target-pver
+ 				# to get pname-target-pver
+ 				# doing it backwards !
+ 				pver="${dep##*-}"
+ 				pname=$(basename ${dep/-${pver}/})
+ 			fi
+ 			# do not add empty lines
+ 			if [ -z "${NDEPEND}" ]
+ 			then
+ 				NDEPEND="${sym} ${cat}/${pname}${target}-${pver}"
+ 			else
+ 				NDEPEND="${NDEPEND}
+ 	${sym} ${cat}/${pname}${target}-${pver}"
+ 			fi
+ 			unset cat pname pver
+ 		done << EOF
+ ${depend}
+ EOF
+ 		# set NDEPEND to DEPEND
+ 		depend="${NDEPEND}"
+ 	fi
+ 	echo "${depend}"
+ }
  # build_mage_script(): helper functions for regen_mage_tree()
  # generates an mage file with given information in smage file
  # needs at least:
-Line 428 
 setup_ccache_environment(){
+Line 478 
 setup_ccache_environment(){
  #
  #   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
  build_mage_script()
  {
  	local magefile
  	local dest
- 	local suffix
+ 	local target
  	local sym
  	local depname
-Line 440 
 build_mage_script()
+Line 492 
 build_mage_script()
  	: ${MAGE_TREE_DEST=${BUILDDIR}/mage-tree}
  	# determinate which suffix this mage file should get, if any
- 	suffix="$1"
+ 	[ -n "$1" ] && target="-$1"
  	# name of magefile
- 	magefile="${PNAME}${suffix}-${PVER}-${PBUILD}.mage"
+ 	magefile="${PNAME}${target}-${PVER}-${PBUILD}.mage"
  	# destination to magefile
- 	dest="${MAGE_TREE_DEST}/${PCATEGORIE}/${PNAME}${suffix}/${magefile}"
+ 	dest="${MAGE_TREE_DEST}/${PCATEGORIE}/${PNAME}${target}/${magefile}"
  	# show what we are doing
  	echo "Generating Mage file:"
-Line 457 
 build_mage_script()
+Line 509 
 build_mage_script()
  	> ${dest}
  	# header
- 	echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.23 2005-08-19 03:43:56 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}
  	echo  >> ${dest}
  	# pgkname and state
- 	echo "PKGNAME=\"${PNAME}${suffix}-${PVER}-\${ARCH}-${PBUILD}\"" >> ${dest}
+ 	echo "PKGNAME=\"${PNAME}${target}-${PVER}-\${ARCH}-${PBUILD}\"" >> ${dest}
  	echo "STATE=\"${STATE}\"" >> ${dest}
  	echo >> ${dest}
-Line 470 
 build_mage_script()
+Line 522 
 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 485 
 build_mage_script()
+Line 549 
 build_mage_script()
  	echo >> ${dest}
  	# deps and provides
- 	echo "DEPEND=\"${DEPEND}\"" >> ${dest}
+ 	echo "DEPEND=\"$(fix_mage_deps "${target}" "${DEPEND}")\"" >> ${dest}
- 	echo "SDEPEND=\"${SDEPEND}\"" >> ${dest}
+ 	echo >> ${dest}
+ 	echo "SDEPEND=\"$(fix_mage_deps "${target}" "${SDEPEND}")\"" >> ${dest}
+ 	echo >> ${dest}
  	echo "PROVIDE=\"${PROVIDE}\"" >> ${dest}
  	echo >> ${dest}
-Line 501 
 build_mage_script()
+Line 567 
 build_mage_script()
  			# unset to be safe (quotes needed !)
  			#unset "${i}" <-- later to get every target built
  		done
+ 		echo  >> ${dest}
  	fi
  	# pre|post-install|removes
-Line 521 
 regen_mage_tree()
+Line 588 
 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 538 
 regen_mage_tree()
+Line 615 
 regen_mage_tree()
  		unset "${i}"
  	done
  	unset SPECIAL_FUNCTIONS
+ 	for i in ${SPECIAL_VARS}
+ 	do
+ 		unset "${i}"
+ 	done
+ 	unset SPECIAL_VARS
  	unset STATE
  	unset DESCRIPTION
  	unset HOMEPAGE

 Legend:



Removed from v.192
 


changed lines


 
Added in v.199
 Legend:



Removed from v.192
 


changed lines


 
Added in v.199
-Removed from v.192
+Added in v.199