Magellan Linux

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

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

revision 1635 by niro, Fri Jan 13 13:26:43 2012 UTC revision 1636 by niro, Fri Jan 13 13:32:22 2012 UTC
# Line 1599  else Line 1599  else
1599   then   then
1600   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
1601   do   do
1602   run_resume mcompressdoc_${subpackage} || mcompressdocs ${BINDIR}_${subpackage}   run_resume post-mcompressdoc_${subpackage} || mcompressdocs ${BINDIR}_${subpackage}
1603   resume_stamp mcompressdoc_${subpackage}   resume_stamp post-mcompressdoc_${subpackage}
1604   done   done
1605   else   else
1606   run_resume mcompressdoc || mcompressdocs ${BINDIR}   run_resume post-mcompressdoc || mcompressdocs ${BINDIR}
1607   resume_stamp mcompressdoc   resume_stamp post-mcompressdoc
1608   fi   fi
1609  fi  fi
1610    
# Line 1619  then Line 1619  then
1619   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
1620   do   do
1621   echo -e "${COLBLUE}===${COLGREEN} stripping libtool archives for '${subpackage}' ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping libtool archives for '${subpackage}' ...${COLDEFAULT}"
1622   run_resume mstriplibtoolarchive_${subpackage} || mstriplibtoolarchive ${BINDIR}_${subpackage}   run_resume post-mstriplibtoolarchive_${subpackage} || mstriplibtoolarchive ${BINDIR}_${subpackage}
1623   resume_stamp mstriplibtoolarchive_${subpackage}   resume_stamp post-mstriplibtoolarchive_${subpackage}
1624   done   done
1625   else   else
1626   echo -e "${COLBLUE}===${COLGREEN} stripping libtool archives ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping libtool archives ...${COLDEFAULT}"
1627   run_resume mstriplibtoolarchive || mstriplibtoolarchive ${BINDIR}   run_resume post-mstriplibtoolarchive || mstriplibtoolarchive ${BINDIR}
1628   resume_stamp mstriplibtoolarchive   resume_stamp post-mstriplibtoolarchive
1629   fi   fi
1630   fi   fi
1631  fi  fi
# Line 1641  then Line 1641  then
1641   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
1642   do   do
1643   echo -e "${COLBLUE}===${COLGREEN} purging all purge targets in '${subpackage}' ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} purging all purge targets in '${subpackage}' ...${COLDEFAULT}"
1644   run_resume mpurgetargets_${subpackage} || mpurgetargets ${BINDIR}_${subpackage}   run_resume post-mpurgetargets_${subpackage} || mpurgetargets ${BINDIR}_${subpackage}
1645   resume_stamp mpurgetargets_${subpackage}   resume_stamp post-mpurgetargets_${subpackage}
1646   done   done
1647   else   else
1648   echo -e "${COLBLUE}===${COLGREEN} purging all purge targets ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} purging all purge targets ...${COLDEFAULT}"
1649   run_resume mpurgetargets || mpurgetargets ${BINDIR}   run_resume post-mpurgetargets || mpurgetargets ${BINDIR}
1650   resume_stamp mpurgetargets   resume_stamp post-mpurgetargets
1651   fi   fi
1652   fi   fi
1653  fi  fi
# Line 1665  else Line 1665  else
1665   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
1666   do   do
1667   echo -e "${COLBLUE}===${COLGREEN} stripping binaries for '${subpackage}' ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping binaries for '${subpackage}' ...${COLDEFAULT}"
1668   run_resume mstripbins_${subpackage} || mstripbins ${BINDIR}_${subpackage}   run_resume post-mstripbins_${subpackage} || mstripbins ${BINDIR}_${subpackage}
1669   resume_stamp mstripbins_${subpackage}   resume_stamp post-mstripbins_${subpackage}
1670   echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries for '${subpackage}' ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries for '${subpackage}' ...${COLDEFAULT}"
1671   run_resume mstriplibs_${subpackage} || mstriplibs ${BINDIR}_${subpackage}   run_resume post-mstriplibs_${subpackage} || mstriplibs ${BINDIR}_${subpackage}
1672   resume_stamp mstriplibs_${subpackage}   resume_stamp post-mstriplibs_${subpackage}
1673   echo -e "${COLBLUE}===${COLGREEN} stripping static libraries for '${subpackage}' ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping static libraries for '${subpackage}' ...${COLDEFAULT}"
1674   run_resume mstripstatic_${subpackage} || mstripstatic ${BINDIR}_${subpackage}   run_resume post-mstripstatic_${subpackage} || mstripstatic ${BINDIR}_${subpackage}
1675   resume_stamp mstripstatic_${subpackage}   resume_stamp post-mstripstatic_${subpackage}
1676   done   done
1677   else   else
1678   echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}"
1679   run_resume mstripbins || mstripbins ${BINDIR}   run_resume post-mstripbins || mstripbins ${BINDIR}
1680   resume_stamp mstripbins   resume_stamp post-mstripbins
1681   echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries ...${COLDEFAULT}"
1682   run_resume mstriplibs || mstriplibs ${BINDIR}   run_resume post-mstriplibs || mstriplibs ${BINDIR}
1683   resume_stamp mstriplibs   resume_stamp post-mstriplibs
1684   echo -e "${COLBLUE}===${COLGREEN} stripping static libraries ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping static libraries ...${COLDEFAULT}"
1685   run_resume mstripstatic || mstripstatic ${BINDIR}   run_resume post-mstripstatic || mstripstatic ${BINDIR}
1686   resume_stamp mstripstatic   resume_stamp post-mstripstatic
1687   fi   fi
1688  fi  fi
1689    
# Line 1700  else Line 1700  else
1700   if typeset -f ${target}_pkgbuild > /dev/null   if typeset -f ${target}_pkgbuild > /dev/null
1701   then   then
1702   # run it   # run it
1703   run_resume ${target}_pkgbuild || ${target}_pkgbuild   run_resume post-${target}_pkgbuild || ${target}_pkgbuild
1704   resume_stamp ${target}_pkgbuild   resume_stamp post-${target}_pkgbuild
1705   fi   fi
1706   # now create the target package   # now create the target package
1707   run_resume pkg_builddir_${target} || ${MLIBDIR}/pkgbuild_dir.sh \   run_resume post-pkg_builddir_${target} || ${MLIBDIR}/pkgbuild_dir.sh \
1708   "${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD}" \   "${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD}" \
1709   ${BINDIR} || die "target: ${target} package-build failed"   ${BINDIR} || die "target: ${target} package-build failed"
1710   resume_stamp pkg_builddir_${target}   resume_stamp post-pkg_builddir_${target}
1711    
1712   # build pkg-md5-sum if requested   # build pkg-md5-sum if requested
1713   run_resume md5sum_${target} || generate_package_md5sum \   run_resume post-md5sum_${target} || generate_package_md5sum \
1714   --pcat "${PCATEGORIE}" \   --pcat "${PCATEGORIE}" \
1715   --pname "${PNAME}" \   --pname "${PNAME}" \
1716   --pver "${PVER}" \   --pver "${PVER}" \
1717   --pbuild "${PBUILD}" \   --pbuild "${PBUILD}" \
1718   --parch "${ARCH}" \   --parch "${ARCH}" \
1719   --target "${target}"   --target "${target}"
1720   resume_stamp md5sum_${target}   resume_stamp post-md5sum_${target}
1721    
1722   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}"
1723   done   done
# Line 1739  else Line 1739  else
1739   if typeset -f ${PNAME}_pkgbuild > /dev/null   if typeset -f ${PNAME}_pkgbuild > /dev/null
1740   then   then
1741   # run it   # run it
1742   run_resume ${PNAME}_pkgbuild || ${PNAME}_pkgbuild   run_resume post-${PNAME}_pkgbuild || ${PNAME}_pkgbuild
1743   resume_stamp ${PNAME}_pkgbuild   resume_stamp post-${PNAME}_pkgbuild
1744   fi   fi
1745   # now create the target package   # now create the target package
1746   run_resume pkg_builddir_${PNAME} || ${MLIBDIR}/pkgbuild_dir.sh \   run_resume post-pkg_builddir_${PNAME} || ${MLIBDIR}/pkgbuild_dir.sh \
1747   "${PNAME}-${PVER}-${ARCH}-${PBUILD}" \   "${PNAME}-${PVER}-${ARCH}-${PBUILD}" \
1748   "${BINDIR}_${PNAME}" || die "split_package: ${PNAME} package-build failed"   "${BINDIR}_${PNAME}" || die "split_package: ${PNAME} package-build failed"
1749   resume_stamp pkg_builddir_${PNAME}   resume_stamp post-pkg_builddir_${PNAME}
1750    
1751   # build pkg-md5-sum if requested   # build pkg-md5-sum if requested
1752   run_resume md5sum_${PNAME} || generate_package_md5sum \   run_resume post-md5sum_${PNAME} || generate_package_md5sum \
1753   --pcat "${PCATEGORIE}" \   --pcat "${PCATEGORIE}" \
1754   --pname "${PNAME}" \   --pname "${PNAME}" \
1755   --pver "${PVER}" \   --pver "${PVER}" \
1756   --pbuild "${PBUILD}" \   --pbuild "${PBUILD}" \
1757   --parch "${ARCH}"   --parch "${ARCH}"
1758   resume_stamp md5sum_${PNAME}   resume_stamp post-md5sum_${PNAME}
1759    
1760   echo -e "${COLGREEN}\nPackage ${PNAME}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"   echo -e "${COLGREEN}\nPackage ${PNAME}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"
1761    
# Line 1766  else Line 1766  else
1766   split_unset_variables   split_unset_variables
1767    
1768   else   else
1769   run_resume pkg_builddir || ${MLIBDIR}/pkgbuild_dir.sh ${PKGNAME} ${BINDIR} || die "package-build failed"   run_resume post-pkg_builddir || ${MLIBDIR}/pkgbuild_dir.sh ${PKGNAME} ${BINDIR} || die "package-build failed"
1770   resume_stamp pkg_builddir   resume_stamp post-pkg_builddir
1771    
1772   # build pkg-md5-sum if requested   # build pkg-md5-sum if requested
1773   run_resume md5sum || generate_package_md5sum \   run_resume post-md5sum || generate_package_md5sum \
1774   --pcat "${PCATEGORIE}" \   --pcat "${PCATEGORIE}" \
1775   --pname "${PNAME}" \   --pname "${PNAME}" \
1776   --pver "${PVER}" \   --pver "${PVER}" \
1777   --pbuild "${PBUILD}" \   --pbuild "${PBUILD}" \
1778   --parch "${ARCH}"   --parch "${ARCH}"
1779   resume_stamp md5sum   resume_stamp post-md5sum
1780    
1781   echo -e "${COLGREEN}\nPackage ${PKGNAME} successfully builded.\n${COLDEFAULT}"   echo -e "${COLGREEN}\nPackage ${PKGNAME} successfully builded.\n${COLDEFAULT}"
1782   fi   fi
# Line 1784  else Line 1784  else
1784   # build src-pkg-tarball if requested   # build src-pkg-tarball if requested
1785   if mqueryfeature "srcpkgbuild"   if mqueryfeature "srcpkgbuild"
1786   then   then
1787   run_resume srcpkgbuild || source_pkg_build ${SMAGENAME}   run_resume post-srcpkgbuild || source_pkg_build ${SMAGENAME}
1788   resume_stamp srcpkgbuild   resume_stamp post-srcpkgbuild
1789   fi   fi
1790  fi  fi
1791    

Legend:
Removed from v.1635  
changed lines
  Added in v.1636