/[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 408 by niro,
Fri Dec 29 23:47:41 2006 UTC
+revision 427 by niro,
Fri Feb 23 14:42:17 2007 UTC
 Line 4
  # needs pkgbuild_dir (mage)
  # SMAGE2
- # $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.47 2006-12-29 23:47:41 niro Exp $
+ # $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.52 2007-02-23 14:42:17 niro Exp $
  #01.10.2004
  #	added ccache support
  #	added distcc support
+ # set default user mage.rc
+ : ${MAGERC="/etc/mage.rc"}
  ## setup ##
  PKGSUFFIX="mpk"
  SRCPKGSUFFIX="mpks"
-Line 45 
 fi
+Line 48 
 fi
  # export default C locale
  export LC_ALL=C
- source /etc/mage.rc
+ source ${MAGERC}
  # set PKGDIR and BUILDDIR and BINDIR to MROOT
  if [[ -n ${MROOT} ]]
-Line 64 
 showversion()
+Line 67 
 showversion()
  die()
  {
  	xtitleclean
+ 	echo -e ${COLRED}"Exited ${BASH_SOURCE} at line no ${BASH_LINENO}."${COLDEFAULT}
  	echo "SMAGE failed: $@"
  	exit 1
  }
-Line 311 
 munpack()
+Line 315 
 munpack()
  		DEST=$2
  	fi
+ 	[[ ! -d ${DEST} ]] && install -d ${DEST}
  	case "${SRCFILE##*.}" in
  		bz2)
  			IFTAR="$(basename $SRCFILE .bz2)"
-Line 445 
 fix_mage_deps()
+Line 451 
 fix_mage_deps()
  		# fix DEPEND
  		while read sym dep
  		do
+ 			# ignore empty lines
+ 			[[ -z ${dep} ]] && continue
  			cat="$(dirname ${dep})"
  			# change if not virtual
  			if [[ ${cat} = virtual ]]
-Line 533 
 build_mage_script()
+Line 542 
 build_mage_script()
  	> ${dest}
  	# header
- 	echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.47 2006-12-29 23:47:41 niro Exp $' >> ${dest}
+ 	echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.52 2007-02-23 14:42:17 niro Exp $' >> ${dest}
  	echo  >> ${dest}
  	# pgkname and state
-Line 769 
 source_pkg_build()
+Line 778 
 source_pkg_build()
  		return 0
  	fi
- 	[ -z "${SRCPKGDIR}" ] && die "\$SRCPKGDIR not found. Please setup your mage.rc correctly."
+ 	[ -z "${SRCPKGDIR}" ] && die "\$SRCPKGDIR not found. Please setup your ${MAGERC} correctly."
  	echo -e "${COLGREEN}Creating source package tarball ... ${COLDEFAULT}"
+ 	# include the smage2 file
+ 	cp ${SMAGENAME} ${SOURCEDIR}/${PNAME}
  	( cd ${SOURCEDIR}; tar cvjf ${BUILDDIR}/${PNAME}-${PVER}-${PBUILD}.tar.bz2 ${PNAME}; )
  	[[ ! -d ${SRCPKGDIR} ]] && install -d ${SRCPKGDIR}
  	mv ${BUILDDIR}/${PNAME}-${PVER}-${PBUILD}.tar.bz2 ${SRCPKGDIR}/${PNAME}-${PVER}-${PBUILD}.${SRCPKGSUFFIX}
-Line 911 
 then
+Line 924 
 then
  	exit 0
  fi
- if [ "$1" == "only-src-pkg" -a -n "$2" ]
+ if [ "$1" == "--create-src-tarball" -a -n "$2" ]
  then
  	# set correct SMAGENAME
  	SMAGENAME="$2"
  	MD5DIR="$(dirname ${SMAGENAME})/md5"
- 	echo -e "${COLGREEN}only-src-pkg called for ${COLBLUE}${SMAGENAME}${COLGREEN} ...${COLDEFAULT}"
+ 	echo -e "${COLGREEN}create-src-tarball called for ${COLBLUE}${SMAGENAME}${COLGREEN} ...${COLDEFAULT}"
  	source ${SMAGENAME} || die "regen: smage2 not found"
-Line 934 
 fi
+Line 947 
 fi
  if [ "$1" == "--src-tarball" -a -n "$2" ] || [ "$1" == "-st" -a -n "$2" ]
  then
- 	# set correct SMAGENAME
+ 	SRCPKGTARBALL="${2}"
- 	SMAGENAME="$2"
- 	SRCPKGTARBALL="${SRCPKGDIR}/$(basename ${SMAGENAME} .${SMAGESUFFIX}).${SRCPKGSUFFIX}"
  	USE_SRC_PKG_TARBALL=true
+ 	# abort if given file is not a source pkg
+ 	[[ ${SRCPKGTARBALL##*.} != ${SRCPKGSUFFIX} ]] && die "${SRCPKGTARBALL} is not a valid src-pkg file."
+ 	# set correct SMAGENAME; use the one that the src_pkg provide
+ 	# /path/to/SOURCEDIR/PNAME/SMAGENAME
+ 	SMAGENAME="${SOURCEDIR}/$(basename ${SRCPKGTARBALL%-*-*})/$(basename ${SRCPKGTARBALL} .${SRCPKGSUFFIX}).${SMAGESUFFIX}"
  	echo -e "${COLGREEN}Using src-tarball ${COLBLUE}${SRCPKGTARBALL}${COLGREEN} ...${COLDEFAULT}"
  	[[ ! -d ${SOURCEDIR} ]] && install -d ${SOURCEDIR}
-Line 947 
 then
+Line 965 
 then
  	[[ ! -f ${SRCPKGTARBALL} ]] && die "Error: ${SRCPKGTARBALL} does not exist. Aborting."
  	tar xvjf ${SRCPKGTARBALL} -C ${SOURCEDIR} || die  "Error unpackung src-tarball ${SRCPKGTARBALL}"
+ 	[[ ! -f ${SMAGENAME} ]] && die "Included smage2 file in src-tarball not found: ${SMAGENAME}"
  fi
  [ ! -e ${MLIBDIR}/pkgbuild_dir.sh ] && die "Error: ${MLIBDIR}/pkgbuild_dir.sh not found. Aborting."
  [ -z "$(basename ${SMAGENAME} | grep .${SMAGESUFFIX})" ] &&
  	die "File '$(basename ${SMAGENAME})' is not a sMage v${SMAGEVERSION} file. Aborting."
- [ -z "${SOURCEDIR}" ] && die "\$SOURCEDIR not found. Please setup your mage.rc correctly."
+ [ -z "${SOURCEDIR}" ] && die "\$SOURCEDIR not found. Please setup your ${MAGERC} correctly."
- [ -z "${SMAGESCRIPTSDIR}" ] && die "\$SMAGESCRIPTSDIR not found. Please setup your mage.rc correctly."
+ [ -z "${SMAGESCRIPTSDIR}" ] && die "\$SMAGESCRIPTSDIR not found. Please setup your ${MAGERC} correctly."
- [ -z "${SMAGE2RSYNC}" ] && die "\$SMAGE2RSYNC not found. Please setup your mage.rc correctly."
+ [ -z "${SMAGE2RSYNC}" ] && die "\$SMAGE2RSYNC not found. Please setup your ${MAGERC} correctly."
- [ -z "${BINDIR}" ] && die "no BINDIR variable found in /etc/mage.rc"
+ [ -z "${BINDIR}" ] && die "no BINDIR variable found in ${MAGERC}"
- [ -z "${CHOST}" ] && die "no CHOST variable found in /etc/mage.rc"
+ [ -z "${CHOST}" ] && die "no CHOST variable found in ${MAGERC}"
- [ -z "${CFLAGS}" ] && die "no CFLAGS variable found in /etc/mage.rc"
+ [ -z "${CFLAGS}" ] && die "no CFLAGS variable found in ${MAGERC}"
- [ -z "${CXXFLAGS}" ] && die "no CXXFLAGS variable found in /etc/mage.rc"
+ [ -z "${CXXFLAGS}" ] && die "no CXXFLAGS variable found in ${MAGERC}"
  source ${SMAGENAME} || die "source failed"
  PKGNAME="${PNAME}-${PVER}-${ARCH}-${PBUILD}"

 Legend:



Removed from v.408
 


changed lines


 
Added in v.427
 Legend:



Removed from v.408
 


changed lines


 
Added in v.427
-Removed from v.408
+Added in v.427