Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/mage/usr/lib/mage/smage2.sh

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

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

    revision 1640 by niro, Fri Jan 13 18:29:52 2012 UTC revision 1659 by niro, Sat Jan 14 00:01:52 2012 UTC
    # Line 34  fi Line 34  fi
    34  showversion  showversion
    35  echo  echo
    36    
    37  if [ -z "$1" ]  if [[ -z ${SMAGENAME} ]]
    38  then  then
    39   echo "No .smage2 file given. Exiting."   echo "No .smage2 file given. Exiting."
    40   echo   echo
    # Line 161  then Line 161  then
    161   do   do
    162   # build md5sum for existing packages   # build md5sum for existing packages
    163   generate_package_md5sum \   generate_package_md5sum \
    164   --pcat "${PCATEGORIE}" \   --pcat "${PCAT}" \
    165   --pname "${PNAME}" \   --pname "${PNAME}" \
    166   --pver "${PVER}" \   --pver "${PVER}" \
    167   --pbuild "${PBUILD}" \   --pbuild "${PBUILD}" \
    # Line 178  then Line 178  then
    178   # get the right variables for the split   # get the right variables for the split
    179   export PNAME="${subpackage}"   export PNAME="${subpackage}"
    180   split_info_${subpackage}   split_info_${subpackage}
    181     # fix PCATEGORIE -> PCAT
    182     if [[ ! -z ${PCATEGORIE} ]]
    183     then
    184     PCAT="${PCATEGORIE}"
    185     unset PCATEGORIE
    186     fi
    187   # build md5sum for existing packages   # build md5sum for existing packages
    188   generate_package_md5sum \   generate_package_md5sum \
    189   --pcat "${PCATEGORIE}" \   --pcat "${PCAT}" \
    190   --pname "${PNAME}" \   --pname "${PNAME}" \
    191   --pver "${PVER}" \   --pver "${PVER}" \
    192   --pbuild "${PBUILD}" \   --pbuild "${PBUILD}" \
    # Line 194  then Line 200  then
    200   else   else
    201   # build md5sum for existing packages   # build md5sum for existing packages
    202   generate_package_md5sum \   generate_package_md5sum \
    203   --pcat "${PCATEGORIE}" \   --pcat "${PCAT}" \
    204   --pname "${PNAME}" \   --pname "${PNAME}" \
    205   --pver "${PVER}" \   --pver "${PVER}" \
    206   --pbuild "${PBUILD}" \   --pbuild "${PBUILD}" \
    # Line 267  fi Line 273  fi
    273  [ -z "${CXXFLAGS}" ] && die "no CXXFLAGS variable found in ${MAGERC}"  [ -z "${CXXFLAGS}" ] && die "no CXXFLAGS variable found in ${MAGERC}"
    274    
    275  smagesource ${SMAGENAME} || die "source failed"  smagesource ${SMAGENAME} || die "source failed"
    276  PKGNAME="${PNAME}-${PVER}-${ARCH}-${PBUILD}"  PKGNAME="${PNAME}-${PVER}-${ARCH}$(print_distrotag)-${PBUILD}"
    277  MD5DIR="$(dirname ${SMAGENAME})/md5"  MD5DIR="$(dirname ${SMAGENAME})/md5"
    278  SMAGE_LOG_CMD="tee -a /var/log/smage/${PKGNAME}.log"  SMAGE_LOG_CMD="tee -a /var/log/smage/${PKGNAME}.log"
    279    
    # Line 553  else Line 559  else
    559   fi   fi
    560   # now create the target package   # now create the target package
    561   run_resume post-pkg_builddir_${target} || ${MLIBDIR}/pkgbuild_dir.sh \   run_resume post-pkg_builddir_${target} || ${MLIBDIR}/pkgbuild_dir.sh \
    562   "${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD}" \   "${PNAME}-${target}-${PVER}-${ARCH}$(print_distrotag)-${PBUILD}" \
    563   ${BINDIR} || die "target: ${target} package-build failed"   ${BINDIR} || die "target: ${target} package-build failed"
    564   resume_stamp post-pkg_builddir_${target}   resume_stamp post-pkg_builddir_${target}
    565    
    566   # build pkg-md5-sum if requested   # build pkg-md5-sum if requested
    567   run_resume post-md5sum_${target} || generate_package_md5sum \   run_resume post-md5sum_${target} || generate_package_md5sum \
    568   --pcat "${PCATEGORIE}" \   --pcat "${PCAT}" \
    569   --pname "${PNAME}" \   --pname "${PNAME}" \
    570   --pver "${PVER}" \   --pver "${PVER}" \
    571   --pbuild "${PBUILD}" \   --pbuild "${PBUILD}" \
    # Line 567  else Line 573  else
    573   --target "${target}"   --target "${target}"
    574   resume_stamp post-md5sum_${target}   resume_stamp post-md5sum_${target}
    575    
    576   echo -e "${COLGREEN}\nPackage ${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"   echo -e "${COLGREEN}\nPackage ${PNAME}-${target}-${PVER}-${ARCH}$(print_distrotag)-${PBUILD} successfully builded.\n${COLDEFAULT}"
    577   done   done
    578    
    579   # build several subpackages   # build several subpackages
    # Line 579  else Line 585  else
    585   # get the right variables for the split   # get the right variables for the split
    586   export PNAME="${subpackage}"   export PNAME="${subpackage}"
    587   split_info_${PNAME}   split_info_${PNAME}
    588     # fix PCATEGORIE -> PCAT
    589     if [[ ! -z ${PCATEGORIE} ]]
    590     then
    591     PCAT="${PCATEGORIE}"
    592     unset PCATEGORIE
    593     fi
    594    
    595   # jump to next one if !pkgbuild is set in split_info   # jump to next one if !pkgbuild is set in split_info
    596   mqueryfeature "!pkgbuild" && continue   mqueryfeature "!pkgbuild" && continue
    # Line 592  else Line 604  else
    604   fi   fi
    605   # now create the target package   # now create the target package
    606   run_resume post-pkg_builddir_${PNAME} || ${MLIBDIR}/pkgbuild_dir.sh \   run_resume post-pkg_builddir_${PNAME} || ${MLIBDIR}/pkgbuild_dir.sh \
    607   "${PNAME}-${PVER}-${ARCH}-${PBUILD}" \   "${PNAME}-${PVER}-${ARCH}$(print_distrotag)-${PBUILD}" \
    608   "${BINDIR}_${PNAME}" || die "split_package: ${PNAME} package-build failed"   "${BINDIR}_${PNAME}" || die "split_package: ${PNAME} package-build failed"
    609   resume_stamp post-pkg_builddir_${PNAME}   resume_stamp post-pkg_builddir_${PNAME}
    610    
    611   # build pkg-md5-sum if requested   # build pkg-md5-sum if requested
    612   run_resume post-md5sum_${PNAME} || generate_package_md5sum \   run_resume post-md5sum_${PNAME} || generate_package_md5sum \
    613   --pcat "${PCATEGORIE}" \   --pcat "${PCAT}" \
    614   --pname "${PNAME}" \   --pname "${PNAME}" \
    615   --pver "${PVER}" \   --pver "${PVER}" \
    616   --pbuild "${PBUILD}" \   --pbuild "${PBUILD}" \
    617   --parch "${ARCH}"   --parch "${ARCH}"
    618   resume_stamp post-md5sum_${PNAME}   resume_stamp post-md5sum_${PNAME}
    619    
    620   echo -e "${COLGREEN}\nPackage ${PNAME}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"   echo -e "${COLGREEN}\nPackage ${PNAME}-${PVER}-${ARCH}$(print_distrotag)-${PBUILD} successfully builded.\n${COLDEFAULT}"
    621    
    622   # restore smage environment   # restore smage environment
    623   split_restore_variables   split_restore_variables
    # Line 619  else Line 631  else
    631    
    632   # build pkg-md5-sum if requested   # build pkg-md5-sum if requested
    633   run_resume post-md5sum || generate_package_md5sum \   run_resume post-md5sum || generate_package_md5sum \
    634   --pcat "${PCATEGORIE}" \   --pcat "${PCAT}" \
    635   --pname "${PNAME}" \   --pname "${PNAME}" \
    636   --pver "${PVER}" \   --pver "${PVER}" \
    637   --pbuild "${PBUILD}" \   --pbuild "${PBUILD}" \
    Legend:
    Removed from v.1640  
    changed lines
      Added in v.1659