Magellan Linux

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

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

trunk/mage/usr/lib/mage/smage2.sh revision 1649 by niro, Fri Jan 13 21:04:02 2012 UTC branches/mage-next/src/smage2.in revision 2806 by niro, Tue Sep 2 13:55:19 2014 UTC
# Line 7  Line 7 
7  # TODO: record dynlib, gz | xz database  # TODO: record dynlib, gz | xz database
8    
9    
10  # set default user mage.rc  # set default variables
11  : ${MAGERC="/etc/mage.rc"}  : ${MAGERC="@@SYSCONFDIR@@/mage.rc"}
12    : ${MLIBDIR="@@MAGELIBDIR@@"}
13    
14  # export default C locale  # export default C locale
15  export LC_ALL=C  export LC_ALL=C
16    
17  source /etc/mage.rc.global  # first of all include common functions
18  source ${MAGERC}  source ${MLIBDIR}/common.functions.sh || exit 1
19  source ${MLIBDIR}/mage4.functions.sh  source @@SYSCONFDIR@@/mage.rc.global || die "@@SYSCONFDIR@@/mage.rc.global missing."
20  source ${MLIBDIR}/smage2.functions.sh  source ${MAGERC} || die "${MAGERC} missing."
21    source ${MLIBDIR}/mage4.functions.sh || die "${MLIBDIR}/mage4.functions.sh missing."
22    source ${MLIBDIR}/smage2.functions.sh || die "${MLIBDIR}/smage2.functions.sh missing."
23    
24    # export default path
25    export PATH="${PATH}:${MLIBDIR}"
26    
27    print_usage()
28    {
29     echo "Usage: $(basename $0) [option] pkgname ..."
30     echo "Options:"
31     echo "--smage"
32     echo "--src-tarball"
33     echo "--calc"
34     echo "--update"
35     echo "--download"
36     echo "--regen"
37     echo "--create-src-tarball"
38     echo "--resume"
39     echo
40     echo "Environment variables::"
41     echo " NOCOLORS=true $(basename $0) [src]install PACKAGE"
42     echo " Disables all colors in the messages."
43     echo
44    }
45    
46    # very basic getops
47    for i in $*
48    do
49     case $1 in
50     --smage|*.${SMAGESUFFIX}) shift; SMAGENAME="$1" ;;
51     --src-tarball) shift; SRCPKGTARBALL="$1" ;;
52     --calc) shift; SMAGENAME="$1" ;;
53     --update) ;;
54     --download) shift; SMAGENAME="$1" ;;
55     --regen) shift; SMAGENAME="$1" ;;
56     --create-src-tarball) shift; SMAGENAME="$1" ;;
57     --resume) ;;
58     esac
59     shift
60    done
61    
62  ## setup ##  ## setup ##
63  SMAGENAME="$1"  SMAGENAME="$1"
 SMAGEVERSION="$(< ${MLIBDIR}/version)"  
64    
65  # expand PKGDIR, BUILDDIR and BINDIR with MROOT  # expand PKGDIR, BUILDDIR and BINDIR with MROOT
66  if [[ -n ${MROOT} ]]  if [[ -n ${MROOT} ]]
# Line 154  then Line 194  then
194    
195   regen_mage_tree   regen_mage_tree
196    
  # build several targets  
  if [[ -n ${MAGE_TARGETS} ]]  
  then  
  for target in ${MAGE_TARGETS}  
  do  
  # build md5sum for existing packages  
  generate_package_md5sum \  
  --pcat "${PCAT}" \  
  --pname "${PNAME}" \  
  --pver "${PVER}" \  
  --pbuild "${PBUILD}" \  
  --parch "${ARCH}" \  
  --target "${target}"  
  done  
   
197   # build several subpackages   # build several subpackages
198   elif [[ -n ${SPLIT_PACKAGES} ]]   if [[ -n ${SPLIT_PACKAGES} ]]
199   then   then
200   split_save_variables   split_save_variables
201   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
# Line 178  then Line 203  then
203   # get the right variables for the split   # get the right variables for the split
204   export PNAME="${subpackage}"   export PNAME="${subpackage}"
205   split_info_${subpackage}   split_info_${subpackage}
206     # fix PCATEGORIE -> PCAT
207     if [[ ! -z ${PCATEGORIE} ]]
208     then
209     PCAT="${PCATEGORIE}"
210     unset PCATEGORIE
211     fi
212   # build md5sum for existing packages   # build md5sum for existing packages
213   generate_package_md5sum \   generate_package_md5sum \
214   --pcat "${PCAT}" \   --pcat "${PCAT}" \
# Line 255  then Line 286  then
286   SMAGENAME="$2"   SMAGENAME="$2"
287  fi  fi
288    
289  [ ! -e ${MLIBDIR}/pkgbuild_dir.sh ] && die "Error: ${MLIBDIR}/pkgbuild_dir.sh not found. Aborting."  [ ! -e ${MLIBDIR}/pkgbuild_dir ] && die "Error: ${MLIBDIR}/pkgbuild_dir not found. Aborting."
290  [ -z "$(basename ${SMAGENAME} | grep .${SMAGESUFFIX})" ] &&  [ -z "$(basename ${SMAGENAME} | grep .${SMAGESUFFIX})" ] &&
291   die "File '$(basename ${SMAGENAME})' is not a sMage v${SMAGEVERSION} file. Aborting."   die "File '$(basename ${SMAGENAME})' is not a sMage v${SMAGEVERSION} file. Aborting."
292  [ -z "${SOURCEDIR}" ] && die "\$SOURCEDIR not found. Please setup your ${MAGERC} correctly."  [ -z "${SOURCEDIR}" ] && die "\$SOURCEDIR not found. Please setup your ${MAGERC} correctly."
# Line 269  fi Line 300  fi
300  smagesource ${SMAGENAME} || die "source failed"  smagesource ${SMAGENAME} || die "source failed"
301  PKGNAME="${PNAME}-${PVER}-${ARCH}$(print_distrotag)-${PBUILD}"  PKGNAME="${PNAME}-${PVER}-${ARCH}$(print_distrotag)-${PBUILD}"
302  MD5DIR="$(dirname ${SMAGENAME})/md5"  MD5DIR="$(dirname ${SMAGENAME})/md5"
303  SMAGE_LOG_CMD="tee -a /var/log/smage/${PKGNAME}.log"  SMAGE_LOG_CMD="tee -a ${SMAGELOGDIR}/${PKGNAME}.log"
304    
305  xtitle "Compiling ${PKGNAME}"  xtitle "Compiling ${PKGNAME}"
306  echo -e "${COLGREEN}Compiling ${PKGNAME}${COLDEFAULT}"  echo -e "${COLGREEN}Compiling ${PKGNAME}${COLDEFAULT}"
307    
 # auto regen mage tree if requested  
 regen_mage_tree  
   
308  if mqueryfeature "srcpkgbuild"  if mqueryfeature "srcpkgbuild"
309  then  then
310   if [[ -d ${SOURCEDIR}/${PNAME} ]]   if [[ -d ${SOURCEDIR}/${PNAME} ]]
# Line 290  fi Line 318  fi
318  mqueryfeature "srcpkgtarball" || download_sources  mqueryfeature "srcpkgtarball" || download_sources
319    
320  # fixes some issues with these functions  # fixes some issues with these functions
321    export -f pkg_setup || die "pkg_setup export failed"
322  export -f src_prepare || die "src_prepare export failed"  export -f src_prepare || die "src_prepare export failed"
323  export -f src_compile || die "src_compile export failed"  export -f src_compile || die "src_compile export failed"
324  export -f src_check || die "src_check export failed"  export -f src_check || die "src_check export failed"
# Line 312  export MAKEOPTS="${MAKEOPTS}" || die "MA Line 341  export MAKEOPTS="${MAKEOPTS}" || die "MA
341  # 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
342  mqueryfeature "distcc" && setup_distcc_environment  mqueryfeature "distcc" && setup_distcc_environment
343    
344    # setup icecc
345    # setup for icecc goes *before* ccache, so ccache comes before icecc in path
346    mqueryfeature "icecc" && setup_icecc_environment
347    
348  # setup ccache  # setup ccache
349  mqueryfeature "ccache" && setup_ccache_environment  mqueryfeature "ccache" && setup_ccache_environment
350    
# Line 320  then Line 353  then
353   echo -e "${COLMAGENTA}Resume requested; continuing previous build${COLDEFAULT}"   echo -e "${COLMAGENTA}Resume requested; continuing previous build${COLDEFAULT}"
354    
355   # setup build logging   # setup build logging
356   [[ ! -d /var/log/smage ]] && install -d /var/log/smage   [[ ! -d ${SMAGELOGDIR} ]] && install -d ${SMAGELOGDIR}
357   if [[ -f /var/log/smage/${PKGNAME}.log.bz2 ]]   if [[ -f ${SMAGELOGDIR}/${PKGNAME}.log.bz2 ]]
358   then   then
359   bunzip2 -f /var/log/smage/${PKGNAME}.log.bz2   bunzip2 -f ${SMAGELOGDIR}/${PKGNAME}.log.bz2
360   fi   fi
361   echo -e "### Resume started on $(date) ###\n" >> /var/log/smage/${PKGNAME}.log   echo -e "### Resume started on $(date) ###\n" >> ${SMAGELOGDIR}/${PKGNAME}.log
362    
363  else  else
364   # clean up builddir if a previously one exist   # clean up builddir if a previously one exist
# Line 361  else Line 394  else
394   fi   fi
395    
396   # setup build logging   # setup build logging
397   [[ ! -d /var/log/smage ]] && install -d /var/log/smage   [[ ! -d ${SMAGELOGDIR} ]] && install -d ${SMAGELOGDIR}
398   echo -e "### Build started on $(date) ###\n" > /var/log/smage/${PKGNAME}.log   echo -e "### Build started on $(date) ###\n" > ${SMAGELOGDIR}/${PKGNAME}.log
399  fi  fi
400    
401  if [[ ${PKGTYPE} = virtual ]]  if [[ ${PKGTYPE} = virtual ]]
# Line 371  then Line 404  then
404   # automatically set !pkgbuild here too   # automatically set !pkgbuild here too
405   msetfeature "!pkgbuild"   msetfeature "!pkgbuild"
406  else  else
407     ( run_resume pkg_setup || pkg_setup ) | ${SMAGE_LOG_CMD}
408     die_pipestatus 0 "pkg_setup failed"
409     resume_stamp pkg_setup
410     step_by_step pkg_setup
411    
412   ( run_resume src_prepare || src_prepare ) | ${SMAGE_LOG_CMD}   ( run_resume src_prepare || src_prepare ) | ${SMAGE_LOG_CMD}
413   die_pipestatus 0 "src_prepare failed"   die_pipestatus 0 "src_prepare failed"
414   resume_stamp src_prepare   resume_stamp src_prepare
# Line 400  else Line 438  else
438   export SAVED_BINDIR="${BINDIR}"   export SAVED_BINDIR="${BINDIR}"
439   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
440   do   do
441   if typeset -f src_install_${subpackage} > /dev/null   split_info_${subpackage}
442     if [[ ${PKGTYPE} = virtual ]]
443   then   then
  # export subpackage bindir  
  export BINDIR="${SAVED_BINDIR}_${subpackage}"  
  # export PNAME, several internal function and include  
  # rely on this variable  
  export PNAME="${subpackage}"  
   
444   echo   echo
445   echo -en "${COLBLUE}*** ${COLDEFAULT}"   echo -en "${COLBLUE}*** ${COLDEFAULT}"
446   echo -en "  Running ${COLGREEN}split src_install()${COLDEFAULT}"   echo -en "Virtual package detected"
447   echo -en " for subpkg: ${COLBLUE}${PNAME}${COLDEFAULT}"   echo -en " for subpkg: ${COLBLUE}${PNAME}${COLDEFAULT}"
448   echo -e " - basepkg: ${COLBLUE}${SPLIT_PACKAGE_BASE}${COLDEFAULT} ..."   echo -e " - basepkg: ${COLBLUE}${SPLIT_PACKAGE_BASE}${COLDEFAULT} ..."
449    
450   ( run_resume src_install_${subpackage} || src_install_${subpackage} ) | ${SMAGE_LOG_CMD}   echo "virtual package detected; nothing will be build ..."
451   die_pipestatus 0 "src_install_${subpackage} failed"   # automatically set !pkgbuild here too
452   resume_stamp src_install_${subpackage}   msetfeature "!pkgbuild"
453   step_by_step src_install_${subpackage}   else
454     if typeset -f src_install_${subpackage} > /dev/null
455     then
456     # export subpackage bindir
457     export BINDIR="${SAVED_BINDIR}_${subpackage}"
458     # export PNAME, several internal function and include
459     # rely on this variable
460     export PNAME="${subpackage}"
461    
462     echo
463     echo -en "${COLBLUE}*** ${COLDEFAULT}"
464     echo -en "Running ${COLGREEN}split src_install()${COLDEFAULT}"
465     echo -en " for subpkg: ${COLBLUE}${PNAME}${COLDEFAULT}"
466     echo -e " - basepkg: ${COLBLUE}${SPLIT_PACKAGE_BASE}${COLDEFAULT} ..."
467    
468     ( run_resume src_install_${subpackage} || src_install_${subpackage} ) | ${SMAGE_LOG_CMD}
469     die_pipestatus 0 "src_install_${subpackage} failed"
470     resume_stamp src_install_${subpackage}
471     step_by_step src_install_${subpackage}
472     fi
473   fi   fi
474     # restore smage environment
475     split_restore_variables
476   done   done
  # restore bindir & pname  
  split_restore_variables  
477   # unset all saved smage variables   # unset all saved smage variables
478   split_unset_variables   split_unset_variables
479   else   else
# Line 445  else Line 497  else
497   # compressing doc, info & man files   # compressing doc, info & man files
498   if [[ -n ${SPLIT_PACKAGES} ]]   if [[ -n ${SPLIT_PACKAGES} ]]
499   then   then
500     # save smage environment
501     split_save_variables
502   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
503   do   do
504   run_resume post-mcompressdoc_${subpackage} || mcompressdocs ${BINDIR}_${subpackage}   # honor split_info
505   resume_stamp post-mcompressdoc_${subpackage}   split_info_${subpackage}
506     if [[ ${PKGTYPE} = virtual ]]
507     then
508     # automatically set !pkgbuild here too
509     msetfeature "!pkgbuild"
510     fi
511    
512     if mqueryfeature "!compressdoc"
513     then
514     echo -e "!compressdoc detected; documentation of '${subpackage}' will not be compressed ..."
515     elif mqueryfeature "!pkgbuild"
516     then
517     echo "!pkgbuild detected; skipping documentation compression for '${subpackage}' ..."
518     else
519     run_resume post-mcompressdoc_${subpackage} || mcompressdocs ${BINDIR}_${subpackage}
520     resume_stamp post-mcompressdoc_${subpackage}
521     fi
522     # restore smage environment
523     split_restore_variables
524   done   done
525     # unset saved variables
526     split_unset_variables
527   else   else
528   run_resume post-mcompressdoc || mcompressdocs ${BINDIR}   run_resume post-mcompressdoc || mcompressdocs ${BINDIR}
529   resume_stamp post-mcompressdoc   resume_stamp post-mcompressdoc
# Line 464  then Line 538  then
538   else   else
539   if [[ -n ${SPLIT_PACKAGES} ]]   if [[ -n ${SPLIT_PACKAGES} ]]
540   then   then
541     # save smage environment
542     split_save_variables
543   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
544   do   do
545   echo -e "${COLBLUE}===${COLGREEN} stripping libtool archives for '${subpackage}' ...${COLDEFAULT}"   # honor split_info
546   run_resume post-mstriplibtoolarchive_${subpackage} || mstriplibtoolarchive ${BINDIR}_${subpackage}   split_info_${subpackage}
547   resume_stamp post-mstriplibtoolarchive_${subpackage}   if [[ ${PKGTYPE} = virtual ]]
548     then
549     # automatically set !pkgbuild here too
550     msetfeature "!pkgbuild"
551     fi
552    
553     if mqueryfeature "!libtool"
554     then
555     if mqueryfeature "!pkgbuild"
556     then
557     echo "!pkgbuild detected; skipping libtool archive stripping for '${subpackage}'..."
558     else
559     echo -e "${COLBLUE}===${COLGREEN} stripping libtool archives for '${subpackage}' ...${COLDEFAULT}"
560     run_resume post-mstriplibtoolarchive_${subpackage} || mstriplibtoolarchive ${BINDIR}_${subpackage}
561     resume_stamp post-mstriplibtoolarchive_${subpackage}
562     fi
563     fi
564    
565     # restore smage environment
566     split_restore_variables
567   done   done
568     # unset saved variables
569     split_unset_variables
570   else   else
571   echo -e "${COLBLUE}===${COLGREEN} stripping libtool archives ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping libtool archives ...${COLDEFAULT}"
572   run_resume post-mstriplibtoolarchive || mstriplibtoolarchive ${BINDIR}   run_resume post-mstriplibtoolarchive || mstriplibtoolarchive ${BINDIR}
# Line 482  if mqueryfeature "purge" Line 579  if mqueryfeature "purge"
579  then  then
580   if mqueryfeature "!pkgbuild"   if mqueryfeature "!pkgbuild"
581   then   then
582   echo "!pkgbuild detected; skipping file purgation..."   echo "!pkgbuild detected; skipping file purgation ..."
583   else   else
584   if [[ -n ${SPLIT_PACKAGES} ]]   if [[ -n ${SPLIT_PACKAGES} ]]
585   then   then
586     # save smage environment
587     split_save_variables
588   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
589   do   do
590   echo -e "${COLBLUE}===${COLGREEN} purging all purge targets in '${subpackage}' ...${COLDEFAULT}"   # honor split_info
591   run_resume post-mpurgetargets_${subpackage} || mpurgetargets ${BINDIR}_${subpackage}   split_info_${subpackage}
592   resume_stamp post-mpurgetargets_${subpackage}   if [[ ${PKGTYPE} = virtual ]]
593     then
594     # automatically set !pkgbuild here too
595     msetfeature "!pkgbuild"
596     fi
597    
598     if mqueryfeature "purge"
599     then
600     if mqueryfeature "!pkgbuild"
601     then
602     echo "!pkgbuild detected; skipping file purgation for '${subpackage}' ..."
603     else
604     echo -e "${COLBLUE}===${COLGREEN} purging all purge targets in '${subpackage}' ...${COLDEFAULT}"
605     run_resume post-mpurgetargets_${subpackage} || mpurgetargets ${BINDIR}_${subpackage}
606     resume_stamp post-mpurgetargets_${subpackage}
607     fi
608     fi
609    
610     # restore smage environment
611     split_restore_variables
612   done   done
613     # unset saved variables
614     split_unset_variables
615   else   else
616   echo -e "${COLBLUE}===${COLGREEN} purging all purge targets ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} purging all purge targets ...${COLDEFAULT}"
617   run_resume post-mpurgetargets || mpurgetargets ${BINDIR}   run_resume post-mpurgetargets || mpurgetargets ${BINDIR}
# Line 503  fi Line 623  fi
623  # stripping all bins and libs  # stripping all bins and libs
624  if mqueryfeature "!strip"  if mqueryfeature "!strip"
625  then  then
626   echo -e "!strip detected; Package will not be stripped ..."   echo -e "!strip detected; package will not be stripped ..."
627  elif mqueryfeature "!pkgbuild"  elif mqueryfeature "!pkgbuild"
628  then  then
629   echo "!pkgbuild detected; skipping stripping of the package ..."   echo "!pkgbuild detected; skipping stripping of the package ..."
630  else  else
631   if [[ -n ${SPLIT_PACKAGES} ]]   if [[ -n ${SPLIT_PACKAGES} ]]
632   then   then
633     # save smage environment
634     split_save_variables
635   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
636   do   do
637   echo -e "${COLBLUE}===${COLGREEN} stripping binaries for '${subpackage}' ...${COLDEFAULT}"   # honor split_info
638   run_resume post-mstripbins_${subpackage} || mstripbins ${BINDIR}_${subpackage}   split_info_${subpackage}
639   resume_stamp post-mstripbins_${subpackage}   if [[ ${PKGTYPE} = virtual ]]
640   echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries for '${subpackage}' ...${COLDEFAULT}"   then
641   run_resume post-mstriplibs_${subpackage} || mstriplibs ${BINDIR}_${subpackage}   # automatically set !pkgbuild here too
642   resume_stamp post-mstriplibs_${subpackage}   msetfeature "!pkgbuild"
643   echo -e "${COLBLUE}===${COLGREEN} stripping static libraries for '${subpackage}' ...${COLDEFAULT}"   fi
644   run_resume post-mstripstatic_${subpackage} || mstripstatic ${BINDIR}_${subpackage}  
645   resume_stamp post-mstripstatic_${subpackage}   if mqueryfeature "!strip"
646     then
647     echo -e "!strip detected; package '${subpackage}' will not be stripped ..."
648     elif mqueryfeature "!pkgbuild"
649     then
650     echo "!pkgbuild detected; skipping stripping of the package '${subpackage}' ..."
651     else
652     echo -e "${COLBLUE}===${COLGREEN} stripping binaries for '${subpackage}' ...${COLDEFAULT}"
653     run_resume post-mstripbins_${subpackage} || mstripbins ${BINDIR}_${subpackage}
654     resume_stamp post-mstripbins_${subpackage}
655     echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries for '${subpackage}' ...${COLDEFAULT}"
656     run_resume post-mstriplibs_${subpackage} || mstriplibs ${BINDIR}_${subpackage}
657     resume_stamp post-mstriplibs_${subpackage}
658     echo -e "${COLBLUE}===${COLGREEN} stripping static libraries for '${subpackage}' ...${COLDEFAULT}"
659     run_resume post-mstripstatic_${subpackage} || mstripstatic ${BINDIR}_${subpackage}
660     resume_stamp post-mstripstatic_${subpackage}
661     fi
662    
663     # restore smage environment
664     split_restore_variables
665   done   done
666     # unset saved variables
667     split_unset_variables
668   else   else
669   echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}"
670   run_resume post-mstripbins || mstripbins ${BINDIR}   run_resume post-mstripbins || mstripbins ${BINDIR}
# Line 535  else Line 678  else
678   fi   fi
679  fi  fi
680    
681  if mqueryfeature "!pkgbuild"  if mqueryfeature "qalint"
682  then  then
683   echo -e "!pkgbuild detected; Package will not be build ..."   if mqueryfeature "!pkgbuild"
684  else   then
685   # build several targets   echo "!pkgbuild detected; skipping QA lint checks ..."
686   if [[ -n ${MAGE_TARGETS} ]]   else
687     if [[ -n ${SPLIT_PACKAGES} ]]
688   then   then
689   for target in ${MAGE_TARGETS}   # save smage environment
690     split_save_variables
691     for subpackage in ${SPLIT_PACKAGES}
692   do   do
693   # check if a special target_pkgbuild exists   # honor split_info
694   if typeset -f ${target}_pkgbuild > /dev/null   split_info_${subpackage}
695     if [[ ${PKGTYPE} = virtual ]]
696   then   then
697   # run it   # automatically set !pkgbuild here too
698   run_resume post-${target}_pkgbuild || ${target}_pkgbuild   msetfeature "!pkgbuild"
  resume_stamp post-${target}_pkgbuild  
699   fi   fi
  # now create the target package  
  run_resume post-pkg_builddir_${target} || ${MLIBDIR}/pkgbuild_dir.sh \  
  "${PNAME}-${target}-${PVER}-${ARCH}$(print_distrotag)-${PBUILD}" \  
  ${BINDIR} || die "target: ${target} package-build failed"  
  resume_stamp post-pkg_builddir_${target}  
700    
701   # build pkg-md5-sum if requested   if mqueryfeature "qalint"
702   run_resume post-md5sum_${target} || generate_package_md5sum \   then
703   --pcat "${PCAT}" \   if mqueryfeature "!pkgbuild"
704   --pname "${PNAME}" \   then
705   --pver "${PVER}" \   echo "!pkgbuild detected; skipping QA lint checks for '${subpackage}' ..."
706   --pbuild "${PBUILD}" \   else
707   --parch "${ARCH}" \   echo -e "${COLBLUE}===${COLGREEN} running QA lint checks for '${subpackage}' ...${COLDEFAULT}"
708   --target "${target}"   mqalint ${BINDIR}_${subpackage}
709   resume_stamp post-md5sum_${target}   fi
710     fi
711    
712   echo -e "${COLGREEN}\nPackage ${PNAME}-${target}-${PVER}-${ARCH}$(print_distrotag)-${PBUILD} successfully builded.\n${COLDEFAULT}"   # restore smage environment
713     split_restore_variables
714   done   done
715     # unset saved variables
716     split_unset_variables
717     else
718     echo -e "${COLBLUE}===${COLGREEN} running QA lint checks ...${COLDEFAULT}"
719     mqalint ${BINDIR}
720     fi
721     fi
722    fi
723    
724    if mqueryfeature "!pkgbuild"
725    then
726     echo -e "!pkgbuild detected; Package will not be build ..."
727    else
728   # build several subpackages   # build several subpackages
729   elif [[ -n ${SPLIT_PACKAGES} ]]   if [[ -n ${SPLIT_PACKAGES} ]]
730   then   then
731   split_save_variables   split_save_variables
732   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
# Line 579  else Line 734  else
734   # get the right variables for the split   # get the right variables for the split
735   export PNAME="${subpackage}"   export PNAME="${subpackage}"
736   split_info_${PNAME}   split_info_${PNAME}
737     # fix PCATEGORIE -> PCAT
738     if [[ ! -z ${PCATEGORIE} ]]
739     then
740     PCAT="${PCATEGORIE}"
741     unset PCATEGORIE
742     fi
743     if [[ ${PKGTYPE} = virtual ]]
744     then
745     # automatically set !pkgbuild here too
746     msetfeature "!pkgbuild"
747     fi
748    
749   # jump to next one if !pkgbuild is set in split_info   # jump to next one if !pkgbuild is set in split_info
750   mqueryfeature "!pkgbuild" && continue   if mqueryfeature "!pkgbuild"
751     then
752     # restore smage environment
753     split_restore_variables
754     continue
755     fi
756    
757   # check if an special subpackage_pkgbuild exists   # check if an special subpackage_pkgbuild exists
758   if typeset -f ${PNAME}_pkgbuild > /dev/null   if typeset -f ${PNAME}_pkgbuild > /dev/null
# Line 591  else Line 762  else
762   resume_stamp post-${PNAME}_pkgbuild   resume_stamp post-${PNAME}_pkgbuild
763   fi   fi
764   # now create the target package   # now create the target package
765   run_resume post-pkg_builddir_${PNAME} || ${MLIBDIR}/pkgbuild_dir.sh \   run_resume post-pkg_builddir_${PNAME} || ${MLIBDIR}/pkgbuild_dir \
766   "${PNAME}-${PVER}-${ARCH}$(print_distrotag)-${PBUILD}" \   "${PNAME}-${PVER}-${ARCH}$(print_distrotag)-${PBUILD}" \
767   "${BINDIR}_${PNAME}" || die "split_package: ${PNAME} package-build failed"   "${BINDIR}_${PNAME}" || die "split_package: ${PNAME} package-build failed"
768   resume_stamp post-pkg_builddir_${PNAME}   resume_stamp post-pkg_builddir_${PNAME}
# Line 614  else Line 785  else
785   split_unset_variables   split_unset_variables
786    
787   else   else
788   run_resume post-pkg_builddir || ${MLIBDIR}/pkgbuild_dir.sh ${PKGNAME} ${BINDIR} || die "package-build failed"   run_resume post-pkg_builddir || ${MLIBDIR}/pkgbuild_dir ${PKGNAME} ${BINDIR} || die "package-build failed"
789   resume_stamp post-pkg_builddir   resume_stamp post-pkg_builddir
790    
791   # build pkg-md5-sum if requested   # build pkg-md5-sum if requested
# Line 637  else Line 808  else
808   fi   fi
809  fi  fi
810    
811    # auto regen mage tree if requested
812    regen_mage_tree
813    
814  if mqueryfeature "buildlog"  if mqueryfeature "buildlog"
815  then  then
816   bzip2 -9f /var/log/smage/${PKGNAME}.log   bzip2 -9f ${SMAGELOGDIR}/${PKGNAME}.log
817  else  else
818   [[ -f /var/log/smage/${PKGNAME}.log ]] && rm /var/log/smage/${PKGNAME}.log   [[ -f ${SMAGELOGDIR}/${PKGNAME}.log ]] && rm ${SMAGELOGDIR}/${PKGNAME}.log
819  fi  fi
820    
821  xtitleclean  xtitleclean

Legend:
Removed from v.1649  
changed lines
  Added in v.2806