Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/mage/usr/lib/mage/smage2.sh

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

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

    revision 1616 by niro, Mon Jan 9 20:11:08 2012 UTC revision 1617 by niro, Mon Jan 9 20:13:34 2012 UTC
    # Line 1143  step_by_step() Line 1143  step_by_step()
    1143   fi   fi
    1144  }  }
    1145    
    1146    resume_stamp()
    1147    {
    1148     local step="$1"
    1149     touch ${BUILDDIR}/.smage-${PKGNAME}-${step}
    1150    }
    1151    
    1152    run_resume()
    1153    {
    1154     local step="$1"
    1155    
    1156     if mqueryfeature "resume" && [[ -f ${BUILDDIR}/.smage-${PKGNAME}-${step} ]]
    1157     then
    1158     echo -e "${COLMAGENTA}${step} already processed; doing nothing${COLDEFAULT}"
    1159     return 0
    1160     else
    1161     return 1
    1162     fi
    1163    }
    1164    
    1165  # print out our version  # print out our version
    1166  showversion  showversion
    # Line 1363  then Line 1381  then
    1381   [[ ! -f ${SMAGENAME} ]] && die "Included smage2 file in src-tarball not found: ${SMAGENAME}"   [[ ! -f ${SMAGENAME} ]] && die "Included smage2 file in src-tarball not found: ${SMAGENAME}"
    1382  fi  fi
    1383    
    1384    if [ "$1" == "--resume" -a -n "$2" ]
    1385    then
    1386     msetfeature "resume"
    1387     SMAGENAME="$2"
    1388    fi
    1389    
    1390  [ ! -e ${MLIBDIR}/pkgbuild_dir.sh ] && die "Error: ${MLIBDIR}/pkgbuild_dir.sh not found. Aborting."  [ ! -e ${MLIBDIR}/pkgbuild_dir.sh ] && die "Error: ${MLIBDIR}/pkgbuild_dir.sh not found. Aborting."
    1391  [ -z "$(basename ${SMAGENAME} | grep .${SMAGESUFFIX})" ] &&  [ -z "$(basename ${SMAGENAME} | grep .${SMAGESUFFIX})" ] &&
    # Line 1424  mqueryfeature "distcc" && setup_distcc_e Line 1447  mqueryfeature "distcc" && setup_distcc_e
    1447  # setup ccache  # setup ccache
    1448  mqueryfeature "ccache" && setup_ccache_environment  mqueryfeature "ccache" && setup_ccache_environment
    1449    
    1450  # clean up builddir if a previously one exist  if mqueryfeature "resume"
     if [ -d ${BUILDDIR} ]  
    1451  then  then
    1452   rm -rf ${BUILDDIR}/* || die "couldn't cleanup \$BUILDDIR."   echo -e "${COLMAGENTA}Resume requested; continuing previous build${COLDEFAULT}"
     fi  
     install -d ${BUILDDIR} || die "couldn't create \$BUILDDIR."  
    1453    
    1454  # clean up srcdir if a previously unpacked one exist   # setup build logging
    1455  if [ -d ${SRCDIR} ]   [[ ! -d /var/log/smage ]] && install -d /var/log/smage
    1456  then   if [[ -f /var/log/smage/${PKGNAME}.log.bz2 ]]
    1457   rm -rf ${SRCDIR}   then
    1458  fi   bunzip2 -f /var/log/smage/${PKGNAME}.log.bz2
    1459     fi
    1460     echo -e "### Resume started on $(date) ###\n" >> /var/log/smage/${PKGNAME}.log
    1461    
    1462  # clean up bindir if a previous build exist or create a new one  else
    1463  if [ -d ${BINDIR} ]   # clean up builddir if a previously one exist
    1464  then   if [ -d ${BUILDDIR} ]
    1465   rm -rf ${BINDIR}   then
    1466  fi   rm -rf ${BUILDDIR}/* || die "couldn't cleanup \$BUILDDIR."
    1467  install -d ${BINDIR} || die "couldn't create \$BINDIR."   fi
    1468     install -d ${BUILDDIR} || die "couldn't create \$BUILDDIR."
    1469    
    1470  # clean up package temp dir if a previous build exist   # clean up srcdir if a previously unpacked one exist
    1471  if [ -d ${BUILDDIR}/${PKGNAME} ]   if [ -d ${SRCDIR} ]
    1472  then   then
    1473   rm -rf ${BUILDDIR}/${PKGNAME}   rm -rf ${SRCDIR}
    1474  fi   fi
    1475    
    1476  # setup build logging   # clean up bindir if a previous build exist or create a new one
    1477  [[ ! -d /var/log/smage ]] && install -d /var/log/smage   if [ -d ${BINDIR} ]
    1478  echo -e "### Build started on $(date) ###\n" > /var/log/smage/${PKGNAME}.log   then
    1479     rm -rf ${BINDIR}
    1480     fi
    1481     install -d ${BINDIR} || die "couldn't create \$BINDIR."
    1482    
    1483     # clean up package temp dir if a previous build exist
    1484     if [ -d ${BUILDDIR}/${PKGNAME} ]
    1485     then
    1486     rm -rf ${BUILDDIR}/${PKGNAME}
    1487     fi
    1488    
    1489     # setup build logging
    1490     [[ ! -d /var/log/smage ]] && install -d /var/log/smage
    1491     echo -e "### Build started on $(date) ###\n" > /var/log/smage/${PKGNAME}.log
    1492    fi
    1493    
    1494  if [[ ${PKGTYPE} = virtual ]]  if [[ ${PKGTYPE} = virtual ]]
    1495  then  then
    # Line 1460  then Line 1497  then
    1497   # automatically set !pkgbuild here too   # automatically set !pkgbuild here too
    1498   msetfeature "!pkgbuild"   msetfeature "!pkgbuild"
    1499  else  else
    1500   src_prepare | ${SMAGE_LOG_CMD}   ( run_resume src_prepare || src_prepare ) | ${SMAGE_LOG_CMD}
    1501   die_pipestatus 0 "src_prepare failed"   die_pipestatus 0 "src_prepare failed"
    1502   step_by_step $_   resume_stamp src_prepare
    1503     step_by_step src_prepare
    1504    
    1505   src_compile | ${SMAGE_LOG_CMD}   ( run_resume src_compile || src_compile ) | ${SMAGE_LOG_CMD}
    1506   die_pipestatus 0 "src_compile failed"   die_pipestatus 0 "src_compile failed"
    1507   step_by_step $_   resume_stamp src_compile
    1508     step_by_step src_compile
    1509    
    1510   # only run checks if requested   # only run checks if requested
    1511   if mqueryfeature "!check"   if mqueryfeature "!check"
    1512   then   then
    1513   echo "!check detected; src_check() will not be run!" | ${SMAGE_LOG_CMD}   echo "!check detected; src_check() will not be run!" | ${SMAGE_LOG_CMD}
      step_by_step src_check  
    1514   else   else
    1515   src_check | ${SMAGE_LOG_CMD}   ( run_resume src_check || src_check ) | ${SMAGE_LOG_CMD}
    1516   die_pipestatus 0 "src_check failed"   die_pipestatus 0 "src_check failed"
    1517   step_by_step $_   resume_stamp src_check
    1518   fi   fi
    1519     step_by_step src_check
    1520    
    1521   # build several subpackages   # build several subpackages
    1522   if [[ -n ${SPLIT_PACKAGES} ]]   if [[ -n ${SPLIT_PACKAGES} ]]
    # Line 1501  else Line 1540  else
    1540   echo -en " for subpkg: ${COLBLUE}${PNAME}${COLDEFAULT}"   echo -en " for subpkg: ${COLBLUE}${PNAME}${COLDEFAULT}"
    1541   echo -e " - basepkg: ${COLBLUE}${SPLIT_PACKAGE_BASE}${COLDEFAULT} ..."   echo -e " - basepkg: ${COLBLUE}${SPLIT_PACKAGE_BASE}${COLDEFAULT} ..."
    1542    
    1543   src_install_${subpackage} | ${SMAGE_LOG_CMD}   ( run_resume src_install_${subpackage} || src_install_${subpackage} ) | ${SMAGE_LOG_CMD}
    1544   die_pipestatus 0 "src_install_${subpackage} failed"   die_pipestatus 0 "src_install_${subpackage} failed"
    1545   step_by_step $_   resume_stamp src_install_${subpackage}
    1546     step_by_step src_install_${subpackage}
    1547   fi   fi
    1548   done   done
    1549   # restore bindir & pname   # restore bindir & pname
    # Line 1511  else Line 1551  else
    1551   # unset all saved smage variables   # unset all saved smage variables
    1552   split_unset_variables   split_unset_variables
    1553   else   else
    1554   src_install | ${SMAGE_LOG_CMD}   ( run_resume src_install || src_install ) | ${SMAGE_LOG_CMD}
    1555   die_pipestatus 0 "src_install failed"   die_pipestatus 0 "src_install failed"
    1556   step_by_step $_   resume_stamp src_install
    1557     step_by_step src_install
    1558   fi   fi
    1559  fi  fi
    1560    
    # Line 1532  else Line 1573  else
    1573   then   then
    1574   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
    1575   do   do
    1576   mcompressdocs ${BINDIR}_${subpackage}   run_resume mcompressdoc_${subpackage} || mcompressdocs ${BINDIR}_${subpackage}
    1577     resume_stamp mcompressdoc_${subpackage}
    1578   done   done
    1579   else   else
    1580   mcompressdocs ${BINDIR}   run_resume mcompressdoc || mcompressdocs ${BINDIR}
    1581     resume_stamp mcompressdoc
    1582   fi   fi
    1583  fi  fi
    1584    
    # Line 1550  then Line 1593  then
    1593   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
    1594   do   do
    1595   echo -e "${COLBLUE}===${COLGREEN} stripping libtool archives for '${subpackage}' ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping libtool archives for '${subpackage}' ...${COLDEFAULT}"
    1596   mstriplibtoolarchive ${BINDIR}_${subpackage}   run_resume mstriplibtoolarchive_${subpackage} || mstriplibtoolarchive ${BINDIR}_${subpackage}
    1597     resume_stamp mstriplibtoolarchive_${subpackage}
    1598   done   done
    1599   else   else
    1600   echo -e "${COLBLUE}===${COLGREEN} stripping libtool archives ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping libtool archives ...${COLDEFAULT}"
    1601   mstriplibtoolarchive ${BINDIR}   run_resume mstriplibtoolarchive || mstriplibtoolarchive ${BINDIR}
    1602     resume_stamp mstriplibtoolarchive
    1603   fi   fi
    1604   fi   fi
    1605  fi  fi
    # Line 1570  then Line 1615  then
    1615   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
    1616   do   do
    1617   echo -e "${COLBLUE}===${COLGREEN} purging all purge targets in '${subpackage}' ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} purging all purge targets in '${subpackage}' ...${COLDEFAULT}"
    1618   mpurgetargets ${BINDIR}_${subpackage}   run_resume mpurgetargets_${subpackage} || mpurgetargets ${BINDIR}_${subpackage}
    1619     resume_stamp mpurgetargets_${subpackage}
    1620   done   done
    1621   else   else
    1622   echo -e "${COLBLUE}===${COLGREEN} purging all purge targets ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} purging all purge targets ...${COLDEFAULT}"
    1623   mpurgetargets ${BINDIR}   run_resume mpurgetargets || mpurgetargets ${BINDIR}
    1624     resume_stamp mpurgetargets
    1625   fi   fi
    1626   fi   fi
    1627  fi  fi
    # Line 1592  else Line 1639  else
    1639   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
    1640   do   do
    1641   echo -e "${COLBLUE}===${COLGREEN} stripping binaries for '${subpackage}' ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping binaries for '${subpackage}' ...${COLDEFAULT}"
    1642   mstripbins ${BINDIR}_${subpackage}   run_resume mstripbins_${subpackage} || mstripbins ${BINDIR}_${subpackage}
    1643     resume_stamp mstripbins_${subpackage}
    1644   echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries for '${subpackage}' ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries for '${subpackage}' ...${COLDEFAULT}"
    1645   mstriplibs ${BINDIR}_${subpackage}   run_resume mstriplibs_${subpackage} || mstriplibs ${BINDIR}_${subpackage}
    1646     resume_stamp mstriplibs_${subpackage}
    1647   echo -e "${COLBLUE}===${COLGREEN} stripping static libraries for '${subpackage}' ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping static libraries for '${subpackage}' ...${COLDEFAULT}"
    1648   mstripstatic ${BINDIR}_${subpackage}   run_resume mstripstatic_${subpackage} || mstripstatic ${BINDIR}_${subpackage}
    1649     resume_stamp mstripstatic_${subpackage}
    1650   done   done
    1651   else   else
    1652   echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}"
    1653   mstripbins ${BINDIR}   run_resume mstripbins || mstripbins ${BINDIR}
    1654     resume_stamp mstripbins
    1655   echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries ...${COLDEFAULT}"
    1656   mstriplibs ${BINDIR}   run_resume mstriplibs || mstriplibs ${BINDIR}
    1657     resume_stamp mstriplibs
    1658   echo -e "${COLBLUE}===${COLGREEN} stripping static libraries ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping static libraries ...${COLDEFAULT}"
    1659   mstripstatic ${BINDIR}   run_resume mstripstatic || mstripstatic ${BINDIR}
    1660     resume_stamp mstripstatic
    1661   fi   fi
    1662  fi  fi
    1663    
    # Line 1621  else Line 1674  else
    1674   if typeset -f ${target}_pkgbuild > /dev/null   if typeset -f ${target}_pkgbuild > /dev/null
    1675   then   then
    1676   # run it   # run it
    1677   ${target}_pkgbuild   run_resume ${target}_pkgbuild || ${target}_pkgbuild
    1678     resume_stamp ${target}_pkgbuild
    1679   fi   fi
    1680   # now create the target package   # now create the target package
    1681   ${MLIBDIR}/pkgbuild_dir.sh \   run_resume pkg_builddir_${target} || ${MLIBDIR}/pkgbuild_dir.sh \
    1682   "${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD}" \   "${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD}" \
    1683   ${BINDIR} || die "target: ${target} package-build failed"   ${BINDIR} || die "target: ${target} package-build failed"
    1684     resume_stamp pkg_builddir_${target}
    1685    
    1686   # build pkg-md5-sum if requested   # build pkg-md5-sum if requested
    1687   generate_package_md5sum \   run_resume md5sum_${target} || generate_package_md5sum \
    1688   --pcat "${PCATEGORIE}" \   --pcat "${PCATEGORIE}" \
    1689   --pname "${PNAME}" \   --pname "${PNAME}" \
    1690   --pver "${PVER}" \   --pver "${PVER}" \
    1691   --pbuild "${PBUILD}" \   --pbuild "${PBUILD}" \
    1692   --parch "${ARCH}" \   --parch "${ARCH}" \
    1693   --target "${target}"   --target "${target}"
    1694     resume_stamp md5sum_${target}
    1695    
    1696   echo -e "${COLGREEN}\nPackage ${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"   echo -e "${COLGREEN}\nPackage ${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"
    1697   done   done
    # Line 1657  else Line 1713  else
    1713   if typeset -f ${PNAME}_pkgbuild > /dev/null   if typeset -f ${PNAME}_pkgbuild > /dev/null
    1714   then   then
    1715   # run it   # run it
    1716   ${PNAME}_pkgbuild   run_resume ${PNAME}_pkgbuild || ${PNAME}_pkgbuild
    1717     resume_stamp ${PNAME}_pkgbuild
    1718   fi   fi
    1719   # now create the target package   # now create the target package
    1720   ${MLIBDIR}/pkgbuild_dir.sh \   run_resume pkg_builddir_${PNAME} || ${MLIBDIR}/pkgbuild_dir.sh \
    1721   "${PNAME}-${PVER}-${ARCH}-${PBUILD}" \   "${PNAME}-${PVER}-${ARCH}-${PBUILD}" \
    1722   "${BINDIR}_${PNAME}" || die "split_package: ${PNAME} package-build failed"   "${BINDIR}_${PNAME}" || die "split_package: ${PNAME} package-build failed"
    1723     resume_stamp pkg_builddir_${PNAME}
    1724    
    1725   # build pkg-md5-sum if requested   # build pkg-md5-sum if requested
    1726   generate_package_md5sum \   run_resume md5sum_${PNAME} || generate_package_md5sum \
    1727   --pcat "${PCATEGORIE}" \   --pcat "${PCATEGORIE}" \
    1728   --pname "${PNAME}" \   --pname "${PNAME}" \
    1729   --pver "${PVER}" \   --pver "${PVER}" \
    1730   --pbuild "${PBUILD}" \   --pbuild "${PBUILD}" \
    1731   --parch "${ARCH}"   --parch "${ARCH}"
    1732     resume_stamp md5sum_${PNAME}
    1733    
    1734   echo -e "${COLGREEN}\nPackage ${PNAME}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"   echo -e "${COLGREEN}\nPackage ${PNAME}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"
    1735    
    # Line 1681  else Line 1740  else
    1740   split_unset_variables   split_unset_variables
    1741    
    1742   else   else
    1743   ${MLIBDIR}/pkgbuild_dir.sh ${PKGNAME} ${BINDIR} || die "package-build failed"   run_resume pkg_builddir || ${MLIBDIR}/pkgbuild_dir.sh ${PKGNAME} ${BINDIR} || die "package-build failed"
    1744     resume_stamp pkg_builddir
    1745    
    1746   # build pkg-md5-sum if requested   # build pkg-md5-sum if requested
    1747   generate_package_md5sum \   run_resume md5sum || generate_package_md5sum \
    1748   --pcat "${PCATEGORIE}" \   --pcat "${PCATEGORIE}" \
    1749   --pname "${PNAME}" \   --pname "${PNAME}" \
    1750   --pver "${PVER}" \   --pver "${PVER}" \
    1751   --pbuild "${PBUILD}" \   --pbuild "${PBUILD}" \
    1752   --parch "${ARCH}"   --parch "${ARCH}"
    1753     resume_stamp md5sum
    1754    
    1755   echo -e "${COLGREEN}\nPackage ${PKGNAME} successfully builded.\n${COLDEFAULT}"   echo -e "${COLGREEN}\nPackage ${PKGNAME} successfully builded.\n${COLDEFAULT}"
    1756   fi   fi
    1757    
    1758   # build src-pkg-tarball if requested   # build src-pkg-tarball if requested
    1759   mqueryfeature "srcpkg" && source_pkg_build ${SMAGENAME}   if mqueryfeature "srcpkg"
    1760     then
    1761     resume_stamp srcpkgbuild || source_pkg_build ${SMAGENAME}
    1762     resume_stamp srcpkgbuild
    1763     fi
    1764  fi  fi
    1765    
    1766  if mqueryfeature "buildlog"  if mqueryfeature "buildlog"
    Legend:
    Removed from v.1616  
    changed lines
      Added in v.1617