Magellan Linux

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

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

revision 1582 by niro, Wed Dec 28 12:04:33 2011 UTC revision 1613 by niro, Mon Jan 9 20:05:53 2012 UTC
# Line 10  Line 10 
10  # set default user mage.rc  # set default user mage.rc
11  : ${MAGERC="/etc/mage.rc"}  : ${MAGERC="/etc/mage.rc"}
12    
 ## setup ##  
 SMAGENAME="$1"  
 SMAGEVERSION="$( < ${MLIBDIR}/version)"  
   
13  # export default C locale  # export default C locale
14  export LC_ALL=C  export LC_ALL=C
15    
# Line 21  source /etc/mage.rc.global Line 17  source /etc/mage.rc.global
17  source ${MAGERC}  source ${MAGERC}
18  source ${MLIBDIR}/mage4.functions.sh  source ${MLIBDIR}/mage4.functions.sh
19    
20    ## setup ##
21    SMAGENAME="$1"
22    SMAGEVERSION="$(< ${MLIBDIR}/version)"
23    
24  # set PKGDIR and BUILDDIR and BINDIR to MROOT  # set PKGDIR and BUILDDIR and BINDIR to MROOT
25  if [[ -n ${MROOT} ]]  if [[ -n ${MROOT} ]]
26  then  then
# Line 177  download_sources() Line 177  download_sources()
177   fi   fi
178    
179   echo -e "${COLBLUE}==>${COLGREEN} fetching ${uri}${COLDEFAULT}"   echo -e "${COLBLUE}==>${COLGREEN} fetching ${uri}${COLDEFAULT}"
180   mdownload --uri "${uri}" --dir "${outputdir}" || die "Could not download '${uri}'"   # do not die here, mchecksum catches download errors
181     mdownload --uri "${uri}" --dir "${outputdir}"
182    
183   # unset them to be sure   # unset them to be sure
184   unset uri   unset uri
# Line 201  download_sources() Line 202  download_sources()
202  # dummy function, used if that does not exist in smage file  # dummy function, used if that does not exist in smage file
203  src_prepare()  src_prepare()
204  {  {
205   echo "no src_prepare defined"   echo "no src_prepare defined; doing nothing ..."
206   return 0   return 0
207  }  }
208    
209  # dummy function, used if that does not exist in smage file  # dummy function, used if that does not exist in smage file
210  src_compile()  src_compile()
211  {  {
212   echo "no src_compile defined"   echo "no src_compile defined; doing nothing ..."
213   return 0   return 0
214  }  }
215    
216  # dummy function, used if that does not exist in smage file  # dummy function, used if that does not exist in smage file
217  src_check()  src_check()
218  {  {
219   echo "no src_check defined"   echo "no src_check defined; doing nothing ..."
220   return 0   return 0
221  }  }
222    
223  # dummy function, used if that does not exist in smage file  # dummy function, used if that does not exist in smage file
224  src_install()  src_install()
225  {  {
226   echo "no src_install defined"   echo "no src_install defined; doing nothing ..."
227   return 0   return 0
228  }  }
229    
# Line 236  mlibdir() Line 237  mlibdir()
237    
238  mconfigure()  mconfigure()
239  {  {
240     local myopts
241     if [[ ! -z ${CTARGET} ]]
242     then
243     myopts="--target=${CTARGET}"
244     fi
245    
246   if [ -x ./configure ]   if [ -x ./configure ]
247   then   then
248   ./configure \   ./configure \
# Line 248  mconfigure() Line 255  mconfigure()
255   --sysconfdir=/etc \   --sysconfdir=/etc \
256   --localstatedir=/var/lib \   --localstatedir=/var/lib \
257   --libdir=/usr/$(mlibdir) \   --libdir=/usr/$(mlibdir) \
258     ${myopts} \
259   "$@" || die "mconfigure failed"   "$@" || die "mconfigure failed"
260   else   else
261   echo "configure is not an executable ..."   echo "configure is not an executable ..."
# Line 343  munpack() Line 351  munpack()
351   rar)   rar)
352   unrar x ${SOURCEDIR}/${PNAME}/${SRCFILE} ${DEST}  || die ".rar unpack failed."   unrar x ${SOURCEDIR}/${PNAME}/${SRCFILE} ${DEST}  || die ".rar unpack failed."
353   ;;   ;;
354   zip|xpi)   zip|xpi|jar)
355   unzip ${SOURCEDIR}/${PNAME}/${SRCFILE} -d ${DEST} || die ".zip unpack failed."   unzip ${SOURCEDIR}/${PNAME}/${SRCFILE} -d ${DEST} || die ".zip unpack failed."
356   ;;   ;;
357   rpm)   rpm)
# Line 421  minstalldocs() Line 429  minstalldocs()
429   do   do
430   if [ -f ${doc} ]   if [ -f ${doc} ]
431   then   then
432   if [[ ${SMAGE_COMPRESSDOC} = true ]]   if mqueryfeature "compressdoc"
433   then   then
434   cat ${doc} | gzip -9c > ${BINDIR}/usr/share/doc/${PNAME}-${PVER}/${doc}.gz || die "gzipping +installing ${doc}."   cat ${doc} | gzip -9c > ${BINDIR}/usr/share/doc/${PNAME}-${PVER}/${doc}.gz || die "gzipping +installing ${doc}."
435   chmod 0644 ${BINDIR}/usr/share/doc/${PNAME}-${PVER}/${doc}.gz || die "fixing permissions of ${doc}."   chmod 0644 ${BINDIR}/usr/share/doc/${PNAME}-${PVER}/${doc}.gz || die "fixing permissions of ${doc}."
# Line 464  mstriplibtoolarchive() Line 472  mstriplibtoolarchive()
472   local stripdir="$@"   local stripdir="$@"
473    
474   [[ -z ${stripdir} ]] && stripdir="${BINDIR}"   [[ -z ${stripdir} ]] && stripdir="${BINDIR}"
475   find ${stripdir} ! -type d -name \*.la | xargs file | grep "libtool library" | cut -f 1 -d : | xargs --no-run-if-empty rm -f -- 2> /dev/null   find ${stripdir} ! -type d -name \*.la | xargs | grep "libtool library" | cut -f 1 -d : | xargs --no-run-if-empty rm -f -- 2> /dev/null
476  }  }
477    
478  mpurgetargets()  mpurgetargets()
# Line 544  setup_ccache_environment() Line 552  setup_ccache_environment()
552   fi   fi
553  }  }
554    
   
555  # fixes given dependencies to match a MAGE_TARGET  # fixes given dependencies to match a MAGE_TARGET
556  # fix_mage_deps -target s/depend # <-- note -target !  # fix_mage_deps -target s/depend # <-- note -target !
557  fix_mage_deps()  fix_mage_deps()
# Line 731  regen_mage_tree() Line 738  regen_mage_tree()
738   local subpackage   local subpackage
739    
740   # build them only if requested   # build them only if requested
741   if [[ ${REGEN_MAGE_TREE} = true ]]   if mqueryfeature regentree
742   then   then
743   # run it without targets   # run it without targets
744   if [[ -n ${MAGE_TARGETS} ]]   if [[ -n ${MAGE_TARGETS} ]]
# Line 794  regen_mage_tree() Line 801  regen_mage_tree()
801   unset STATE   unset STATE
802   unset DESCRIPTION   unset DESCRIPTION
803   unset HOMEPAGE   unset HOMEPAGE
804   unset PKGTYPE   # unset PKGTYPE <-- don't do that either; smage needs this var
805   unset INHERITS   unset INHERITS
806   unset DEPEND   unset DEPEND
807   unset SDEPEND   unset SDEPEND
# Line 820  split_save_variables() Line 827  split_save_variables()
827   export SAVED_DEPEND="${DEPEND}"   export SAVED_DEPEND="${DEPEND}"
828   export SAVED_SDEPEND="${SDEPEND}"   export SAVED_SDEPEND="${SDEPEND}"
829   export SAVED_PROVIDE="${PROVIDE}"   export SAVED_PROVIDE="${PROVIDE}"
  export SAVED_NOPKGBUILD="${NOPKGBUILD}"  
830   export SAVED_PKGTYPE="${PKGTYPE}"   export SAVED_PKGTYPE="${PKGTYPE}"
831    
832     # special handling needed for mage features
833     # pkgbuild
834     mqueryfeature "pkgbuild" && export SAVED_FEATURE_PKGBUILD="pkgbuild"
835     mqueryfeature "!pkgbuild" && export SAVED_FEATURE_PKGBUILD="!pkgbuild"
836     # strip
837     mqueryfeature "strip" && export SAVED_FEATURE_STRIP="strip"
838     mqueryfeature "!strip" && export SAVED_FEATURE_STRIP="!strip"
839     # libtool
840     mqueryfeature "libtool" && export SAVED_FEATURE_LIBTOOL="libtool"
841     mqueryfeature "!libtool" && export SAVED_FEATURE_LIBTOOL="!libtool"
842     # compressdoc
843     mqueryfeature "compressdoc" && export SAVED_FEATURE_COMPRESSDOC="compressdoc"
844     mqueryfeature "!compressdoc" && export SAVED_FEATURE_COMPRESSDOC="!compressdoc"
845    
846   # bindir too   # bindir too
847   export SAVED_BINDIR="${BINDIR}"   export SAVED_BINDIR="${BINDIR}"
848    
# Line 882  split_restore_variables() Line 902  split_restore_variables()
902   export DEPEND="${SAVED_DEPEND}"   export DEPEND="${SAVED_DEPEND}"
903   export SDEPEND="${SAVED_SDEPEND}"   export SDEPEND="${SAVED_SDEPEND}"
904   export PROVIDE="${SAVED_PROVIDE}"   export PROVIDE="${SAVED_PROVIDE}"
  export NOPKGBUILD="${SAVED_NOPKGBUILD}"  
905   export PKGTYPE="${SAVED_PKGTYPE}"   export PKGTYPE="${SAVED_PKGTYPE}"
906    
907     # special handling needed for mage features
908     # pkgbuild
909     msetfeature "${SAVED_FEATURE_PKGBUILD}"
910     # strip
911     msetfeature "${SAVED_FEATURE_STRIP}"
912     # libtool
913     msetfeature "${SAVED_FEATURE_LIBTOOL}"
914     # compressdoc
915     msetfeature "${SAVED_FEATURE_COMPRESSDOC}"
916    
917   # bindir too   # bindir too
918   export BINDIR="${SAVED_BINDIR}"   export BINDIR="${SAVED_BINDIR}"
919    
# Line 943  split_unset_variables() Line 972  split_unset_variables()
972   unset SAVED_SDEPEND   unset SAVED_SDEPEND
973   unset SAVED_PROVIDE   unset SAVED_PROVIDE
974   unset SAVED_BINDIR   unset SAVED_BINDIR
  unset SAVED_NOPKGBUILD  
975   unset SAVED_PKGTYPE   unset SAVED_PKGTYPE
976     unset SAVED_FEATURE_PKGBUILD
977     unset SAVED_FEATURE_STRIP
978     unset SAVED_FEATURE_LIBTOOL
979     unset SAVED_FEATURE_COMPRESSDOC
980   unset SPLIT_PACKAGE_BASE   unset SPLIT_PACKAGE_BASE
981   unset -f SAVED_preinstall   unset -f SAVED_preinstall
982   unset -f SAVED_postinstall   unset -f SAVED_postinstall
# Line 1044  generate_package_md5sum() Line 1076  generate_package_md5sum()
1076   # fix target as it may be empty !   # fix target as it may be empty !
1077   [ -n "${target}" ] && target="-${target}"   [ -n "${target}" ] && target="-${target}"
1078    
   
1079   # build pkgname   # build pkgname
1080   pkgname="${pname}${target}-${pver}-${parch}-${pbuild}"   pkgname="${pname}${target}-${pver}-${parch}-${pbuild}"
1081    
1082   # build pkg-md5-sum only if requested   # build pkg-md5-sum only if requested
1083   if [[ ${REGEN_MAGE_TREE} = true ]]   if mqueryfeature regentree
1084   then   then
1085   echo -ne "${COLBLUE}===${COLGREEN} generating md5's for ${pkgname}.${PKGSUFFIX} ... ${COLDEFAULT}"   echo -ne "${COLBLUE}===${COLGREEN} generating md5's for ${pkgname}.${PKGSUFFIX} ... ${COLDEFAULT}"
1086    
# Line 1104  source_pkg_build() Line 1135  source_pkg_build()
1135    
1136  step_by_step()  step_by_step()
1137  {  {
1138   if [[ ${STEP_BY_STEP} = true ]]   if mqueryfeature stepbystep
1139   then   then
1140   echo -e "${COLRED}Step-by-step enabled! Paused after $1.${COLDEFAULT}"   echo -e "${COLRED}Step-by-step enabled! Paused after $1.${COLDEFAULT}"
1141   echo "Press [enter] to continue"   echo "Press [enter] to continue"
# Line 1124  then Line 1155  then
1155   exit 1   exit 1
1156  fi  fi
1157    
1158    # load supported mage features
1159    load_mage_features
1160    
1161  # updating smage2-scripts  # updating smage2-scripts
1162  if [[ $1 = update ]]  if [[ $1 = update ]]
1163  then  then
# Line 1308  fi Line 1342  fi
1342  if [ "$1" == "--src-tarball" -a -n "$2" ] || [ "$1" == "-st" -a -n "$2" ]  if [ "$1" == "--src-tarball" -a -n "$2" ] || [ "$1" == "-st" -a -n "$2" ]
1343  then  then
1344   SRCPKGTARBALL="${2}"   SRCPKGTARBALL="${2}"
1345   USE_SRC_PKG_TARBALL=true   msetfeature "srcpkgtarball"
1346    
1347   # abort if given file is not a source pkg   # abort if given file is not a source pkg
1348   [[ ${SRCPKGTARBALL##*.} != ${SRCPKGSUFFIX} ]] && die "${SRCPKGTARBALL} is not a valid src-pkg file."   [[ ${SRCPKGTARBALL##*.} != ${SRCPKGSUFFIX} ]] && die "${SRCPKGTARBALL} is not a valid src-pkg file."
# Line 1352  echo -e "${COLGREEN}Compiling ${PKGNAME} Line 1386  echo -e "${COLGREEN}Compiling ${PKGNAME}
1386  # auto regen mage tree if requested  # auto regen mage tree if requested
1387  regen_mage_tree  regen_mage_tree
1388    
1389  if [[ ${CREATE_SRC_PKG_TARBALL} = true ]]  if mqueryfeature "srcpkg"
1390  then  then
1391   if [[ -d ${SOURCEDIR}/${PNAME} ]]   if [[ -d ${SOURCEDIR}/${PNAME} ]]
1392   then   then
# Line 1362  then Line 1396  then
1396  fi  fi
1397    
1398  # download sources  # download sources
1399  [[ ${USE_SRC_PKG_TARBALL} != true ]] && download_sources  mqueryfeature "srcpkgtarball" || download_sources
1400    
1401  # fixes some issues with these functions  # fixes some issues with these functions
1402  export -f src_prepare || die "src_prepare export failed"  export -f src_prepare || die "src_prepare export failed"
# Line 1377  export CXXFLAGS="${CFLAGS}" || die "CXXF Line 1411  export CXXFLAGS="${CFLAGS}" || die "CXXF
1411  export BINDIR="${BINDIR}" || die "BINDIR export failed"  export BINDIR="${BINDIR}" || die "BINDIR export failed"
1412  export MAKEOPTS="${MAKEOPTS}" || die "MAKEOPTS export failed"  export MAKEOPTS="${MAKEOPTS}" || die "MAKEOPTS export failed"
1413    
   
1414  # setup distcc  # setup distcc
1415  # setup for distcc goes *before* ccache, so ccache comes before distcc in path  # setup for distcc goes *before* ccache, so ccache comes before distcc in path
1416  [[ ${SMAGE_USE_DISTCC} = true ]] && setup_distcc_environment  mqueryfeature "distcc" && setup_distcc_environment
1417    
1418  # setup ccache  # setup ccache
1419  [[ ${SMAGE_USE_CCACHE} = true ]] && setup_ccache_environment  mqueryfeature "ccache" && setup_ccache_environment
1420    
1421  # clean up builddir if a previously one exist  # clean up builddir if a previously one exist
1422  if [ -d ${BUILDDIR} ]  if [ -d ${BUILDDIR} ]
# Line 1415  fi Line 1448  fi
1448  [[ ! -d /var/log/smage ]] && install -d /var/log/smage  [[ ! -d /var/log/smage ]] && install -d /var/log/smage
1449  echo -e "### Build started on $(date) ###\n" > /var/log/smage/${PKGNAME}.log  echo -e "### Build started on $(date) ###\n" > /var/log/smage/${PKGNAME}.log
1450    
1451  src_prepare | ${SMAGE_LOG_CMD}  if [[ ${PKGTYPE} = virtual ]]
 die_pipestatus 0 "src_prepare failed"  
 step_by_step $_  
   
 src_compile | ${SMAGE_LOG_CMD}  
 die_pipestatus 0 "src_compile failed"  
 step_by_step $_  
   
 # only run checks if requested  
 if [[ ${MAGE_CHECK} != true ]]  
1452  then  then
1453   echo "MAGE_CHECK not requested; src_check() will not be run!" | ${SMAGE_LOG_CMD}   echo "virtual package detected; nothing will be build ..."
1454   step_by_step src_check   # automatically set !pkgbuild here too
1455     msetfeature "!pkgbuild"
1456  else  else
1457   src_check | ${SMAGE_LOG_CMD}   src_prepare | ${SMAGE_LOG_CMD}
1458   die_pipestatus 0 "src_check failed"   die_pipestatus 0 "src_prepare failed"
1459   step_by_step $_   step_by_step $_
 fi  
   
 # build several subpackages  
 if [[ -n ${SPLIT_PACKAGES} ]]  
 then  
  # save bindir & pname  
  split_save_variables  
  export SAVED_BINDIR="${BINDIR}"  
  for subpackage in ${SPLIT_PACKAGES}  
  do  
  if typeset -f src_install_${subpackage} > /dev/null  
  then  
  # export subpackage bindir  
  export BINDIR="${SAVED_BINDIR}_${subpackage}"  
  # export PNAME, several internal function and include  
  # rely on this variable  
  export PNAME="${subpackage}"  
1460    
1461   echo   src_compile | ${SMAGE_LOG_CMD}
1462   echo -en "${COLBLUE}*** ${COLDEFAULT}"   die_pipestatus 0 "src_compile failed"
  echo -en "  Running ${COLGREEN}split src_install()${COLDEFAULT}"  
  echo -en " for subpkg: ${COLBLUE}${PNAME}${COLDEFAULT}"  
  echo -e " - basepkg: ${COLBLUE}${SPLIT_PACKAGE_BASE}${COLDEFAULT} ..."  
   
  src_install_${subpackage} | ${SMAGE_LOG_CMD}  
  die_pipestatus 0 "src_install_${subpackage} failed"  
  step_by_step $_  
  fi  
  done  
  # restore bindir & pname  
  split_restore_variables  
  # unset all saved smage variables  
  split_unset_variables  
 else  
  src_install | ${SMAGE_LOG_CMD}  
  die_pipestatus 0 "src_install failed"  
1463   step_by_step $_   step_by_step $_
1464    
1465     # only run checks if requested
1466     if mqueryfeature "!check"
1467     then
1468     echo "!check detected; src_check() will not be run!" | ${SMAGE_LOG_CMD}
1469     step_by_step src_check
1470     else
1471     src_check | ${SMAGE_LOG_CMD}
1472     die_pipestatus 0 "src_check failed"
1473     step_by_step $_
1474     fi
1475    
1476     # build several subpackages
1477     if [[ -n ${SPLIT_PACKAGES} ]]
1478     then
1479     # save bindir & pname
1480     split_save_variables
1481     export SAVED_BINDIR="${BINDIR}"
1482     for subpackage in ${SPLIT_PACKAGES}
1483     do
1484     if typeset -f src_install_${subpackage} > /dev/null
1485     then
1486     # export subpackage bindir
1487     export BINDIR="${SAVED_BINDIR}_${subpackage}"
1488     # export PNAME, several internal function and include
1489     # rely on this variable
1490     export PNAME="${subpackage}"
1491    
1492     echo
1493     echo -en "${COLBLUE}*** ${COLDEFAULT}"
1494     echo -en "  Running ${COLGREEN}split src_install()${COLDEFAULT}"
1495     echo -en " for subpkg: ${COLBLUE}${PNAME}${COLDEFAULT}"
1496     echo -e " - basepkg: ${COLBLUE}${SPLIT_PACKAGE_BASE}${COLDEFAULT} ..."
1497    
1498     src_install_${subpackage} | ${SMAGE_LOG_CMD}
1499     die_pipestatus 0 "src_install_${subpackage} failed"
1500     step_by_step $_
1501     fi
1502     done
1503     # restore bindir & pname
1504     split_restore_variables
1505     # unset all saved smage variables
1506     split_unset_variables
1507     else
1508     src_install | ${SMAGE_LOG_CMD}
1509     die_pipestatus 0 "src_install failed"
1510     step_by_step $_
1511     fi
1512  fi  fi
1513    
1514  # compressing doc, info & man files  # echo for sake of good-looking
1515  if [[ -n ${SPLIT_PACKAGES} ]]  echo
1516    
1517    if mqueryfeature "!compressdoc"
1518  then  then
1519   for subpackage in ${SPLIT_PACKAGES}   echo -e "!compressdoc detected; documentation will not be compressed ..."
1520   do  elif mqueryfeature "!pkgbuild"
1521   mcompressdocs ${BINDIR}_${subpackage}  then
1522   done   echo "!pkgbuild detected; skipping documentation compression..."
1523  else  else
1524   mcompressdocs ${BINDIR}   # compressing doc, info & man files
1525     if [[ -n ${SPLIT_PACKAGES} ]]
1526     then
1527     for subpackage in ${SPLIT_PACKAGES}
1528     do
1529     mcompressdocs ${BINDIR}_${subpackage}
1530     done
1531     else
1532     mcompressdocs ${BINDIR}
1533     fi
1534  fi  fi
1535    
1536  if [[ ${SMAGE_STRIP_LIBTOOL} = true ]]  if mqueryfeature "!libtool"
1537  then  then
1538     if mqueryfeature "!pkgbuild"
1539     then
1540     echo "!pkgbuild detected; skipping libtool archive stripping ..."
1541     else
1542   if [[ -n ${SPLIT_PACKAGES} ]]   if [[ -n ${SPLIT_PACKAGES} ]]
1543   then   then
1544   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
# Line 1495  then Line 1550  then
1550   echo -e "${COLBLUE}===${COLGREEN} stripping libtool archives ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping libtool archives ...${COLDEFAULT}"
1551   mstriplibtoolarchive ${BINDIR}   mstriplibtoolarchive ${BINDIR}
1552   fi   fi
1553     fi
1554  fi  fi
1555    
1556  if [[ ${SMAGE_PURGE} = true ]]  if mqueryfeature "purge"
1557  then  then
1558     if mqueryfeature "!pkgbuild"
1559     then
1560     echo "!pkgbuild detected; skipping file purgation..."
1561     else
1562   if [[ -n ${SPLIT_PACKAGES} ]]   if [[ -n ${SPLIT_PACKAGES} ]]
1563   then   then
1564   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
# Line 1510  then Line 1570  then
1570   echo -e "${COLBLUE}===${COLGREEN} purging all purge targets ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} purging all purge targets ...${COLDEFAULT}"
1571   mpurgetargets ${BINDIR}   mpurgetargets ${BINDIR}
1572   fi   fi
1573     fi
1574  fi  fi
1575    
1576  # stripping all bins and libs  # stripping all bins and libs
1577  case ${NOSTRIP} in  if mqueryfeature "!strip"
1578   true|TRUE|yes|y)  then
1579   echo -e "NOSTRIP=true detected; Package will not be stripped ..."   echo -e "!strip detected; Package will not be stripped ..."
1580   ;;  elif mqueryfeature "!pkgbuild"
1581   *)  then
1582   if [[ -n ${SPLIT_PACKAGES} ]]   echo "!pkgbuild detected; skipping stripping of the package ..."
1583   then  else
1584   for subpackage in ${SPLIT_PACKAGES}   if [[ -n ${SPLIT_PACKAGES} ]]
1585   do   then
1586   echo -e "${COLBLUE}===${COLGREEN} stripping binaries for '${subpackage}' ...${COLDEFAULT}"   for subpackage in ${SPLIT_PACKAGES}
1587   mstripbins ${BINDIR}_${subpackage}   do
1588   echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries for '${subpackage}' ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping binaries for '${subpackage}' ...${COLDEFAULT}"
1589   mstriplibs ${BINDIR}_${subpackage}   mstripbins ${BINDIR}_${subpackage}
1590   echo -e "${COLBLUE}===${COLGREEN} stripping static libraries for '${subpackage}' ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries for '${subpackage}' ...${COLDEFAULT}"
1591   mstripstatic ${BINDIR}_${subpackage}   mstriplibs ${BINDIR}_${subpackage}
1592   done   echo -e "${COLBLUE}===${COLGREEN} stripping static libraries for '${subpackage}' ...${COLDEFAULT}"
1593   else   mstripstatic ${BINDIR}_${subpackage}
1594   echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}"   done
1595   mstripbins ${BINDIR}   else
1596   echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}"
1597   mstriplibs ${BINDIR}   mstripbins ${BINDIR}
1598   echo -e "${COLBLUE}===${COLGREEN} stripping static libraries ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries ...${COLDEFAULT}"
1599   mstripstatic ${BINDIR}   mstriplibs ${BINDIR}
1600   fi   echo -e "${COLBLUE}===${COLGREEN} stripping static libraries ...${COLDEFAULT}"
1601   ;;   mstripstatic ${BINDIR}
1602  esac   fi
1603    fi
1604    
1605  # the new buildpkg command  if mqueryfeature "!pkgbuild"
1606  case ${NOPKGBUILD} in  then
1607   true|TRUE|yes|y)   echo -e "!pkgbuild detected; Package will not be build ..."
1608   echo -e "NOPGKBUILD=true detected; Package will not be build ..."  else
  ;;  
  *)  
1609   # build several targets   # build several targets
1610   if [[ -n ${MAGE_TARGETS} ]]   if [[ -n ${MAGE_TARGETS} ]]
1611   then   then
# Line 1584  case ${NOPKGBUILD} in Line 1644  case ${NOPKGBUILD} in
1644   export PNAME="${subpackage}"   export PNAME="${subpackage}"
1645   split_info_${PNAME}   split_info_${PNAME}
1646    
1647   # jump to next one if NOPKGBUILD is set in split_info   # jump to next one if !pkgbuild is set in split_info
1648   case ${NOPKGBUILD} in   mqueryfeature "!pkgbuild" && continue
  true|TRUE|yes|y) continue ;;  
  esac  
1649    
1650   # check if an special subpackage_pkgbuild exists   # check if an special subpackage_pkgbuild exists
1651   if typeset -f ${PNAME}_pkgbuild > /dev/null   if typeset -f ${PNAME}_pkgbuild > /dev/null
# Line 1631  case ${NOPKGBUILD} in Line 1689  case ${NOPKGBUILD} in
1689   fi   fi
1690    
1691   # build src-pkg-tarball if requested   # build src-pkg-tarball if requested
1692   [[ ${CREATE_SRC_PKG_TARBALL} = true ]] && source_pkg_build ${SMAGENAME}   mqueryfeature "srcpkg" && source_pkg_build ${SMAGENAME}
1693   ;;  fi
 esac  
1694    
1695  if [[ ${SMAGE_BUILD_LOGGING} != false ]]  if mqueryfeature "buildlog"
1696  then  then
1697   bzip2 -9f /var/log/smage/${PKGNAME}.log   bzip2 -9f /var/log/smage/${PKGNAME}.log
1698  else  else
1699   [[ -f /var/log/smage/${PKGNAME}.log ]] && rm /var/log/smage/${PKGNAME}.log   [[ -f /var/log/smage/${PKGNAME}.log ]] && rm /var/log/smage/${PKGNAME}.log
1700  fi  fi
1701    
 # for sure  
 unset NOPKGBUILD  
 unset NOSTRIP  
   
1702  xtitleclean  xtitleclean

Legend:
Removed from v.1582  
changed lines
  Added in v.1613