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

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

Parent Directory | Revision Log | View Patch Patch

-revision 2590 by niro,
Fri Feb 14 09:02:18 2014 UTC
+revision 2864 by niro,
Fri Feb 13 09:58:19 2015 UTC
 Line 7
  # TODO: record dynlib, gz | xz database
- # set default user mage.rc
+ # set default variables
- : ${MAGERC="/etc/mage.rc"}
+ : ${MAGERC="@@SYSCONFDIR@@/mage.rc"}
+ : ${MLIBDIR="@@MAGELIBDIR@@"}
  # export default C locale
  export LC_ALL=C
- source /etc/mage.rc.global
+ # first of all include common functions
- source ${MAGERC}
+ source ${MLIBDIR}/common.functions.sh || exit 1
- source ${MLIBDIR}/mage4.functions.sh
+ source @@SYSCONFDIR@@/mage.rc.global || die "@@SYSCONFDIR@@/mage.rc.global missing."
- source ${MLIBDIR}/smage2.functions.sh
+ source ${MAGERC} || die "${MAGERC} missing."
+ source ${MLIBDIR}/mage4.functions.sh || die "${MLIBDIR}/mage4.functions.sh missing."
+ source ${MLIBDIR}/smage2.functions.sh || die "${MLIBDIR}/smage2.functions.sh missing."
  # export default path
  export PATH="${PATH}:${MLIBDIR}"
+ print_usage()
+ {
+ 	echo "Usage: $(basename $0) [option] pkgname ..."
+ 	echo "Options:"
+ 	echo "--smage"
+ 	echo "--src-tarball"
+ 	echo "--calc"
+ 	echo "--update"
+ 	echo "--download"
+ 	echo "--regen"
+ 	echo "--create-src-tarball"
+ 	echo "--resume"
+ 	echo
+ 	echo "Environment variables::"
+ 	echo " NOCOLORS=true $(basename $0) [src]install PACKAGE"
+ 	echo " Disables all colors in the messages."
+ 	echo
+ }
+ # very basic getops
+ for i in $*
+ do
+ 	case $1 in
+ 		--smage|*.${SMAGESUFFIX}) shift; SMAGENAME="$1" ;;
+ 		--src-tarball) shift; SRCPKGTARBALL="$1" ;;
+ 		--calc) shift; SMAGENAME="$1" ;;
+ 		--update) ;;
+ 		--download) shift; SMAGENAME="$1" ;;
+ 		--regen) shift; SMAGENAME="$1" ;;
+ 		--create-src-tarball) shift; SMAGENAME="$1" ;;
+ 		--resume) ;;
+ 	esac
+ 	shift
+ done
  ## setup ##
  SMAGENAME="$1"
- SMAGEVERSION="$(< ${MLIBDIR}/version)"
  # expand PKGDIR, BUILDDIR and BINDIR with MROOT
  if [[ -n ${MROOT} ]]
-Line 249 
 then
+Line 286 
 then
  	SMAGENAME="$2"
  fi
- [ ! -e ${MLIBDIR}/pkgbuild_dir.sh ] && die "Error: ${MLIBDIR}/pkgbuild_dir.sh not found. Aborting."
+ [ ! -e ${MLIBDIR}/pkgbuild_dir ] && die "Error: ${MLIBDIR}/pkgbuild_dir 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 ${MAGERC} correctly."
-Line 263 
 fi
+Line 300 
 fi
  smagesource ${SMAGENAME} || die "source failed"
  PKGNAME="${PNAME}-${PVER}-${ARCH}$(print_distrotag)-${PBUILD}"
  MD5DIR="$(dirname ${SMAGENAME})/md5"
- SMAGE_LOG_CMD="tee -a /var/log/smage/${PKGNAME}.log"
+ SMAGE_LOG_CMD="tee -a ${SMAGELOGDIR}/${PKGNAME}.log"
  xtitle "Compiling ${PKGNAME}"
  echo -e "${COLGREEN}Compiling ${PKGNAME}${COLDEFAULT}"
-Line 281 
 fi
+Line 318 
 fi
  mqueryfeature "srcpkgtarball" || download_sources
  # fixes some issues with these functions
+ export -f pkg_setup || die "pkg_setup export failed"
  export -f src_prepare || die "src_prepare export failed"
  export -f src_compile || die "src_compile export failed"
  export -f src_check || die "src_check export failed"
-Line 315 
 then
+Line 353 
 then
  	echo -e "${COLMAGENTA}Resume requested; continuing previous build${COLDEFAULT}"
  	# setup build logging
- 	[[ ! -d /var/log/smage ]] && install -d /var/log/smage
+ 	[[ ! -d ${SMAGELOGDIR} ]] && install -d ${SMAGELOGDIR}
- 	if [[ -f /var/log/smage/${PKGNAME}.log.bz2 ]]
+ 	if [[ -f ${SMAGELOGDIR}/${PKGNAME}.log.bz2 ]]
  	then
- 		bunzip2 -f /var/log/smage/${PKGNAME}.log.bz2
+ 		bunzip2 -f ${SMAGELOGDIR}/${PKGNAME}.log.bz2
  	fi
- 	echo -e "### Resume started on $(date) ###\n" >> /var/log/smage/${PKGNAME}.log
+ 	echo -e "### Resume started on $(date) ###\n" >> ${SMAGELOGDIR}/${PKGNAME}.log
  else
  	# clean up builddir if a previously one exist
-Line 356 
 else
+Line 394 
 else
  	fi
  	# setup build logging
- 	[[ ! -d /var/log/smage ]] && install -d /var/log/smage
+ 	[[ ! -d ${SMAGELOGDIR} ]] && install -d ${SMAGELOGDIR}
- 	echo -e "### Build started on $(date) ###\n" > /var/log/smage/${PKGNAME}.log
+ 	echo -e "### Build started on $(date) ###\n" > ${SMAGELOGDIR}/${PKGNAME}.log
  fi
  if [[ ${PKGTYPE} = virtual ]]
-Line 366 
 then
+Line 404 
 then
  	# automatically set !pkgbuild here too
  	msetfeature "!pkgbuild"
  else
- 	( run_resume src_prepare || src_prepare ) | ${SMAGE_LOG_CMD}
+ 	( run_resume pkg_setup || pkg_setup ) |& ${SMAGE_LOG_CMD}
+ 	die_pipestatus 0 "pkg_setup failed"
+ 	resume_stamp pkg_setup
+ 	step_by_step pkg_setup
+ 	( run_resume src_prepare || src_prepare ) |& ${SMAGE_LOG_CMD}
  	die_pipestatus 0 "src_prepare failed"
  	resume_stamp src_prepare
  	step_by_step src_prepare
- 	( run_resume src_compile || src_compile ) | ${SMAGE_LOG_CMD}
+ 	( run_resume src_compile || src_compile ) |& ${SMAGE_LOG_CMD}
  	die_pipestatus 0 "src_compile failed"
  	resume_stamp src_compile
  	step_by_step src_compile
-Line 379 
 else
+Line 422 
 else
  	# only run checks if requested
  	if mqueryfeature "!check"
  	then
- 		echo "!check detected; src_check() will not be run!" | ${SMAGE_LOG_CMD}
+ 		echo "!check detected; src_check() will not be run!" |& ${SMAGE_LOG_CMD}
  	else
- 		( run_resume src_check || src_check ) | ${SMAGE_LOG_CMD}
+ 		( run_resume src_check || src_check ) |& ${SMAGE_LOG_CMD}
  		die_pipestatus 0 "src_check failed"
  		resume_stamp src_check
  	fi
-Line 422 
 else
+Line 465 
 else
  					echo -en " for subpkg: ${COLBLUE}${PNAME}${COLDEFAULT}"
  					echo -e " - basepkg: ${COLBLUE}${SPLIT_PACKAGE_BASE}${COLDEFAULT} ..."
- 					( run_resume src_install_${subpackage} || src_install_${subpackage} ) | ${SMAGE_LOG_CMD}
+ 					( run_resume src_install_${subpackage} || src_install_${subpackage} ) |& ${SMAGE_LOG_CMD}
  					die_pipestatus 0 "src_install_${subpackage} failed"
  					resume_stamp src_install_${subpackage}
  					step_by_step src_install_${subpackage}
-Line 434 
 else
+Line 477 
 else
  		# unset all saved smage variables
  		split_unset_variables
  	else
- 		( run_resume src_install || src_install ) | ${SMAGE_LOG_CMD}
+ 		( run_resume src_install || src_install ) |& ${SMAGE_LOG_CMD}
  		die_pipestatus 0 "src_install failed"
  		resume_stamp src_install
  		step_by_step src_install
-Line 471 
 else
+Line 514 
 else
  				echo -e "!compressdoc detected; documentation of '${subpackage}' will not be compressed ..."
  			elif mqueryfeature "!pkgbuild"
  			then
- 					echo "!pkgbuild detected; skipping documentation compression for '${subpackage}' ..."
+ 				echo "!pkgbuild detected; skipping documentation compression for '${subpackage}' ..."
  			else
- 						run_resume post-mcompressdoc_${subpackage} || mcompressdocs ${BINDIR}_${subpackage}
+ 				run_resume post-mcompressdoc_${subpackage} || mcompressdocs ${BINDIR}_${subpackage}
- 						resume_stamp post-mcompressdoc_${subpackage}
+ 				resume_stamp post-mcompressdoc_${subpackage}
  			fi
  			# restore smage environment
  			split_restore_variables
-Line 719 
 else
+Line 762 
 else
  					resume_stamp post-${PNAME}_pkgbuild
  				fi
  				# now create the target package
- 				run_resume post-pkg_builddir_${PNAME} || ${MLIBDIR}/pkgbuild_dir.sh \
+ 				run_resume post-pkg_builddir_${PNAME} || ${MLIBDIR}/pkgbuild_dir \
  					"${PNAME}-${PVER}-${ARCH}$(print_distrotag)-${PBUILD}" \
  					"${BINDIR}_${PNAME}" || die "split_package: ${PNAME} package-build failed"
  				resume_stamp post-pkg_builddir_${PNAME}
-Line 742 
 else
+Line 785 
 else
  			split_unset_variables
  		else
- 			run_resume post-pkg_builddir || ${MLIBDIR}/pkgbuild_dir.sh ${PKGNAME} ${BINDIR} || die "package-build failed"
+ 			run_resume post-pkg_builddir || ${MLIBDIR}/pkgbuild_dir ${PKGNAME} ${BINDIR} || die "package-build failed"
  			resume_stamp post-pkg_builddir
  			# build pkg-md5-sum if requested
-Line 770 
 regen_mage_tree
+Line 813 
 regen_mage_tree
  if mqueryfeature "buildlog"
  then
- 	bzip2 -9f /var/log/smage/${PKGNAME}.log
+ 	bzip2 -9f ${SMAGELOGDIR}/${PKGNAME}.log
  else
- 	[[ -f /var/log/smage/${PKGNAME}.log ]] && rm /var/log/smage/${PKGNAME}.log
+ 	[[ -f ${SMAGELOGDIR}/${PKGNAME}.log ]] && rm ${SMAGELOGDIR}/${PKGNAME}.log
  fi
  xtitleclean

 Legend:



Removed from v.2590
 


changed lines


 
Added in v.2864
 Legend:



Removed from v.2590
 


changed lines


 
Added in v.2864
-Removed from v.2590
+Added in v.2864