/[magellan-source]/trunk/mage/usr/lib/mage/smage2.functions.sh

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

Parent Directory | Revision Log | View Patch Patch

-revision 1641 by niro,
Fri Jan 13 18:31:48 2012 UTC
+revision 1796 by niro,
Wed Apr 11 21:28:27 2012 UTC
 Line 7
  smagesource()
  {
  	local file="$1"
- 	local mystate
+ 	local localstate
- 	local mycodename
+ 	local distfilestate
+ 	local mytag
  	source ${file}
-Line 19 
 smagesource()
+Line 20 
 smagesource()
  		if [[ -n ${PCATEGORIE} ]]
  		then
  			PCAT="${PCATEGORIE}"
+ 			unset PCATEGORIE
  			# print a warning
  			echo -e "${COLYELLOW}Warning: 'PCATEGORIE' is deprecated and gets removed in the future.${COLDEFAULT}"
  			echo -e "${COLYELLOW}         Please modify this smage2 script to use the 'PCAT' variable.${COLDEFAULT}"
-Line 28 
 smagesource()
+Line 30 
 smagesource()
  		fi
  	fi
- 	[[ -n ${STATE} ]] && mystate="${STATE}"
+ 	[[ -n ${STATE} ]] && localstate="${STATE}"
+ 	[[ -n ${DISTROTAG} ]] && mytag="${DISTROTAG}"
- 	# 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}"
+ 		[[ -n ${STATE} ]] && distfilestate="${STATE}"
+ 		[[ -n ${DISTROTAG} ]] && mytag="${DISTROTAG}"
+ 	fi
+ 	# now switch state and export it but do not overide any local states
+ 	if [[ ! -z ${localstate} ]]
+ 	then
+ 		STATE="${localstate}"
+ 	else
+ 		STATE="${distfilestate}"
+ 	fi
+ 	if mqueryfeature "pkgdistrotag"
+ 	then
+ 		# if DISTROTAG was not defined globally
+ 		# or in distribution file then deactivate this feature!
+ 		# at this point $mytag must have the distrotag
+ 		if [[ -z ${mytag} ]]
+ 		then
+ 			FVERBOSE=off msetfeature "!pkgdistrotag"
+ 			unset DISTROTAG
+ 			echo -e "${COLRED}Requested 'pkgdistrotag' but no \$DISTROTAG found!${COLDEFAULT}"
+ 			echo -e "${COLRED}Disabled the feature for pkgbuild sanity!${COLDEFAULT}"
+ 		else
+ 			# now switch state and export it but do not overide any local states
+ 			export DISTROTAG="${mytag}"
+ 		fi
+ 	else
+ 		unset DISTROTAG
+ 	fi
+ }
+ print_distrotag()
+ {
+ 	if FVERBOSE=off mqueryfeature "pkgdistrotag"
+ 	then
+ 		if [[ ! -z ${DISTROTAG} ]]
+ 		then
+ 			# add a point as prefix
+ 			echo ".${DISTROTAG}"
+ 		fi
  	fi
- 	# now switch state and export it
- 	STATE="${mystate}"
  }
  showversion()
-Line 247 
 mconfigure()
+Line 281 
 mconfigure()
  			fi
  		fi
- 		# always enable shared by default
+ 		# always enable shared by default but not for waf configure
- 		if [[ ! -z $(./configure --help | grep -- '--.*able-shared') ]]
+ 		if [[ ! -z $(./configure --help | grep -- '--.*able-shared') ]] &&
+ 			[[ -z $(./configure --version | grep waf) ]]
  		then
  			myopts+=" --enable-shared"
  		fi
-Line 308 
 munpack()
+Line 343 
 munpack()
  		DEST=$2
  	fi
+ 	echo -e "${COLBLUE}>>>${COLGREEN} Unpacking ${SOURCEDIR}/${PNAME}/${SRCFILE}${COLDEFAULT}"
  	[[ ! -d ${DEST} ]] && install -d ${DEST}
  	case "${SRCFILE##*.}" in
-Line 536 
 sminclude()
+Line 573 
 sminclude()
  	fi
  }
+ march()
+ {
+ 	local retval
+ 	if [[ ! -z ${ARCH} ]]
+ 	then
+ 		echo "${ARCH}"
+ 		retval=0
+ 	else
+ 		retval=1
+ 	fi
+ 	return "${retval}"
+ }
+ marchsrcfile()
+ {
+ 	local retval
+ 	local var="$1"
+ 	[[ -z ${var} ]] && var="SRCFILE"
+ 	if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
+ 	then
+ 		eval echo \$${var}_${ARCH/i*86/x86} | tr ';' '\n'
+ 		retval=0
+ 	else
+ 		retval=1
+ 	fi
+ 	return "${retval}"
+ }
+ marchsrcdir()
+ {
+ 	local retval
+ 	if [[ ! -z $(eval echo \$SRCDIR_${ARCH/i*86/x86}) ]]
+ 	then
+ 		eval echo \$SRCDIR_${ARCH/i*86/x86} | tr ';' '\n'
+ 		retval=0
+ 	else
+ 		retval=1
+ 	fi
+ 	return "${retval}"
+ }
+ marchdepend()
+ {
+ 	local retval
+ 	if [[ ! -z $(eval echo \$DEPEND_${ARCH/i*86/x86}) ]]
+ 	then
+ 		echo "\$(eval echo \\\$DEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"
+ 		retval=0
+ 	else
+ 		retval=1
+ 	fi
+ 	return "${retval}"
+ }
+ marchsdepend()
+ {
+ 	local retval
+ 	if [[ ! -z $(eval echo \$SDEPEND_${ARCH/i*86/x86}) ]]
+ 	then
+ 		echo "\$(eval echo \\\$SDEPEND_\${ARCH/i*86/x86} | tr ';' '\n')"
+ 		retval=0
+ 	else
+ 		retval=1
+ 	fi
+ 	return "${retval}"
+ }
  setup_distcc_environment()
  {
  	if [ -x /usr/bin/distcc ]
-Line 627 
 EOF
+Line 740 
 EOF
  #   STATE                 state of pkg stable|unstable|old
  #   DESCRIPTION           a short description (opt)
  #   HOMEPAGE              homepage (opt)
+ #   LICENSE               license information of the pkg (opt)
  #   DEPEND                runtime dependencies (opt)
  #   SDEPEND               adds needed deps to build the pkg (opt)
  #   PROVIDE               provides a virtual (opt)
-Line 677 
 build_mage_script()
+Line 791 
 build_mage_script()
  	> ${dest}
  	# pgkname and state
- 	echo "PKGNAME=\"${PNAME}${target}-${PVER}-\${ARCH}-${PBUILD}\"" >> ${dest}
+ 	echo "PKGNAME=\"${PNAME}${target}-${PVER}-\${ARCH}$(print_distrotag)-${PBUILD}\"" >> ${dest}
  	echo "STATE=\"${STATE}\"" >> ${dest}
  	# description and homepage
  	echo "DESCRIPTION=\"${DESCRIPTION}\"" >> ${dest}
  	echo "HOMEPAGE=\"${HOMEPAGE}\"" >> ${dest}
+ 	# license information
+ 	echo "LICENSE=\"${LICENSE}\"" >> ${dest}
  	# special tags and vars
  	echo "PKGTYPE=\"${PKGTYPE}\""  >> ${dest}
-Line 775 
 regen_mage_tree()
+Line 892 
 regen_mage_tree()
  				# get the right variables for the split
  				export PNAME="${subpackage}"
  				split_info_${subpackage}
+ 				# fix PCATEGORIE -> PCAT
+ 				if [[ ! -z ${PCATEGORIE} ]]
+ 				then
+ 					PCAT="${PCATEGORIE}"
+ 					unset PCATEGORIE
+ 				fi
  				# get the preinstall etc
  				split_export_inherits ${subpackage}
  				build_mage_script --split-pkg-base "${split_pkg_base}"
-Line 1086 
 generate_package_md5sum()
+Line 1209 
 generate_package_md5sum()
  	[ -n "${target}" ] && target="-${target}"
  	# build pkgname
- 	pkgname="${pname}${target}-${pver}-${parch}-${pbuild}"
+ 	pkgname="${pname}${target}-${pver}-${parch}$(print_distrotag)-${pbuild}"
  	# build pkg-md5-sum only if requested
  	if mqueryfeature regentree
-Line 1139 
 source_pkg_build()
+Line 1262 
 source_pkg_build()
  	[[ ! -d ${SRCPKGDIR} ]] && install -d ${SRCPKGDIR}
  	mv ${BUILDDIR}/${PNAME}-${PVER}-${PBUILD}.tar.bz2 ${SRCPKGDIR}/${PNAME}-${PVER}-${PBUILD}.${SRCPKGSUFFIX}
- 	echo -e "${COLGREEN}Source package ${COLBLUE}${PNAME}-${PVER}-${PBUILD}.${SRCPKGSUFFIX} ${COLGREEN}successfully builded.${COLDEFAULT}"
+ 	echo -e "${COLGREEN}Source package ${COLBLUE}${PNAME}-${PVER}-${PBUILD}.${SRCPKGSUFFIX} ${COLGREEN}successfully builded.${COLDEFAULT}\n"
  }
  step_by_step()

 Legend:



Removed from v.1641
 


changed lines


 
Added in v.1796
 Legend:



Removed from v.1641
 


changed lines


 
Added in v.1796
-Removed from v.1641
+Added in v.1796