Magellan Linux

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

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1573 by niro, Wed Dec 28 10:41:44 2011 UTC revision 1576 by niro, Wed Dec 28 10:50:26 2011 UTC
# Line 325  download_sources() Line 325  download_sources()
325  src_prepare()  src_prepare()
326  {  {
327   echo "no src_prepare defined"   echo "no src_prepare defined"
328   sleep 2   return 0
329    }
330    
331    # dummy function, used if that does not exist in smage file
332    src_check()
333    {
334     echo "no src_check defined"
335   return 0   return 0
336  }  }
337    
# Line 333  src_prepare() Line 339  src_prepare()
339  src_compile()  src_compile()
340  {  {
341   echo "no src_compile defined"   echo "no src_compile defined"
  sleep 2  
342   return 0   return 0
343  }  }
344    
# Line 341  src_compile() Line 346  src_compile()
346  src_install()  src_install()
347  {  {
348   echo "no src_install defined"   echo "no src_install defined"
  sleep 2  
349   return 0   return 0
350  }  }
351    
# Line 1447  fi Line 1451  fi
1451  # fixes some issues with these functions  # fixes some issues with these functions
1452  export -f src_prepare || die "src_prepare export failed"  export -f src_prepare || die "src_prepare export failed"
1453  export -f src_compile || die "src_compile export failed"  export -f src_compile || die "src_compile export failed"
1454    export -f src_check || die "src_check export failed"
1455  export -f src_install || die "src_install export failed"  export -f src_install || die "src_install export failed"
1456    
1457  # fixes some compile issues  # fixes some compile issues
# Line 1464  export MAKEOPTS="${MAKEOPTS}" || die "MA Line 1469  export MAKEOPTS="${MAKEOPTS}" || die "MA
1469  # setup ccache  # setup ccache
1470  [[ ${SMAGE_USE_CCACHE} = true ]] && setup_ccache_environment  [[ ${SMAGE_USE_CCACHE} = true ]] && setup_ccache_environment
1471    
 # small sleep to show our settings  
 sleep 1  
   
1472  # clean up builddir if a previously one exist  # clean up builddir if a previously one exist
1473  if [ -d ${BUILDDIR} ]  if [ -d ${BUILDDIR} ]
1474  then  then
# Line 1493  then Line 1495  then
1495   rm -rf ${BUILDDIR}/${PKGNAME}   rm -rf ${BUILDDIR}/${PKGNAME}
1496  fi  fi
1497    
 # cleans up timestamp if one exists  
 if [ -f /var/tmp/timestamp ]  
 then  
  mage rmstamp  
 fi  
   
1498  # setup build logging  # setup build logging
1499  [[ ! -d /var/log/smage ]] && install -d /var/log/smage  [[ ! -d /var/log/smage ]] && install -d /var/log/smage
1500  echo -e "### Build started on $(date) ###\n" > /var/log/smage/${PKGNAME}.log  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}
1507  die_pipestatus 0 "src_compile failed"  die_pipestatus 0 "src_compile failed"
1508  step_by_step $_  step_by_step $_
1509    
1510    # only run checks if requested
1511    if [[ ${MAGE_CHECK} != true ]]
1512    then
1513     echo "MAGE_CHECK not requested; src_check() will not be run!" | ${SMAGE_LOG_CMD}
1514     step_by_step src_check
1515    else
1516     src_check | ${SMAGE_LOG_CMD}
1517     die_pipestatus 0 "src_check failed"
1518     step_by_step $_
1519    fi
1520    
1521  # build several subpackages  # build several subpackages
1522  if [[ -n ${SPLIT_PACKAGES} ]]  if [[ -n ${SPLIT_PACKAGES} ]]
1523  then  then

Legend:
Removed from v.1573  
changed lines
  Added in v.1576