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

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

Parent Directory | Revision Log | View Patch Patch

-revision 1572 by niro,
Wed Dec 28 10:31:45 2011 UTC
+revision 1577 by niro,
Wed Dec 28 10:51:52 2011 UTC
 Line 321 
 download_sources()
  	unset SRC_URI
  }
- # dummy function, used if that not exist in smage file
+ # dummy function, used if that does not exist in smage file
  src_prepare()
  {
  	echo "no src_prepare defined"
- 	sleep 2
  	return 0
  }
- # dummy function, used if that not exist in smage file
+ # dummy function, used if that does not exist in smage file
  src_compile()
  {
  	echo "no src_compile defined"
- 	sleep 2
  	return 0
  }
- # dummy function, used if that not exist in smage file
+ # dummy function, used if that does not exist in smage file
+ src_check()
+ {
+ 	echo "no src_check defined"
+ 	return 0
+ }
+ # dummy function, used if that does not exist in smage file
  src_install()
  {
  	echo "no src_install defined"
- 	sleep 2
  	return 0
  }
-Line 1447 
 fi
+Line 1451 
 fi
  # 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_check || die "src_check export failed"
  export -f src_install || die "src_install export failed"
  # fixes some compile issues
-Line 1464 
 export MAKEOPTS="${MAKEOPTS}" || die "MA
+Line 1469 
 export MAKEOPTS="${MAKEOPTS}" || die "MA
  # setup ccache
  [[ ${SMAGE_USE_CCACHE} = true ]] && setup_ccache_environment
- # small sleep to show our settings
+ # clean up builddir if a previously one exist
- sleep 1
- # 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
+ # clean up srcdir if a previously unpacked one exist
  if [ -d ${SRCDIR} ]
  then
  	rm -rf ${SRCDIR}
  fi
- # cleans up bindir if a previous build exists or creates a new one
+ # clean up bindir if a previous build exist or create a new one
  if [ -d ${BINDIR} ]
  then
  	rm -rf ${BINDIR}
-Line 1493 
 then
+Line 1495 
 then
  	rm -rf ${BUILDDIR}/${PKGNAME}
  fi
- # cleans up timestamp if one exists
+ # setup build logging
- if [ -f /var/tmp/timestamp ]
- then
- 	mage rmstamp
- fi
- # setup build loggins
  [[ ! -d /var/log/smage ]] && install -d /var/log/smage
  echo -e "### Build started on $(date) ###\n" > /var/log/smage/${PKGNAME}.log
-Line 1511 
 src_compile | ${SMAGE_LOG_CMD}
+Line 1507 
 src_compile | ${SMAGE_LOG_CMD}
  die_pipestatus 0 "src_compile failed"
  step_by_step $_
+ # only run checks if requested
+ if [[ ${MAGE_CHECK} != true ]]
+ then
+ 	echo "MAGE_CHECK not requested; src_check() will not be run!" | ${SMAGE_LOG_CMD}
+ 	step_by_step src_check
+ else
+ 	src_check | ${SMAGE_LOG_CMD}
+ 	die_pipestatus 0 "src_check failed"
+ 	step_by_step $_
+ fi
  # build several subpackages
  if [[ -n ${SPLIT_PACKAGES} ]]
  then
-Line 1599 
 case ${NOPKGBUILD} in
+Line 1606 
 case ${NOPKGBUILD} in
  		then
  			for target in ${MAGE_TARGETS}
  			do
- 				# check if an special target_pkgbuild exists
+ 				# check if a special target_pkgbuild exists
  				if typeset -f ${target}_pkgbuild > /dev/null
  				then
  					# run it

 Legend:



Removed from v.1572
 


changed lines


 
Added in v.1577
 Legend:



Removed from v.1572
 


changed lines


 
Added in v.1577
-Removed from v.1572
+Added in v.1577