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

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

Parent Directory | Revision Log | View Patch Patch

-revision 191 by niro,
Fri Aug 19 02:24:12 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.22 2005-08-19 02:24:12 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 230 
 src_install() {
  	return 0
  }
- build_mage_script() {
- 	return 0
- }
  mconfigure() {
  	if [ -x ./configure ]
  	then
-Line 411 
 setup_ccache_environment(){
+Line 406 
 setup_ccache_environment(){
  	fi
  }
- # alx_create_mage_file: helper functions for regen_mage_tree()
+ # 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
+ 				pname="$(basename ${dep})"
+ 			else
+ 				# fix pver to target-pver
+ 				# to get pname-target-pver
+ 				# doing it backwards !
+ 				pver="${dep##*-}"
+ 				# full pver
+ 				pname="$(basename ${dep/-${pver}/})${target}-${pver}"
+ 			fi
+ 			# do not add empty lines
+ 			if [ -z "${NDEPEND}" ]
+ 			then
+ 				NDEPEND="${sym} ${cat}/${pname}"
+ 			else
+ 				NDEPEND="${NDEPEND}
+ 	${sym} ${cat}/${pname}"
+ 			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:
  #   PNAME                 name of pkg
-Line 433 
 setup_ccache_environment(){
+Line 481 
 setup_ccache_environment(){
  #
  #   MAGE_TREE_DEST        target destination of the generated tree
  #   REGEN_MAGE_TREE       set to 'true' to enable this
- alx_create_mage_file()
+ #
+ # gets called with build_mage_script target
+ build_mage_script()
  {
  	local magefile
  	local dest
- 	local suffix
+ 	local target
  	local sym
  	local depname
-Line 445 
 alx_create_mage_file()
+Line 495 
 alx_create_mage_file()
  	: ${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 462 
 alx_create_mage_file()
+Line 512 
 alx_create_mage_file()
  	> ${dest}
  	# header
- 	echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.22 2005-08-19 02:24:12 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
- 	echo "PKGNAME=\"${PNAME}${suffix}-${PVER}-\${ARCH}-${PBUILD}\"" >> ${dest}
+ 	echo "PKGNAME=\"${PNAME}${target}-${PVER}-\${ARCH}-${PBUILD}\"" >> ${dest}
  	echo "STATE=\"${STATE}\"" >> ${dest}
  	echo >> ${dest}
-Line 475 
 alx_create_mage_file()
+Line 525 
 alx_create_mage_file()
  	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 490 
 alx_create_mage_file()
+Line 552 
 alx_create_mage_file()
  	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 504 
 alx_create_mage_file()
+Line 568 
 alx_create_mage_file()
  			# add to mage (quotes needed !)
  			typeset -f "${i}" >> ${dest}
  			# unset to be safe (quotes needed !)
- 			unset "${i}"
+ 			#unset "${i}" <-- later to get every target built
  		done
+ 		echo  >> ${dest}
  	fi
  	# pre|post-install|removes
-Line 517 
 alx_create_mage_file()
+Line 582 
 alx_create_mage_file()
  	echo  >> ${dest}
  	typeset -f postremove >> ${dest}
  	echo  >> ${dest}
+ 	# echo MAGE_TARGETS ## note -target is needed !
+ 	echo "MAGE_TARGETS=\"${targets}\"" >> ${dest}
  }
  regen_mage_tree()
-Line 526 
 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
- 			alx_create_mage_file "${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
- 	unset PKGNAME
+ 	# unset PKGNAME <-- don't do that; smage needs this var
+ 	# unset to be safe (quotes needed !)
+ 	for i in ${SPECIAL_FUNCTIONS}
+ 	do
+ 		unset "${i}"
+ 	done
+ 	unset SPECIAL_FUNCTIONS
+ 	for i in ${SPECIAL_VARS}
+ 	do
+ 		unset "${i}"
+ 	done
+ 	unset SPECIAL_VARS
  	unset STATE
  	unset DESCRIPTION
  	unset HOMEPAGE
-Line 545 
 regen_mage_tree()
+Line 634 
 regen_mage_tree()
  	unset DEPEND
  	unset SDEPEND
  	unset PROVIDE
- 	unset SPECIAL_FUNCTIONS
  	unset preinstall
  	unset postinstall
  	unset preremove
-Line 563 
 then
+Line 651 
 then
  	exit 1
  fi
- #updating smage2-scripts
+ # updating smage2-scripts
  if [ "$1" == "update" ]
  then
  	if [ ! -d ${SOURCEDIR} ]
-Line 574 
 then
+Line 662 
 then
  	exit 0
  fi
- #creates md5sums for smages to given dir
+ # creates md5sums for smages to given dir
  if [ "$1" == "calcmd5" ]
  then
  	if [ $# -ge 3 ]
-Line 644 
 then
+Line 732 
 then
  	exit 0
  fi
- #download sources
+ # download sources
  if [ "$1" == "download" -a -n "$2" ]
  then
  	if [ ! -d ${SMAGESCRIPTSDIR} ]
-Line 661 
 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."
-Line 718 
 echo "Compiling ${PKGNAME}"
+Line 818 
 echo "Compiling ${PKGNAME}"
  # auto regen mage tree if requested
  regen_mage_tree
- #download sources
+ # download sources
  download_sources
- #fixes some issues with these functions
+ # fixes some issues with these functions
  export -f src_prepare || die "src_prepare export failed"
  export -f src_compile || die "src_compile export failed"
  export -f src_install || die "src_install export failed"
- #fixes some compile issues
+ # fixes some compile issues
  export CHOST="${CHOST}" || die "CHOST export failed"
  export CFLAGS="${CFLAGS}" || die "CFLAGS export failed"
  export CXXFLAGS="${CFLAGS}" || die "CXXFLAGS export failed"
-Line 734 
 export BINDIR="${BINDIR}" || die "BINDIR
+Line 834 
 export BINDIR="${BINDIR}" || die "BINDIR
  export MAKEOPTS="${MAKEOPTS}" || die "MAKEOPTS export failed"
- #setup distcc
+ # setup distcc
- #distcc mus be setup *before* ccache, as ccache need to be before distcc in path
+ # distcc mus be setup *before* ccache, as ccache need to be before distcc in path
  if [ "${SMAGE_USE_DISTCC}" == "true" ]
  then
  	setup_distcc_environment
  fi
- #setup ccache
+ # setup ccache
  if [ "${SMAGE_USE_CCACHE}" == "true" ]
  then
  	setup_ccache_environment
-Line 762 
 sleep 1
+Line 862 
 sleep 1
  #read
  #debug end
- #cleans up build if a previously one exists
+ # cleans up build if a previously one exists
  if [ -d ${BUILDDIR} ]
  then
  	rm -rf ${BUILDDIR}/* || die "couldn't cleanup \$BUILDDIR."
  fi
  install -d ${BUILDDIR} || die "couldn't create \$BUILDDIR."
- #cleans up srcdir if a previously unpacked one exists
+ # cleans up srcdir if a previously unpacked one exists
  if [ -d ${SRCDIR} ]
  then
  	rm -rf ${SRCDIR}
  fi
- #cleans up bindir if a previous build exists or creates a new one
+ # cleans up bindir if a previous build exists or creates a new one
  if [ -d ${BINDIR} ]
  then
  	rm -rf ${BINDIR}
  fi
  install -d ${BINDIR} || die "couldn't create \$BINDIR."
- #cleans up package temp dir if a previous build exists
+ # cleans up package temp dir if a previous build exists
  if [ -d ${BUILDDIR}/${PKGNAME} ]
  then
  	rm -rf ${BUILDDIR}/${PKGNAME}
  fi
- #cleans up timestamp if one exists
+ # cleans up timestamp if one exists
  if [ -f /var/tmp/timestamp ]
  then
  	mage rmstamp
-Line 799 
 src_compile || die "src_compile failed"
+Line 899 
 src_compile || die "src_compile failed"
  src_install || die "src_install failed"
- #compressing doc, info & man files
+ # compressing doc, info & man files
  echo -e "Compressing man-pages ..."
  if [ -d ${BUILDDIR}/builded/usr/share/man ]
  then
-Line 825 
 case ${NOSTRIP} in
+Line 925 
 case ${NOSTRIP} in
  		;;
  esac
- #the new buildpkg command
+ # the new buildpkg command
  case ${NOPKGBUILD} in
  	true|TRUE|yes|y)
  		echo -e "NOPGKBUILD=true detected; Package will not be build ..."
  		;;
  	*)
- 		${MLIBDIR}/pkgbuild_dir.sh ${PKGNAME} ${BINDIR} || die "package-build failed"
+ 		# build serveral targets
- 		echo -e "\nPackage ${PKGNAME} successfully builded.\n"
+ 		if [ -n "${MAGE_TARGETS}" ]
+ 		then
+ 			for target in ${MAGE_TARGETS}
+ 			do
+ 				# check if an special target_pkgbuild exists
+ 				if typeset -f ${target}_pkgbuild > /dev/null
+ 				then
+ 					# run it
+ 					${target}_pkgbuild
+ 				fi
+ 				# now create the target package
+ 				${MLIBDIR}/pkgbuild_dir.sh \
+ 					"${PNAME}-${target}-${PVER}-${CHOST%%-*}-${PBUILD}" \
+ 					${BINDIR} || die "target: ${target} package-build failed"
+ 				echo -e "\nPackage ${PNAME}-${target}-${PVER}-${CHOST%%-*}-${PBUILD} successfully builded.\n"
+ 			done
+ 		else
+ 			${MLIBDIR}/pkgbuild_dir.sh ${PKGNAME} ${BINDIR} || die "package-build failed"
+ 			echo -e "\nPackage ${PKGNAME} successfully builded.\n"
+ 		fi
  		;;
  esac
- #for sure
+ # for sure
  unset NOPKGBUILD
  unset NOSTRIP

 Legend:



Removed from v.191
 


changed lines


 
Added in v.204
 Legend:



Removed from v.191
 


changed lines


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