--- trunk/mage/usr/lib/mage/smage2.sh 2012/01/13 13:26:43 1635 +++ trunk/mage/usr/lib/mage/smage2.sh 2012/01/13 13:32:22 1636 @@ -1599,12 +1599,12 @@ then for subpackage in ${SPLIT_PACKAGES} do - run_resume mcompressdoc_${subpackage} || mcompressdocs ${BINDIR}_${subpackage} - resume_stamp mcompressdoc_${subpackage} + run_resume post-mcompressdoc_${subpackage} || mcompressdocs ${BINDIR}_${subpackage} + resume_stamp post-mcompressdoc_${subpackage} done else - run_resume mcompressdoc || mcompressdocs ${BINDIR} - resume_stamp mcompressdoc + run_resume post-mcompressdoc || mcompressdocs ${BINDIR} + resume_stamp post-mcompressdoc fi fi @@ -1619,13 +1619,13 @@ for subpackage in ${SPLIT_PACKAGES} do echo -e "${COLBLUE}===${COLGREEN} stripping libtool archives for '${subpackage}' ...${COLDEFAULT}" - run_resume mstriplibtoolarchive_${subpackage} || mstriplibtoolarchive ${BINDIR}_${subpackage} - resume_stamp mstriplibtoolarchive_${subpackage} + run_resume post-mstriplibtoolarchive_${subpackage} || mstriplibtoolarchive ${BINDIR}_${subpackage} + resume_stamp post-mstriplibtoolarchive_${subpackage} done else echo -e "${COLBLUE}===${COLGREEN} stripping libtool archives ...${COLDEFAULT}" - run_resume mstriplibtoolarchive || mstriplibtoolarchive ${BINDIR} - resume_stamp mstriplibtoolarchive + run_resume post-mstriplibtoolarchive || mstriplibtoolarchive ${BINDIR} + resume_stamp post-mstriplibtoolarchive fi fi fi @@ -1641,13 +1641,13 @@ for subpackage in ${SPLIT_PACKAGES} do echo -e "${COLBLUE}===${COLGREEN} purging all purge targets in '${subpackage}' ...${COLDEFAULT}" - run_resume mpurgetargets_${subpackage} || mpurgetargets ${BINDIR}_${subpackage} - resume_stamp mpurgetargets_${subpackage} + run_resume post-mpurgetargets_${subpackage} || mpurgetargets ${BINDIR}_${subpackage} + resume_stamp post-mpurgetargets_${subpackage} done else echo -e "${COLBLUE}===${COLGREEN} purging all purge targets ...${COLDEFAULT}" - run_resume mpurgetargets || mpurgetargets ${BINDIR} - resume_stamp mpurgetargets + run_resume post-mpurgetargets || mpurgetargets ${BINDIR} + resume_stamp post-mpurgetargets fi fi fi @@ -1665,25 +1665,25 @@ for subpackage in ${SPLIT_PACKAGES} do echo -e "${COLBLUE}===${COLGREEN} stripping binaries for '${subpackage}' ...${COLDEFAULT}" - run_resume mstripbins_${subpackage} || mstripbins ${BINDIR}_${subpackage} - resume_stamp mstripbins_${subpackage} + run_resume post-mstripbins_${subpackage} || mstripbins ${BINDIR}_${subpackage} + resume_stamp post-mstripbins_${subpackage} echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries for '${subpackage}' ...${COLDEFAULT}" - run_resume mstriplibs_${subpackage} || mstriplibs ${BINDIR}_${subpackage} - resume_stamp mstriplibs_${subpackage} + run_resume post-mstriplibs_${subpackage} || mstriplibs ${BINDIR}_${subpackage} + resume_stamp post-mstriplibs_${subpackage} echo -e "${COLBLUE}===${COLGREEN} stripping static libraries for '${subpackage}' ...${COLDEFAULT}" - run_resume mstripstatic_${subpackage} || mstripstatic ${BINDIR}_${subpackage} - resume_stamp mstripstatic_${subpackage} + run_resume post-mstripstatic_${subpackage} || mstripstatic ${BINDIR}_${subpackage} + resume_stamp post-mstripstatic_${subpackage} done else echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}" - run_resume mstripbins || mstripbins ${BINDIR} - resume_stamp mstripbins + run_resume post-mstripbins || mstripbins ${BINDIR} + resume_stamp post-mstripbins echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries ...${COLDEFAULT}" - run_resume mstriplibs || mstriplibs ${BINDIR} - resume_stamp mstriplibs + run_resume post-mstriplibs || mstriplibs ${BINDIR} + resume_stamp post-mstriplibs echo -e "${COLBLUE}===${COLGREEN} stripping static libraries ...${COLDEFAULT}" - run_resume mstripstatic || mstripstatic ${BINDIR} - resume_stamp mstripstatic + run_resume post-mstripstatic || mstripstatic ${BINDIR} + resume_stamp post-mstripstatic fi fi @@ -1700,24 +1700,24 @@ if typeset -f ${target}_pkgbuild > /dev/null then # run it - run_resume ${target}_pkgbuild || ${target}_pkgbuild - resume_stamp ${target}_pkgbuild + run_resume post-${target}_pkgbuild || ${target}_pkgbuild + resume_stamp post-${target}_pkgbuild fi # now create the target package - run_resume pkg_builddir_${target} || ${MLIBDIR}/pkgbuild_dir.sh \ + run_resume post-pkg_builddir_${target} || ${MLIBDIR}/pkgbuild_dir.sh \ "${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD}" \ ${BINDIR} || die "target: ${target} package-build failed" - resume_stamp pkg_builddir_${target} + resume_stamp post-pkg_builddir_${target} # build pkg-md5-sum if requested - run_resume md5sum_${target} || generate_package_md5sum \ + run_resume post-md5sum_${target} || generate_package_md5sum \ --pcat "${PCATEGORIE}" \ --pname "${PNAME}" \ --pver "${PVER}" \ --pbuild "${PBUILD}" \ --parch "${ARCH}" \ --target "${target}" - resume_stamp md5sum_${target} + resume_stamp post-md5sum_${target} echo -e "${COLGREEN}\nPackage ${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}" done @@ -1739,23 +1739,23 @@ if typeset -f ${PNAME}_pkgbuild > /dev/null then # run it - run_resume ${PNAME}_pkgbuild || ${PNAME}_pkgbuild - resume_stamp ${PNAME}_pkgbuild + run_resume post-${PNAME}_pkgbuild || ${PNAME}_pkgbuild + resume_stamp post-${PNAME}_pkgbuild fi # now create the target package - run_resume pkg_builddir_${PNAME} || ${MLIBDIR}/pkgbuild_dir.sh \ + run_resume post-pkg_builddir_${PNAME} || ${MLIBDIR}/pkgbuild_dir.sh \ "${PNAME}-${PVER}-${ARCH}-${PBUILD}" \ "${BINDIR}_${PNAME}" || die "split_package: ${PNAME} package-build failed" - resume_stamp pkg_builddir_${PNAME} + resume_stamp post-pkg_builddir_${PNAME} # build pkg-md5-sum if requested - run_resume md5sum_${PNAME} || generate_package_md5sum \ + run_resume post-md5sum_${PNAME} || generate_package_md5sum \ --pcat "${PCATEGORIE}" \ --pname "${PNAME}" \ --pver "${PVER}" \ --pbuild "${PBUILD}" \ --parch "${ARCH}" - resume_stamp md5sum_${PNAME} + resume_stamp post-md5sum_${PNAME} echo -e "${COLGREEN}\nPackage ${PNAME}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}" @@ -1766,17 +1766,17 @@ split_unset_variables else - run_resume pkg_builddir || ${MLIBDIR}/pkgbuild_dir.sh ${PKGNAME} ${BINDIR} || die "package-build failed" - resume_stamp pkg_builddir + run_resume post-pkg_builddir || ${MLIBDIR}/pkgbuild_dir.sh ${PKGNAME} ${BINDIR} || die "package-build failed" + resume_stamp post-pkg_builddir # build pkg-md5-sum if requested - run_resume md5sum || generate_package_md5sum \ + run_resume post-md5sum || generate_package_md5sum \ --pcat "${PCATEGORIE}" \ --pname "${PNAME}" \ --pver "${PVER}" \ --pbuild "${PBUILD}" \ --parch "${ARCH}" - resume_stamp md5sum + resume_stamp post-md5sum echo -e "${COLGREEN}\nPackage ${PKGNAME} successfully builded.\n${COLDEFAULT}" fi @@ -1784,8 +1784,8 @@ # build src-pkg-tarball if requested if mqueryfeature "srcpkgbuild" then - run_resume srcpkgbuild || source_pkg_build ${SMAGENAME} - resume_stamp srcpkgbuild + run_resume post-srcpkgbuild || source_pkg_build ${SMAGENAME} + resume_stamp post-srcpkgbuild fi fi