--- trunk/mage/usr/lib/mage/smage2.sh 2011/12/29 15:21:25 1594 +++ trunk/mage/usr/lib/mage/smage2.sh 2011/12/29 15:23:21 1595 @@ -1509,6 +1509,9 @@ if mqueryfeature "!compressdoc" then echo -e "!compressdoc detected; documentation will not be compressed ..." +elif mqueryfeature "!pkgbuild" +then + echo "!pkgbuild detected; skipping documentation compression..." else # compressing doc, info & man files if [[ -n ${SPLIT_PACKAGES} ]] @@ -1524,6 +1527,10 @@ if mqueryfeature "!libtool" then + if mqueryfeature "!pkgbuild" + then + echo "!pkgbuild detected; skipping libtool archive stripping ..." + else if [[ -n ${SPLIT_PACKAGES} ]] then for subpackage in ${SPLIT_PACKAGES} @@ -1535,10 +1542,15 @@ echo -e "${COLBLUE}===${COLGREEN} stripping libtool archives ...${COLDEFAULT}" mstriplibtoolarchive ${BINDIR} fi + fi fi if mqueryfeature "purge" then + if mqueryfeature "!pkgbuild" + then + echo "!pkgbuild detected; skipping file purgation..." + else if [[ -n ${SPLIT_PACKAGES} ]] then for subpackage in ${SPLIT_PACKAGES} @@ -1550,37 +1562,41 @@ echo -e "${COLBLUE}===${COLGREEN} purging all purge targets ...${COLDEFAULT}" mpurgetargets ${BINDIR} fi + fi fi # stripping all bins and libs if mqueryfeature "!strip" then echo -e "!strip detected; Package will not be stripped ..." +elif mqueryfeature "!pkgbuild" +then + echo "!pkgbuild detected; skipping stripping of the package ..." else - if [[ -n ${SPLIT_PACKAGES} ]] - then - for subpackage in ${SPLIT_PACKAGES} - do - echo -e "${COLBLUE}===${COLGREEN} stripping binaries for '${subpackage}' ...${COLDEFAULT}" - mstripbins ${BINDIR}_${subpackage} - echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries for '${subpackage}' ...${COLDEFAULT}" - mstriplibs ${BINDIR}_${subpackage} - echo -e "${COLBLUE}===${COLGREEN} stripping static libraries for '${subpackage}' ...${COLDEFAULT}" - mstripstatic ${BINDIR}_${subpackage} - done - else - echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}" - mstripbins ${BINDIR} - echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries ...${COLDEFAULT}" - mstriplibs ${BINDIR} - echo -e "${COLBLUE}===${COLGREEN} stripping static libraries ...${COLDEFAULT}" - mstripstatic ${BINDIR} - fi + if [[ -n ${SPLIT_PACKAGES} ]] + then + for subpackage in ${SPLIT_PACKAGES} + do + echo -e "${COLBLUE}===${COLGREEN} stripping binaries for '${subpackage}' ...${COLDEFAULT}" + mstripbins ${BINDIR}_${subpackage} + echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries for '${subpackage}' ...${COLDEFAULT}" + mstriplibs ${BINDIR}_${subpackage} + echo -e "${COLBLUE}===${COLGREEN} stripping static libraries for '${subpackage}' ...${COLDEFAULT}" + mstripstatic ${BINDIR}_${subpackage} + done + else + echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}" + mstripbins ${BINDIR} + echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries ...${COLDEFAULT}" + mstriplibs ${BINDIR} + echo -e "${COLBLUE}===${COLGREEN} stripping static libraries ...${COLDEFAULT}" + mstripstatic ${BINDIR} + fi fi -if mqueryfeature "!buildpkg" +if mqueryfeature "!pkgbuild" then - echo -e "!buildpkg detected; Package will not be build ..." + echo -e "!pkgbuild detected; Package will not be build ..." else # build several targets if [[ -n ${MAGE_TARGETS} ]] @@ -1620,8 +1636,8 @@ export PNAME="${subpackage}" split_info_${PNAME} - # jump to next one if !buildpkg is set in split_info - mqueryfeature "!buildpkg" && continue + # jump to next one if !pkgbuild is set in split_info + mqueryfeature "!pkgbuild" && continue # check if an special subpackage_pkgbuild exists if typeset -f ${PNAME}_pkgbuild > /dev/null