Magellan Linux

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

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

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

    revision 1640 by niro, Fri Jan 13 18:29:52 2012 UTC revision 1649 by niro, Fri Jan 13 21:04:02 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 180  then Line 180  then
    180   split_info_${subpackage}   split_info_${subpackage}
    181   # build md5sum for existing packages   # build md5sum for existing packages
    182   generate_package_md5sum \   generate_package_md5sum \
    183   --pcat "${PCATEGORIE}" \   --pcat "${PCAT}" \
    184   --pname "${PNAME}" \   --pname "${PNAME}" \
    185   --pver "${PVER}" \   --pver "${PVER}" \
    186   --pbuild "${PBUILD}" \   --pbuild "${PBUILD}" \
    # Line 194  then Line 194  then
    194   else   else
    195   # build md5sum for existing packages   # build md5sum for existing packages
    196   generate_package_md5sum \   generate_package_md5sum \
    197   --pcat "${PCATEGORIE}" \   --pcat "${PCAT}" \
    198   --pname "${PNAME}" \   --pname "${PNAME}" \
    199   --pver "${PVER}" \   --pver "${PVER}" \
    200   --pbuild "${PBUILD}" \   --pbuild "${PBUILD}" \
    # Line 267  fi Line 267  fi
    267  [ -z "${CXXFLAGS}" ] && die "no CXXFLAGS variable found in ${MAGERC}"  [ -z "${CXXFLAGS}" ] && die "no CXXFLAGS variable found in ${MAGERC}"
    268    
    269  smagesource ${SMAGENAME} || die "source failed"  smagesource ${SMAGENAME} || die "source failed"
    270  PKGNAME="${PNAME}-${PVER}-${ARCH}-${PBUILD}"  PKGNAME="${PNAME}-${PVER}-${ARCH}$(print_distrotag)-${PBUILD}"
    271  MD5DIR="$(dirname ${SMAGENAME})/md5"  MD5DIR="$(dirname ${SMAGENAME})/md5"
    272  SMAGE_LOG_CMD="tee -a /var/log/smage/${PKGNAME}.log"  SMAGE_LOG_CMD="tee -a /var/log/smage/${PKGNAME}.log"
    273    
    # Line 553  else Line 553  else
    553   fi   fi
    554   # now create the target package   # now create the target package
    555   run_resume post-pkg_builddir_${target} || ${MLIBDIR}/pkgbuild_dir.sh \   run_resume post-pkg_builddir_${target} || ${MLIBDIR}/pkgbuild_dir.sh \
    556   "${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD}" \   "${PNAME}-${target}-${PVER}-${ARCH}$(print_distrotag)-${PBUILD}" \
    557   ${BINDIR} || die "target: ${target} package-build failed"   ${BINDIR} || die "target: ${target} package-build failed"
    558   resume_stamp post-pkg_builddir_${target}   resume_stamp post-pkg_builddir_${target}
    559    
    560   # build pkg-md5-sum if requested   # build pkg-md5-sum if requested
    561   run_resume post-md5sum_${target} || generate_package_md5sum \   run_resume post-md5sum_${target} || generate_package_md5sum \
    562   --pcat "${PCATEGORIE}" \   --pcat "${PCAT}" \
    563   --pname "${PNAME}" \   --pname "${PNAME}" \
    564   --pver "${PVER}" \   --pver "${PVER}" \
    565   --pbuild "${PBUILD}" \   --pbuild "${PBUILD}" \
    # Line 567  else Line 567  else
    567   --target "${target}"   --target "${target}"
    568   resume_stamp post-md5sum_${target}   resume_stamp post-md5sum_${target}
    569    
    570   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}"
    571   done   done
    572    
    573   # build several subpackages   # build several subpackages
    # Line 592  else Line 592  else
    592   fi   fi
    593   # now create the target package   # now create the target package
    594   run_resume post-pkg_builddir_${PNAME} || ${MLIBDIR}/pkgbuild_dir.sh \   run_resume post-pkg_builddir_${PNAME} || ${MLIBDIR}/pkgbuild_dir.sh \
    595   "${PNAME}-${PVER}-${ARCH}-${PBUILD}" \   "${PNAME}-${PVER}-${ARCH}$(print_distrotag)-${PBUILD}" \
    596   "${BINDIR}_${PNAME}" || die "split_package: ${PNAME} package-build failed"   "${BINDIR}_${PNAME}" || die "split_package: ${PNAME} package-build failed"
    597   resume_stamp post-pkg_builddir_${PNAME}   resume_stamp post-pkg_builddir_${PNAME}
    598    
    599   # build pkg-md5-sum if requested   # build pkg-md5-sum if requested
    600   run_resume post-md5sum_${PNAME} || generate_package_md5sum \   run_resume post-md5sum_${PNAME} || generate_package_md5sum \
    601   --pcat "${PCATEGORIE}" \   --pcat "${PCAT}" \
    602   --pname "${PNAME}" \   --pname "${PNAME}" \
    603   --pver "${PVER}" \   --pver "${PVER}" \
    604   --pbuild "${PBUILD}" \   --pbuild "${PBUILD}" \
    605   --parch "${ARCH}"   --parch "${ARCH}"
    606   resume_stamp post-md5sum_${PNAME}   resume_stamp post-md5sum_${PNAME}
    607    
    608   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}"
    609    
    610   # restore smage environment   # restore smage environment
    611   split_restore_variables   split_restore_variables
    # Line 619  else Line 619  else
    619    
    620   # build pkg-md5-sum if requested   # build pkg-md5-sum if requested
    621   run_resume post-md5sum || generate_package_md5sum \   run_resume post-md5sum || generate_package_md5sum \
    622   --pcat "${PCATEGORIE}" \   --pcat "${PCAT}" \
    623   --pname "${PNAME}" \   --pname "${PNAME}" \
    624   --pver "${PVER}" \   --pver "${PVER}" \
    625   --pbuild "${PBUILD}" \   --pbuild "${PBUILD}" \
    Legend:
    Removed from v.1640  
    changed lines
      Added in v.1649