Magellan Linux

  • Back to homepage
    • /[magellan-source]/branches/mage-next/src/smage2.sh

    Diff of /branches/mage-next/src/smage2.sh

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

    revision 1351 by niro, Sat Jun 4 10:32:25 2011 UTC revision 1543 by niro, Tue Dec 20 16:06:13 2011 UTC
    # Line 543  mpatch() Line 543  mpatch()
    543  mlibtoolize()  mlibtoolize()
    544  {  {
    545   local opts="$@"   local opts="$@"
    546   [[ -z ${opts} ]] && opts="--copy --force"   [[ -z ${opts} ]] && opts="--verbose --install --force"
    547    
    548   libtoolize ${opts} || die "running: mlibtoolize ${opts}"   libtoolize ${opts} || die "running: mlibtoolize ${opts}"
    549  }  }
    # Line 583  mstriplibs() Line 583  mstriplibs()
    583   local stripdir="$@"   local stripdir="$@"
    584    
    585   [ -z "${stripdir}" ] && stripdir=${BINDIR}   [ -z "${stripdir}" ] && stripdir=${BINDIR}
    586   find ${stripdir} | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null   find ${stripdir} | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip ${STRIP_DYN_LIB} 2> /dev/null
    587  }  }
    588    
    589  mstripbins()  mstripbins()
    # Line 591  mstripbins() Line 591  mstripbins()
    591   local stripdir="$@"   local stripdir="$@"
    592    
    593   [ -z "${stripdir}" ] && stripdir=${BINDIR}   [ -z "${stripdir}" ] && stripdir=${BINDIR}
    594   find ${stripdir} | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null   find ${stripdir} | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip ${STRIP_DYN_BIN} 2> /dev/null
    595    }
    596    
    597    mstripstatic()
    598    {
    599     local stripdir="$@"
    600    
    601     [ -z "${stripdir}" ] && stripdir=${BINDIR}
    602     find ${stripdir} | xargs file | grep "ar archive" | cut -f 1 -d : | xargs strip ${STRIP_STATIC_LIB} 2> /dev/null
    603  }  }
    604    
    605  mcompressdocs()  mcompressdocs()
    # Line 834  build_mage_script() Line 842  build_mage_script()
    842    
    843  regen_mage_tree()  regen_mage_tree()
    844  {  {
    845   local i   local subpackage
    846    
    847   # build them only if requested   # build them only if requested
    848   if [[ ${REGEN_MAGE_TREE} = true ]]   if [[ ${REGEN_MAGE_TREE} = true ]]
    # Line 845  regen_mage_tree() Line 853  regen_mage_tree()
    853   # build for each target a mage file   # build for each target a mage file
    854   # run it with several targets   # run it with several targets
    855   echo   echo
    856   for i in ${MAGE_TARGETS}   for subpackage in ${MAGE_TARGETS}
    857   do   do
    858   build_mage_script --target "${i}"   build_mage_script --target "${subpackage}"
    859   done   done
    860   echo   echo
    861    
    # Line 860  regen_mage_tree() Line 868  regen_mage_tree()
    868   # build for each subpackage a mage file   # build for each subpackage a mage file
    869   # run it with several targets   # run it with several targets
    870   echo   echo
    871   for i in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
    872   do   do
    873   # get the right variables for the split   # get the right variables for the split
    874   export PNAME="${i}"   export PNAME="${subpackage}"
    875   split_info_${i}   split_info_${subpackage}
    876     # get the preinstall etc
    877     split_export_inherits ${subpackage}
    878   build_mage_script --split-pkg-base "${split_pkg_base}"   build_mage_script --split-pkg-base "${split_pkg_base}"
    879     # delete split preinstall etc
    880     split_delete_inherits ${subpackage}
    881   # restore smage environment   # restore smage environment
    882   split_restore_variables   split_restore_variables
    883   done   done
    # Line 1051  split_unset_variables() Line 1063  split_unset_variables()
    1063   unset -f SAVED_postremove   unset -f SAVED_postremove
    1064  }  }
    1065    
    1066    split_export_inherits()
    1067    {
    1068     local subpackage="$1"
    1069     local func
    1070     local newfunc
    1071    
    1072     for func in preinstall postinstall preremove postremove
    1073     do
    1074     if [[ ! -z $(typeset -f ${func}_${subpackage}) ]]
    1075     then
    1076     newfunc=$(typeset -f ${func}_${subpackage})
    1077     newfunc="${newfunc/_${subpackage} (/ (}"
    1078     eval "${newfunc}"
    1079     fi
    1080     done
    1081    }
    1082    
    1083    split_delete_inherits()
    1084    {
    1085     local subpackage="$1"
    1086     local func
    1087    
    1088     for func in preinstall postinstall preremove postremove
    1089     do
    1090     if [[ ! -z $(typeset -f ${func}_${subpackage}) ]]
    1091     then
    1092     unset -f ${func}
    1093     fi
    1094     done
    1095     }
    1096    
    1097  export_inherits()  export_inherits()
    1098  {  {
    1099   local include="$1"   local include="$1"
    # Line 1560  case ${NOSTRIP} in Line 1603  case ${NOSTRIP} in
    1603   do   do
    1604   echo -e "${COLBLUE}===${COLGREEN} stripping binaries for '${subpackage}' ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping binaries for '${subpackage}' ...${COLDEFAULT}"
    1605   mstripbins ${BINDIR}_${subpackage}   mstripbins ${BINDIR}_${subpackage}
    1606   echo -e "${COLBLUE}===${COLGREEN} stripping libraries for '${subpackage}' ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries for '${subpackage}' ...${COLDEFAULT}"
    1607   mstriplibs ${BINDIR}_${subpackage}   mstriplibs ${BINDIR}_${subpackage}
    1608     echo -e "${COLBLUE}===${COLGREEN} stripping static libraries for '${subpackage}' ...${COLDEFAULT}"
    1609     mstripstatic ${BINDIR}_${subpackage}
    1610   done   done
    1611   else   else
    1612   echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}"
    1613   mstripbins ${BINDIR}   mstripbins ${BINDIR}
    1614   echo -e "${COLBLUE}===${COLGREEN} stripping libraries ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries ...${COLDEFAULT}"
    1615   mstriplibs ${BINDIR}   mstriplibs ${BINDIR}
    1616     echo -e "${COLBLUE}===${COLGREEN} stripping static libraries ...${COLDEFAULT}"
    1617     mstripstatic ${BINDIR}
    1618   fi   fi
    1619   ;;   ;;
    1620  esac  esac
    Legend:
    Removed from v.1351  
    changed lines
      Added in v.1543