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

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

Parent Directory | Revision Log | View Patch Patch

-revision 1346 by niro,
Sat Jun  4 09:20:09 2011 UTC
+revision 1543 by niro,
Tue Dec 20 16:06:13 2011 UTC
 Line 71 
 smagesource()
  	source ${file}
  	[[ -n ${STATE} ]] && mystate="${STATE}"
+ 	# 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
-Line 462 
 munpack()
+Line 469 
 munpack()
  				popd > /dev/null
  			fi
  			;;
+ 		xz)
+ 			IFTAR="$(basename $SRCFILE .xz)"
+ 			IFTAR="${IFTAR##*.}"
+ 			if [[ ${IFTAR} = tar ]]
+ 			then
+ 				tar --no-same-owner -xvJf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".tar.xz unpack failed."
+ 			else
+ 				pushd ${DEST} > /dev/null
+ 				xzcat ${SOURCEDIR}/${PNAME}/${SRCFILE} > ${DEST}/$(basename ${SRCFILE} .xz) || die ".xz unpack failed."
+ 				popd > /dev/null
+ 			fi
+ 			;;
  		tbz2|mpks|mpk)
  			tar --no-same-owner -xvjf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".tbz2 unpack failed."
  			;;
  		tgz)
  			tar --no-same-owner -xvzf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".tgz unpack failed."
  			;;
+ 		txz|mpkzs|mpkz)
+ 			tar --no-same-owner -xvJf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".txz unpack failed."
+ 			;;
  		rar)
  			unrar x ${SOURCEDIR}/${PNAME}/${SRCFILE} ${DEST}  || die ".rar unpack failed."
  			;;
-Line 521 
 mpatch()
+Line 543 
 mpatch()
  mlibtoolize()
  {
  	local opts="$@"
- 	[[ -z ${opts} ]] && opts="--copy --force"
+ 	[[ -z ${opts} ]] && opts="--verbose --install --force"
  	libtoolize ${opts} || die "running: mlibtoolize ${opts}"
  }
-Line 561 
 mstriplibs()
+Line 583 
 mstriplibs()
  	local stripdir="$@"
  	[ -z "${stripdir}" ] && stripdir=${BINDIR}
- 	find ${stripdir} | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+ 	find ${stripdir} | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip ${STRIP_DYN_LIB} 2> /dev/null
  }
  mstripbins()
-Line 569 
 mstripbins()
+Line 591 
 mstripbins()
  	local stripdir="$@"
  	[ -z "${stripdir}" ] && stripdir=${BINDIR}
- 	find ${stripdir} | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+ 	find ${stripdir} | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip ${STRIP_DYN_BIN} 2> /dev/null
+ }
+ mstripstatic()
+ {
+ 	local stripdir="$@"
+ 	[ -z "${stripdir}" ] && stripdir=${BINDIR}
+ 	find ${stripdir} | xargs file | grep "ar archive" | cut -f 1 -d : | xargs strip ${STRIP_STATIC_LIB} 2> /dev/null
  }
  mcompressdocs()
-Line 744 
 build_mage_script()
+Line 774 
 build_mage_script()
  	# now build the mage file
  	> ${dest}
- 	# header
- 	echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.62 2007-11-28 10:47:50 niro Exp $' >> ${dest}
- 	echo  >> ${dest}
  	# pgkname and state
  	echo "PKGNAME=\"${PNAME}${target}-${PVER}-\${ARCH}-${PBUILD}\"" >> ${dest}
  	echo "STATE=\"${STATE}\"" >> ${dest}
- 	echo >> ${dest}
  	# description and homepage
  	echo "DESCRIPTION=\"${DESCRIPTION}\"" >> ${dest}
  	echo "HOMEPAGE=\"${HOMEPAGE}\"" >> ${dest}
- 	echo >> ${dest}
  	# special tags and vars
  	echo "PKGTYPE=\"${PKGTYPE}\""  >> ${dest}
  	# echo MAGE_TARGETS ## note -target is needed !
  	echo "MAGE_TARGETS=\"${target}\"" >> ${dest}
- 	echo >> ${dest}
  	# split package base
  	echo "SPLIT_PACKAGE_BASE=\"${split_pkg_base}\"" >> ${dest}
- 	echo >> ${dest}
  	# add special vars
  	if [ -n "${SPECIAL_VARS}" ]
-Line 778 
 build_mage_script()
+Line 800 
 build_mage_script()
  			# being tricky here :)
  			echo "${i}=\"$(eval echo \$${i})\"" >> ${dest}
  		done
- 		echo  >> ${dest}
  	fi
  	# add at least all includes
-Line 790 
 build_mage_script()
+Line 811 
 build_mage_script()
  		do
  			echo -n " ${i}"  >> ${dest}
  		done
- 		echo  >> ${dest}
+ 		# a CRLF is needed here!
+ 		echo >> ${dest}
  	fi
- 	echo >> ${dest}
  	# 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}
  	# add special functions
  	if [ -n "${SPECIAL_FUNCTIONS}" ]
-Line 810 
 build_mage_script()
+Line 828 
 build_mage_script()
  		do
  			# add to mage (quotes needed !)
  			typeset -f "${i}" >> ${dest}
- 			echo >> ${dest}
  			# unset to be safe (quotes needed !)
  			#unset "${i}" <-- later to get every target built
  		done
- 		echo  >> ${dest}
  	fi
  	# pre|post-install|removes
  	typeset -f preinstall >> ${dest}
- 	echo  >> ${dest}
  	typeset -f postinstall >> ${dest}
- 	echo  >> ${dest}
  	typeset -f preremove >> ${dest}
- 	echo  >> ${dest}
  	typeset -f postremove >> ${dest}
- 	echo  >> ${dest}
  }
  regen_mage_tree()
  {
- 	local i
+ 	local subpackage
  	# build them only if requested
  	if [[ ${REGEN_MAGE_TREE} = true ]]
-Line 841 
 regen_mage_tree()
+Line 853 
 regen_mage_tree()
  			# build for each target a mage file
  			# run it with several targets
  			echo
- 			for i in ${MAGE_TARGETS}
+ 			for subpackage in ${MAGE_TARGETS}
  			do
- 				build_mage_script --target "${i}"
+ 				build_mage_script --target "${subpackage}"
  			done
  			echo
-Line 856 
 regen_mage_tree()
+Line 868 
 regen_mage_tree()
  			# build for each subpackage a mage file
  			# run it with several targets
  			echo
- 			for i in ${SPLIT_PACKAGES}
+ 			for subpackage in ${SPLIT_PACKAGES}
  			do
  				# get the right variables for the split
- 				export PNAME="${i}"
+ 				export PNAME="${subpackage}"
- 				split_info_${i}
+ 				split_info_${subpackage}
+ 				# get the preinstall etc
+ 				split_export_inherits ${subpackage}
  				build_mage_script --split-pkg-base "${split_pkg_base}"
+ 				# delete split preinstall etc
+ 				split_delete_inherits ${subpackage}
  				# restore smage environment
  				split_restore_variables
  			done
-Line 1047 
 split_unset_variables()
+Line 1063 
 split_unset_variables()
  	unset -f SAVED_postremove
  }
+ split_export_inherits()
+ {
+ 	local subpackage="$1"
+ 	local func
+ 	local newfunc
+ 	for func in preinstall postinstall preremove postremove
+ 	do
+ 		if [[ ! -z $(typeset -f ${func}_${subpackage}) ]]
+ 		then
+ 			newfunc=$(typeset -f ${func}_${subpackage})
+ 			newfunc="${newfunc/_${subpackage} (/ (}"
+ 			eval "${newfunc}"
+ 		fi
+ 	done
+ }
+ split_delete_inherits()
+ {
+ 	 local subpackage="$1"
+ 	 local func
+ 	for func in preinstall postinstall preremove postremove
+ 	do
+ 		if [[ ! -z $(typeset -f ${func}_${subpackage}) ]]
+ 		then
+ 			unset -f ${func}
+ 		fi
+ 	done
+  }
  export_inherits()
  {
  	local include="$1"
-Line 1556 
 case ${NOSTRIP} in
+Line 1603 
 case ${NOSTRIP} in
  			do
  				echo -e "${COLBLUE}===${COLGREEN} stripping binaries for '${subpackage}' ...${COLDEFAULT}"
  				mstripbins ${BINDIR}_${subpackage}
- 				echo -e "${COLBLUE}===${COLGREEN} stripping libraries for '${subpackage}' ...${COLDEFAULT}"
+ 				echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries for '${subpackage}' ...${COLDEFAULT}"
  				mstriplibs ${BINDIR}_${subpackage}
+ 				echo -e "${COLBLUE}===${COLGREEN} stripping static libraries for '${subpackage}' ...${COLDEFAULT}"
+ 				mstripstatic ${BINDIR}_${subpackage}
  			done
  		else
  				echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}"
  				mstripbins ${BINDIR}
- 				echo -e "${COLBLUE}===${COLGREEN} stripping libraries ...${COLDEFAULT}"
+ 				echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries ...${COLDEFAULT}"
  				mstriplibs ${BINDIR}
+ 				echo -e "${COLBLUE}===${COLGREEN} stripping static libraries ...${COLDEFAULT}"
+ 				mstripstatic ${BINDIR}
  		fi
  		;;
  esac

 Legend:



Removed from v.1346
 


changed lines


 
Added in v.1543
 Legend:



Removed from v.1346
 


changed lines


 
Added in v.1543
-Removed from v.1346
+Added in v.1543