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 406 by niro, Fri Dec 29 23:37:56 2006 UTC revision 941 by niro, Fri Nov 20 19:41:27 2009 UTC
    # Line 4  Line 4 
    4  # needs pkgbuild_dir (mage)  # needs pkgbuild_dir (mage)
    5    
    6  # SMAGE2  # SMAGE2
    7  # $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.46 2006-12-29 23:37:56 niro Exp $  # $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.62 2007-11-28 10:47:50 niro Exp $
    8    
    9  #01.10.2004  #01.10.2004
    10  # added ccache support  # added ccache support
    11  # added distcc support  # added distcc support
    12    
    13    # set default user mage.rc
    14    : ${MAGERC="/etc/mage.rc"}
    15    
    16  ## setup ##  ## setup ##
    17  PKGSUFFIX="mpk"  PKGSUFFIX="mpk"
    18  SRCPKGSUFFIX="mpks"  SRCPKGSUFFIX="mpks"
    # Line 45  fi Line 48  fi
    48  # export default C locale  # export default C locale
    49  export LC_ALL=C  export LC_ALL=C
    50    
    51  source /etc/mage.rc  source /etc/mage.rc.global
    52    source ${MAGERC}
    53    
    54  # set PKGDIR and BUILDDIR and BINDIR to MROOT  # set PKGDIR and BUILDDIR and BINDIR to MROOT
    55  if [[ -n ${MROOT} ]]  if [[ -n ${MROOT} ]]
    # Line 64  showversion() Line 68  showversion()
    68  die()  die()
    69  {  {
    70   xtitleclean   xtitleclean
    71     echo -e ${COLRED}"Exited ${BASH_SOURCE} at line no ${BASH_LINENO}."${COLDEFAULT}
    72   echo "SMAGE failed: $@"   echo "SMAGE failed: $@"
    73   exit 1   exit 1
    74  }  }
    75    
    76    die_pipestatus()
    77    {
    78     local pos="$1"
    79     local comment="$2"
    80    
    81     [ ${PIPESTATUS[${pos}]} -gt 0 ] && die "${comment}"
    82    }
    83    
    84  xtitle()  xtitle()
    85  {  {
    86   if [[ ${TERM} = xterm ]]   if [[ ${TERM} = xterm ]]
    # Line 144  download_sources() Line 157  download_sources()
    157   ( cd ${SOURCEDIR}/${PNAME}; md5sum --check ${DB_MD5_SUM_FILE} &> /dev/null )   ( cd ${SOURCEDIR}/${PNAME}; md5sum --check ${DB_MD5_SUM_FILE} &> /dev/null )
    158   if [[ $? = 0 ]]   if [[ $? = 0 ]]
    159   then   then
    160   # md5's ok, not fetching needed   # md5's ok, no fetching needed
    161   FETCHING=false   FETCHING=false
    162   else   else
    163   FETCHING=true   FETCHING=true
    # Line 166  download_sources() Line 179  download_sources()
    179   my_SOURCEDIR="${SOURCEDIR}/${PNAME}"   my_SOURCEDIR="${SOURCEDIR}/${PNAME}"
    180   fi   fi
    181    
    182     # create the SOURCEDIR
    183     install -d ${my_SOURCEDIR}
    184    
    185   # if an mirrored file than replace first the mirror uri   # if an mirrored file than replace first the mirror uri
    186   if [ -n "$(echo ${my_SRC_URI} | grep 'mirror://')" ]   if [[ -n $(echo ${my_SRC_URI} | grep 'mirror://') ]]
    187   then   then
    188   for mirror in ${MIRRORS}   for mirror in ${MIRRORS}
    189   do   do
    # Line 175  download_sources() Line 191  download_sources()
    191    
    192   if [[ ${FETCHING} = true ]]   if [[ ${FETCHING} = true ]]
    193   then   then
    194   echo "==> fetching ${my_SRC_URI_MIRROR}"   echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"
    195     wget \
    196     --passive-ftp \
    197     --tries 3 \
    198     --continue \
    199     --progress bar \
    200     --output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI_MIRROR})" \
    201     "${my_SRC_URI_MIRROR}"
    202     if [[ $? = 0 ]]
    203     then
    204     break
    205     else
    206     continue
    207     fi
    208     fi
    209     done
    210     elif [[ -n $(echo ${my_SRC_URI} | grep 'sourceforge://') ]]
    211     then
    212     for mirror in ${SOURCEFORGE_MIRRORS}
    213     do
    214     my_SRC_URI_MIRROR="$(echo ${my_SRC_URI} | sed "s|sourceforge:/|${mirror}|g")"
    215    
    216     if [[ ${FETCHING} = true ]]
    217     then
    218     echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"
    219     wget \
    220     --passive-ftp \
    221     --tries 3 \
    222     --continue \
    223     --progress bar \
    224     --output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI_MIRROR})" \
    225     "${my_SRC_URI_MIRROR}"
    226     if [[ $? = 0 ]]
    227     then
    228     break
    229     else
    230     continue
    231     fi
    232     fi
    233     done
    234     elif [[ -n $(echo ${my_SRC_URI} | grep 'gnu://') ]]
    235     then
    236     for mirror in ${GNU_MIRRORS}
    237     do
    238     my_SRC_URI_MIRROR="$(echo ${my_SRC_URI} | sed "s|gnu:/|${mirror}|g")"
    239    
    240     if [[ ${FETCHING} = true ]]
    241     then
    242     echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"
    243     wget \
    244     --passive-ftp \
    245     --tries 3 \
    246     --continue \
    247     --progress bar \
    248     --output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI_MIRROR})" \
    249     "${my_SRC_URI_MIRROR}"
    250     if [[ $? = 0 ]]
    251     then
    252     break
    253     else
    254     continue
    255     fi
    256     fi
    257     done
    258     elif [[ -n $(echo ${my_SRC_URI} | grep 'kde://') ]]
    259     then
    260     for mirror in ${KDE_MIRRORS}
    261     do
    262     my_SRC_URI_MIRROR="$(echo ${my_SRC_URI} | sed "s|kde:/|${mirror}|g")"
    263    
    264     if [[ ${FETCHING} = true ]]
    265     then
    266     echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"
    267   wget \   wget \
    268   --passive-ftp \   --passive-ftp \
    269   --tries 3 \   --tries 3 \
    270   --continue \   --continue \
    271   --progress bar \   --progress bar \
    272   --directory-prefix="${my_SOURCEDIR}" \   --output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI_MIRROR})" \
    273     "${my_SRC_URI_MIRROR}"
    274     if [[ $? = 0 ]]
    275     then
    276     break
    277     else
    278     continue
    279     fi
    280     fi
    281     done
    282     elif [[ -n $(echo ${my_SRC_URI} | grep 'gnome://') ]]
    283     then
    284     for mirror in ${GNOME_MIRRORS}
    285     do
    286     my_SRC_URI_MIRROR="$(echo ${my_SRC_URI} | sed "s|gnome:/|${mirror}|g")"
    287    
    288     if [[ ${FETCHING} = true ]]
    289     then
    290     echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"
    291     wget \
    292     --passive-ftp \
    293     --tries 3 \
    294     --continue \
    295     --progress bar \
    296     --output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI_MIRROR})" \
    297   "${my_SRC_URI_MIRROR}"   "${my_SRC_URI_MIRROR}"
    298   if [[ $? = 0 ]]   if [[ $? = 0 ]]
    299   then   then
    # Line 194  download_sources() Line 306  download_sources()
    306   else   else
    307   if [[ ${FETCHING} = true ]]   if [[ ${FETCHING} = true ]]
    308   then   then
    309   echo "==> fetching ${my_SRC_URI}"   echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI}${COLDEFAULT}"
    310   wget \   wget \
    311   --passive-ftp \   --passive-ftp \
    312   --tries 3 \   --tries 3 \
    313   --continue \   --continue \
    314   --progress bar \   --progress bar \
    315   --directory-prefix="${my_SOURCEDIR}" \   --output-document="${my_SOURCEDIR}/$(basename ${my_SRC_URI})" \
    316   "${my_SRC_URI}"   "${my_SRC_URI}"
    317   fi   fi
    318   fi   fi
    # Line 214  download_sources() Line 326  download_sources()
    326    
    327   # recheck md5 sums   # recheck md5 sums
    328   echo   echo
    329   echo ">== Checking MD5 sums:"   echo -e "${COLBLUE}===${COLGREEN} Checking MD5 sums:${COLDEFAULT}"
    330   ( cd ${SOURCEDIR}/${PNAME}; md5sum --check ${DB_MD5_SUM_FILE} ) || die "md5 failed"   ( cd ${SOURCEDIR}/${PNAME}; md5sum --check ${DB_MD5_SUM_FILE} ) || die "md5 failed"
    331   echo   echo
    332    
    # Line 261  mconfigure() Line 373  mconfigure()
    373   ./configure \   ./configure \
    374   --prefix=/usr \   --prefix=/usr \
    375   --host=${CHOST} \   --host=${CHOST} \
    376     --build=${CHOST} \
    377   --mandir=/usr/share/man \   --mandir=/usr/share/man \
    378   --infodir=/usr/share/info \   --infodir=/usr/share/info \
    379   --datadir=/usr/share \   --datadir=/usr/share \
    # Line 304  munpack() Line 417  munpack()
    417    
    418   SRCFILE=$1   SRCFILE=$1
    419    
    420   if [ -z "$2" ]   if [[ -z $2 ]]
    421   then   then
    422   DEST=${BUILDDIR}   DEST=${BUILDDIR}
    423   else   else
    424   DEST=$2   DEST=$2
    425   fi   fi
    426    
    427     [[ ! -d ${DEST} ]] && install -d ${DEST}
    428    
    429   case "${SRCFILE##*.}" in   case "${SRCFILE##*.}" in
    430   bz2)   bz2)
    431   IFTAR="$(basename $SRCFILE .bz2)"   IFTAR="$(basename $SRCFILE .bz2)"
    432   IFTAR="${IFTAR##*.}"   IFTAR="${IFTAR##*.}"
    433   if [[ ${IFTAR} = tar ]]   if [[ ${IFTAR} = tar ]]
    434   then   then
    435   tar --no-same-owner -xvjf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST}   tar --no-same-owner -xvjf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".tar.bz2 unpack failed."
    436     else
    437     pushd ${DEST} > /dev/null
    438     bzcat ${SOURCEDIR}/${PNAME}/${SRCFILE} > ${DEST}/$(basename ${SRCFILE} .bz2) || die ".bz2 unpack failed."
    439     popd > /dev/null
    440   fi   fi
    441   ;;   ;;
    442   gz)   gz)
    # Line 325  munpack() Line 444  munpack()
    444   IFTAR="${IFTAR##*.}"   IFTAR="${IFTAR##*.}"
    445   if [[ ${IFTAR} = tar ]]   if [[ ${IFTAR} = tar ]]
    446   then   then
    447   tar --no-same-owner -xvzf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST}   tar --no-same-owner -xvzf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".tar.gz unpack failed."
    448     else
    449     pushd ${DEST} > /dev/null
    450     zcat ${SOURCEDIR}/${PNAME}/${SRCFILE} > ${DEST}/$(basename ${SRCFILE} .gz) || die ".gz unpack failed."
    451     popd > /dev/null
    452   fi   fi
    453   ;;   ;;
    454   tbz2)   tbz2|mpks|mpk)
    455   tar --no-same-owner -xvjf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST}   tar --no-same-owner -xvjf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".tbz2 unpack failed."
    456   ;;   ;;
    457   tgz)   tgz)
    458   tar --no-same-owner -xvzf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST}   tar --no-same-owner -xvzf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".tgz unpack failed."
    459     ;;
    460     rar)
    461     unrar x ${SOURCEDIR}/${PNAME}/${SRCFILE} ${DEST}  || die ".rar unpack failed."
    462     ;;
    463     zip|xpi)
    464     unzip ${SOURCEDIR}/${PNAME}/${SRCFILE} -d ${DEST} || die ".zip unpack failed."
    465     ;;
    466     rpm)
    467     pushd ${DEST} > /dev/null
    468     rpm2targz ${SOURCEDIR}/${PNAME}/${SRCFILE} || die "rpm2targz: .rpm unpack failed."
    469     tar --no-same-owner -xvzf ${SRCFILE/.rpm/.tar.gz} || die "tar: .rpm unpack failed."
    470     if [[ -f ${DEST}/${SRCFILE/.rpm/.tar.gz} ]]
    471     then
    472     rm ${DEST}/${SRCFILE/.rpm/.tar.gz}
    473     fi
    474   ;;   ;;
    475   *)   *)
    476   die "munpack failed"   die "munpack failed"
    # Line 344  mpatch() Line 482  mpatch()
    482  {  {
    483   local PATCHOPTS   local PATCHOPTS
    484   local PATCHFILE   local PATCHFILE
    485     local i
    486    
    487   PATCHOPTS=$1   PATCHOPTS=$1
    488   PATCHFILE=$2   PATCHFILE=$2
    489    
    490     if [[ -z $2 ]]
    491     then
    492     PATCHFILE=$1
    493    
    494     ## patch level auto-detection, get patch level
    495     for ((i=0; i < 10; i++))
    496     do
    497     patch --dry-run -Np${i} -i ${SOURCEDIR}/${PNAME}/${PATCHFILE} > /dev/null
    498     if [[ $? = 0 ]]
    499     then
    500     PATCHOPTS="-Np${i}"
    501     break
    502     fi
    503     done
    504     fi
    505    
    506   echo -e "${COLBLUE}*** ${COLGREEN}Applying patch '${PATCHFILE}'${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}Applying patch '${PATCHFILE}'${COLDEFAULT}"
    507   patch "${PATCHOPTS}" -i ${SOURCEDIR}/${PNAME}/${PATCHFILE}   patch "${PATCHOPTS}" -i ${SOURCEDIR}/${PNAME}/${PATCHFILE}
    508  }  }
    509    
    510    mlibtoolize()
    511    {
    512     local opts="$@"
    513     [[ -z ${opts} ]] && opts="--copy --force"
    514    
    515     libtoolize ${opts} || die "running: mlibtoolize ${opts}"
    516    }
    517    
    518  minstalldocs()  minstalldocs()
    519  {  {
    # Line 406  setup_distcc_environment() Line 568  setup_distcc_environment()
    568  {  {
    569   if [ -x /usr/bin/distcc ]   if [ -x /usr/bin/distcc ]
    570   then   then
    571   echo "Using DistCC for compilation ..."   echo -e "${COLBLUE}---${COLGREEN} Using DistCC for compilation ...${COLDEFAULT}"
    572   export PATH=/usr/$(mlibdir)/distcc/bin:${PATH} || die "distcc: could not export new $PATH"   export PATH=/usr/$(mlibdir)/distcc/bin:${PATH} || die "distcc: could not export new $PATH"
    573    
    574   export DISTCC_DIR="${DISTCC_DIR}" || die "distcc_dir export failed"   export DISTCC_DIR="${DISTCC_DIR}" || die "distcc_dir export failed"
    # Line 421  setup_ccache_environment() Line 583  setup_ccache_environment()
    583  {  {
    584   if [ -x /usr/bin/ccache ]   if [ -x /usr/bin/ccache ]
    585   then   then
    586   echo "Using CCache for compilation ..."   echo -e "${COLBLUE}---${COLGREEN} Using CCache for compilation ...${COLDEFAULT}"
    587   export PATH=/usr/$(mlibdir)/ccache/bin:${PATH} || die "ccache: could not export new $PATH"   export PATH=/usr/$(mlibdir)/ccache/bin:${PATH} || die "ccache: could not export new $PATH"
    588   fi   fi
    589  }  }
    # Line 445  fix_mage_deps() Line 607  fix_mage_deps()
    607   # fix DEPEND   # fix DEPEND
    608   while read sym dep   while read sym dep
    609   do   do
    610     # ignore empty lines
    611     [[ -z ${dep} ]] && continue
    612    
    613   cat="$(dirname ${dep})"   cat="$(dirname ${dep})"
    614   # change if not virtual   # change if not virtual
    615   if [[ ${cat} = virtual ]]   if [[ ${cat} = virtual ]]
    # Line 497  EOF Line 662  EOF
    662  # special tags:  # special tags:
    663  #   PKGTYPE               type of pkg  #   PKGTYPE               type of pkg
    664  #   INHERITS              which functions get included  #   INHERITS              which functions get included
    665  #   SPECIAL_FUNCTIONS     special functions wich should also be added  #   SPECIAL_FUNCTIONS     special functions which should also be added
    666  #                         warning: they get killed before the build starts !  #                         warning: they get killed before the build starts !
    667  #  #
    668  #   MAGE_TREE_DEST        target destination of the generated tree  #   MAGE_TREE_DEST        target destination of the generated tree
    # Line 525  build_mage_script() Line 690  build_mage_script()
    690   dest="${MAGE_TREE_DEST}/${PCATEGORIE}/${PNAME}${target}/${magefile}"   dest="${MAGE_TREE_DEST}/${PCATEGORIE}/${PNAME}${target}/${magefile}"
    691    
    692   # show what we are doing   # show what we are doing
    693   echo "Generating Mage file:"   echo -e "${COLBLUE}===${COLGREEN} generating mage file:${COLDEFAULT}"
    694   echo "  ${dest}"   echo "${dest}"
    695    
    696   install -d "$(dirname ${dest})"   install -d "$(dirname ${dest})"
    697   # now build the mage file   # now build the mage file
    698   > ${dest}   > ${dest}
    699    
    700   # header   # header
    701   echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.46 2006-12-29 23:37:56 niro Exp $' >> ${dest}   echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.62 2007-11-28 10:47:50 niro Exp $' >> ${dest}
    702   echo  >> ${dest}   echo  >> ${dest}
    703    
    704   # pgkname and state   # pgkname and state
    # Line 641  regen_mage_tree() Line 806  regen_mage_tree()
    806   # now unset all uneeded vars to be safe   # now unset all uneeded vars to be safe
    807   # unset PKGNAME <-- don't do that; smage needs this var   # unset PKGNAME <-- don't do that; smage needs this var
    808   # unset to be safe (quotes needed !)   # unset to be safe (quotes needed !)
    809   for i in ${SPECIAL_FUNCTIONS}  # for i in ${SPECIAL_FUNCTIONS}
    810   do  # do
    811   unset "${i}"  # unset "${i}"
    812   done  # done
    813   unset SPECIAL_FUNCTIONS   unset SPECIAL_FUNCTIONS
    814   for i in ${SPECIAL_VARS}  # for i in ${SPECIAL_VARS}
    815   do  # do
    816   unset "${i}"  # unset "${i}"
    817   done  # done
    818   unset SPECIAL_VARS   unset SPECIAL_VARS
    819   unset STATE   unset STATE
    820   unset DESCRIPTION   unset DESCRIPTION
    # Line 726  generate_package_md5sum() Line 891  generate_package_md5sum()
    891   # fix target as it may be empty !   # fix target as it may be empty !
    892   [ -n "${target}" ] && target="-${target}"   [ -n "${target}" ] && target="-${target}"
    893    
    894    
    895   # build pkgname   # build pkgname
    896   pkgname="${pname}${target}-${pver}-${parch}-${pbuild}"   pkgname="${pname}${target}-${pver}-${parch}-${pbuild}"
    897    
    898   # build pkg-md5-sum only if requested   # build pkg-md5-sum only if requested
    899   if [[ ${REGEN_MAGE_TREE} = true ]]   if [[ ${REGEN_MAGE_TREE} = true ]]
    900   then   then
    901   echo -n "Generating a md5sum for ${pkgname}.${PKGSUFFIX} ... "   echo -ne "${COLBLUE}===${COLGREEN} generating md5's for ${pkgname}.${PKGSUFFIX} ... ${COLDEFAULT}"
    902    
    903   # abort if not exist   # abort if not exist
    904   if [ ! -f ${PKGDIR}/${pkgname}.${PKGSUFFIX} ]   if [ ! -f ${PKGDIR}/${pkgname}.${PKGSUFFIX} ]
    905   then   then
    906   echo "! exists"   echo -e "${COLRED}! exists${COLDEFAULT}"
    907   return 0   return 0
    908   fi   fi
    909    
    # Line 745  generate_package_md5sum() Line 911  generate_package_md5sum()
    911   : ${MAGE_TREE_DEST=${BUILDDIR}/mage-tree}   : ${MAGE_TREE_DEST=${BUILDDIR}/mage-tree}
    912    
    913   # setup md5 dir   # setup md5 dir
    914   dest="${MAGE_TREE_DEST}/${pcat}/${pname}/md5"   dest="${MAGE_TREE_DEST}/${pcat}/${pname}${target}/md5"
    915   install -d ${dest}   install -d ${dest}
    916    
    917   # gen md5sum   # gen md5sum
    918   ( cd ${PKGDIR}; md5sum "${pkgname}.${PKGSUFFIX}" ) \   ( cd ${PKGDIR}; md5sum "${pkgname}.${PKGSUFFIX}" ) \
    919   > ${dest}/${pkgname}.md5   > ${dest}/${pkgname}.md5
    920   echo "done"   echo -e "${COLGREEN}done${COLDEFAULT}"
    921   fi   fi
    922  }  }
    923    
    # Line 769  source_pkg_build() Line 935  source_pkg_build()
    935   return 0   return 0
    936   fi   fi
    937    
    938   [ -z "${SRCPKGDIR}" ] && die "\$SRCPKGDIR not found. Please setup your mage.rc correctly."   [ -z "${SRCPKGDIR}" ] && die "\$SRCPKGDIR not found. Please setup your ${MAGERC} correctly."
    939    
    940   echo -e "${COLGREEN}Creating source package tarball ... ${COLDEFAULT}"   echo -e "${COLGREEN}Creating source package tarball ... ${COLDEFAULT}"
    941    
    942     # include the smage2 file
    943     cp ${SMAGENAME} ${SOURCEDIR}/${PNAME}
    944    
    945   ( cd ${SOURCEDIR}; tar cvjf ${BUILDDIR}/${PNAME}-${PVER}-${PBUILD}.tar.bz2 ${PNAME}; )   ( cd ${SOURCEDIR}; tar cvjf ${BUILDDIR}/${PNAME}-${PVER}-${PBUILD}.tar.bz2 ${PNAME}; )
    946   [[ ! -d ${SRCPKGDIR} ]] && install -d ${SRCPKGDIR}   [[ ! -d ${SRCPKGDIR} ]] && install -d ${SRCPKGDIR}
    947   mv ${BUILDDIR}/${PNAME}-${PVER}-${PBUILD}.tar.bz2 ${SRCPKGDIR}/${PNAME}-${PVER}-${PBUILD}.${SRCPKGSUFFIX}   mv ${BUILDDIR}/${PNAME}-${PVER}-${PBUILD}.tar.bz2 ${SRCPKGDIR}/${PNAME}-${PVER}-${PBUILD}.${SRCPKGSUFFIX}
    # Line 779  source_pkg_build() Line 949  source_pkg_build()
    949   echo -e "${COLGREEN}Source package ${COLBLUE}${PNAME}-${PVER}-${PBUILD}.${SRCPKGSUFFIX} ${COLGREEN}successfully builded.${COLDEFAULT}"   echo -e "${COLGREEN}Source package ${COLBLUE}${PNAME}-${PVER}-${PBUILD}.${SRCPKGSUFFIX} ${COLGREEN}successfully builded.${COLDEFAULT}"
    950  }  }
    951    
    952    step_by_step()
    953    {
    954     if [[ ${STEP_BY_STEP} = true ]]
    955     then
    956     echo "${COLRED}Step-by-step enabled! Paused after $1.${COLDEFAULT}"
    957     echo "Press [enter] to continue"
    958     read
    959     fi
    960    }
    961    
    962    
    963  # print out our version  # print out our version
    964  showversion  showversion
    # Line 899  then Line 1079  then
    1079    
    1080   regen_mage_tree   regen_mage_tree
    1081    
    1082   # build md5sum for existing packages   # build several targets
    1083   generate_package_md5sum \   if [ -n "${MAGE_TARGETS}" ]
    1084   --pcat "${PCATEGORIE}" \   then
    1085   --pname "${PNAME}" \   for target in ${MAGE_TARGETS}
    1086   --pver "${PVER}" \   do
    1087   --pbuild "${PBUILD}" \   # build md5sum for existing packages
    1088   --parch "${ARCH}" \   generate_package_md5sum \
    1089   --target "${target}"   --pcat "${PCATEGORIE}" \
    1090     --pname "${PNAME}" \
    1091     --pver "${PVER}" \
    1092     --pbuild "${PBUILD}" \
    1093     --parch "${ARCH}" \
    1094     --target "${target}"
    1095     done
    1096     else
    1097     # build md5sum for existing packages
    1098     generate_package_md5sum \
    1099     --pcat "${PCATEGORIE}" \
    1100     --pname "${PNAME}" \
    1101     --pver "${PVER}" \
    1102     --pbuild "${PBUILD}" \
    1103     --parch "${ARCH}" \
    1104     --target "${target}"
    1105     fi
    1106    
    1107   exit 0   exit 0
    1108  fi  fi
    1109    
    1110  if [ "$1" == "only-src-pkg" -a -n "$2" ]  if [ "$1" == "--create-src-tarball" -a -n "$2" ]
    1111  then  then
    1112   # set correct SMAGENAME   # set correct SMAGENAME
    1113   SMAGENAME="$2"   SMAGENAME="$2"
    1114   MD5DIR="$(dirname ${SMAGENAME})/md5"   MD5DIR="$(dirname ${SMAGENAME})/md5"
    1115    
    1116   echo -e "${COLGREEN}only-src-pkg called for ${COLBLUE}${SMAGENAME}${COLGREEN} ...${COLDEFAULT}"   echo -e "${COLGREEN}create-src-tarball called for ${COLBLUE}${SMAGENAME}${COLGREEN} ...${COLDEFAULT}"
    1117    
    1118   source ${SMAGENAME} || die "regen: smage2 not found"   source ${SMAGENAME} || die "regen: smage2 not found"
    1119    
    # Line 934  fi Line 1130  fi
    1130    
    1131  if [ "$1" == "--src-tarball" -a -n "$2" ] || [ "$1" == "-st" -a -n "$2" ]  if [ "$1" == "--src-tarball" -a -n "$2" ] || [ "$1" == "-st" -a -n "$2" ]
    1132  then  then
    1133   # set correct SMAGENAME   SRCPKGTARBALL="${2}"
      SMAGENAME="$2"  
      SRCPKGTARBALL="${SRCPKGDIR}/$(basename ${SMAGENAME} .${SMAGESUFFIX}).${SRCPKGSUFFIX}"  
    1134   USE_SRC_PKG_TARBALL=true   USE_SRC_PKG_TARBALL=true
    1135    
    1136     # abort if given file is not a source pkg
    1137     [[ ${SRCPKGTARBALL##*.} != ${SRCPKGSUFFIX} ]] && die "${SRCPKGTARBALL} is not a valid src-pkg file."
    1138    
    1139     # set correct SMAGENAME; use the one that the src_pkg provide
    1140     # /path/to/SOURCEDIR/PNAME/SMAGENAME
    1141     SMAGENAME="${SOURCEDIR}/$(basename ${SRCPKGTARBALL%-*-*})/$(basename ${SRCPKGTARBALL} .${SRCPKGSUFFIX}).${SMAGESUFFIX}"
    1142    
    1143   echo -e "${COLGREEN}Using src-tarball ${COLBLUE}${SRCPKGTARBALL}${COLGREEN} ...${COLDEFAULT}"   echo -e "${COLGREEN}Using src-tarball ${COLBLUE}${SRCPKGTARBALL}${COLGREEN} ...${COLDEFAULT}"
    1144    
    1145   [[ ! -d ${SOURCEDIR} ]] && install -d ${SOURCEDIR}   [[ ! -d ${SOURCEDIR} ]] && install -d ${SOURCEDIR}
    # Line 947  then Line 1148  then
    1148   [[ ! -f ${SRCPKGTARBALL} ]] && die "Error: ${SRCPKGTARBALL} does not exist. Aborting."   [[ ! -f ${SRCPKGTARBALL} ]] && die "Error: ${SRCPKGTARBALL} does not exist. Aborting."
    1149    
    1150   tar xvjf ${SRCPKGTARBALL} -C ${SOURCEDIR} || die  "Error unpackung src-tarball ${SRCPKGTARBALL}"   tar xvjf ${SRCPKGTARBALL} -C ${SOURCEDIR} || die  "Error unpackung src-tarball ${SRCPKGTARBALL}"
    1151    
    1152     [[ ! -f ${SMAGENAME} ]] && die "Included smage2 file in src-tarball not found: ${SMAGENAME}"
    1153  fi  fi
    1154    
    1155    
    1156  [ ! -e ${MLIBDIR}/pkgbuild_dir.sh ] && die "Error: ${MLIBDIR}/pkgbuild_dir.sh not found. Aborting."  [ ! -e ${MLIBDIR}/pkgbuild_dir.sh ] && die "Error: ${MLIBDIR}/pkgbuild_dir.sh not found. Aborting."
    1157  [ -z "$(basename ${SMAGENAME} | grep .${SMAGESUFFIX})" ] &&  [ -z "$(basename ${SMAGENAME} | grep .${SMAGESUFFIX})" ] &&
    1158   die "File '$(basename ${SMAGENAME})' is not a sMage v${SMAGEVERSION} file. Aborting."   die "File '$(basename ${SMAGENAME})' is not a sMage v${SMAGEVERSION} file. Aborting."
    1159  [ -z "${SOURCEDIR}" ] && die "\$SOURCEDIR not found. Please setup your mage.rc correctly."  [ -z "${SOURCEDIR}" ] && die "\$SOURCEDIR not found. Please setup your ${MAGERC} correctly."
    1160  [ -z "${SMAGESCRIPTSDIR}" ] && die "\$SMAGESCRIPTSDIR not found. Please setup your mage.rc correctly."  [ -z "${SMAGESCRIPTSDIR}" ] && die "\$SMAGESCRIPTSDIR not found. Please setup your ${MAGERC} correctly."
    1161  [ -z "${SMAGE2RSYNC}" ] && die "\$SMAGE2RSYNC not found. Please setup your mage.rc correctly."  [ -z "${SMAGE2RSYNC}" ] && die "\$SMAGE2RSYNC not found. Please setup your ${MAGERC} correctly."
    1162  [ -z "${BINDIR}" ] && die "no BINDIR variable found in /etc/mage.rc"  [ -z "${BINDIR}" ] && die "no BINDIR variable found in ${MAGERC}"
    1163  [ -z "${CHOST}" ] && die "no CHOST variable found in /etc/mage.rc"  [ -z "${CHOST}" ] && die "no CHOST variable found in ${MAGERC}"
    1164  [ -z "${CFLAGS}" ] && die "no CFLAGS variable found in /etc/mage.rc"  [ -z "${CFLAGS}" ] && die "no CFLAGS variable found in ${MAGERC}"
    1165  [ -z "${CXXFLAGS}" ] && die "no CXXFLAGS variable found in /etc/mage.rc"  [ -z "${CXXFLAGS}" ] && die "no CXXFLAGS variable found in ${MAGERC}"
    1166    
    1167  source ${SMAGENAME} || die "source failed"  source ${SMAGENAME} || die "source failed"
    1168  PKGNAME="${PNAME}-${PVER}-${ARCH}-${PBUILD}"  PKGNAME="${PNAME}-${PVER}-${ARCH}-${PBUILD}"
    1169  MD5DIR="$(dirname ${SMAGENAME})/md5"  MD5DIR="$(dirname ${SMAGENAME})/md5"
    1170    SMAGE_LOG_CMD="tee -a /var/log/smage/${PKGNAME}.log"
    1171    
    1172  xtitle "Compiling ${PKGNAME}"  xtitle "Compiling ${PKGNAME}"
    1173  echo "Compiling ${PKGNAME}"  echo -e "${COLGREEN}Compiling ${PKGNAME}${COLDEFAULT}"
    1174    
    1175  # auto regen mage tree if requested  # auto regen mage tree if requested
    1176  regen_mage_tree  regen_mage_tree
    # Line 975  if [[ ${CREATE_SRC_PKG_TARBALL} = true ] Line 1179  if [[ ${CREATE_SRC_PKG_TARBALL} = true ]
    1179  then  then
    1180   if [[ -d ${SOURCEDIR}/${PNAME} ]]   if [[ -d ${SOURCEDIR}/${PNAME} ]]
    1181   then   then
    1182   echo -e "${COLGREEN}Deleting old sourcefiles ${COLBLUE}${SOURCEDIR}/${PNAME}${COLGREEN} ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} deleting old sourcefiles ${COLBLUE}${SOURCEDIR}/${PNAME}${COLGREEN} ...${COLDEFAULT}"
    1183   rm -rf ${SOURCEDIR}/${PKGNAME}   rm -rf ${SOURCEDIR}/${PNAME}
    1184   fi   fi
    1185  fi  fi
    1186    
    # Line 1038  then Line 1242  then
    1242   mage rmstamp   mage rmstamp
    1243  fi  fi
    1244    
    1245  src_prepare || die "src_prepare failed"  # setup build loggins
    1246  src_compile || die "src_compile failed"  [[ ! -d /var/log/smage ]] && install -d /var/log/smage
    1247  src_install || die "src_install failed"  echo -e "### Build started on $(date) ###\n" > /var/log/smage/${PKGNAME}.log
    1248    
    1249    src_prepare | ${SMAGE_LOG_CMD}
    1250    die_pipestatus 0 "src_prepare failed"
    1251    step_by_step $_
    1252    
    1253    src_compile | ${SMAGE_LOG_CMD}
    1254    die_pipestatus 0 "src_compile failed"
    1255    step_by_step $_
    1256    
    1257    src_install | ${SMAGE_LOG_CMD}
    1258    die_pipestatus 0 "src_install failed"
    1259    step_by_step $_
    1260    
    1261    
    1262  # compressing doc, info & man files  # compressing doc, info & man files
     echo -e "Compressing man-pages ..."  
    1263  if [ -d ${BUILDDIR}/builded/usr/share/man ]  if [ -d ${BUILDDIR}/builded/usr/share/man ]
    1264  then  then
    1265     echo -e "${COLBLUE}===${COLGREEN} compressing man-pages ...${COLDEFAULT}"
    1266   ${MLIBDIR}/compressdoc -g -9 ${BUILDDIR}/builded/usr/share/man   ${MLIBDIR}/compressdoc -g -9 ${BUILDDIR}/builded/usr/share/man
    1267  fi  fi
    1268    
     echo -e "Compressing info-pages ..."  
    1269  if [ -d ${BUILDDIR}/builded/usr/share/info ]  if [ -d ${BUILDDIR}/builded/usr/share/info ]
    1270  then  then
    1271     echo -e "${COLBLUE}===${COLGREEN} compressing info-pages ...${COLDEFAULT}"
    1272   ${MLIBDIR}/compressdoc -g -9 ${BUILDDIR}/builded/usr/share/info   ${MLIBDIR}/compressdoc -g -9 ${BUILDDIR}/builded/usr/share/info
    1273  fi  fi
    1274    
    # Line 1062  case ${NOSTRIP} in Line 1278  case ${NOSTRIP} in
    1278   echo -e "NOSTRIP=true detected; Package will not be stripped ..."   echo -e "NOSTRIP=true detected; Package will not be stripped ..."
    1279   ;;   ;;
    1280   *)   *)
    1281   echo -e "Stripping binaries ..."   echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}"
    1282   mstripbins ${BINDIR}   mstripbins ${BINDIR}
    1283   echo -e "Stripping libraries ..."   echo -e "${COLBLUE}===${COLGREEN} stripping libraries ...${COLDEFAULT}"
    1284   mstriplibs ${BINDIR}   mstriplibs ${BINDIR}
    1285   ;;   ;;
    1286  esac  esac
    # Line 1100  case ${NOPKGBUILD} in Line 1316  case ${NOPKGBUILD} in
    1316   --parch "${ARCH}" \   --parch "${ARCH}" \
    1317   --target "${target}"   --target "${target}"
    1318    
    1319   echo -e "\nPackage ${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n"   echo -e "${COLGREEN}\nPackage ${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"
    1320   done   done
    1321   else   else
    1322   ${MLIBDIR}/pkgbuild_dir.sh ${PKGNAME} ${BINDIR} || die "package-build failed"   ${MLIBDIR}/pkgbuild_dir.sh ${PKGNAME} ${BINDIR} || die "package-build failed"
    # Line 1113  case ${NOPKGBUILD} in Line 1329  case ${NOPKGBUILD} in
    1329   --pbuild "${PBUILD}" \   --pbuild "${PBUILD}" \
    1330   --parch "${ARCH}"   --parch "${ARCH}"
    1331    
    1332   echo -e "\nPackage ${PKGNAME} successfully builded.\n"   echo -e "${COLGREEN}\nPackage ${PKGNAME} successfully builded.\n${COLDEFAULT}"
    1333   fi   fi
    1334    
    1335   # build src-pkg-tarball if requested   # build src-pkg-tarball if requested
    # Line 1121  case ${NOPKGBUILD} in Line 1337  case ${NOPKGBUILD} in
    1337   ;;   ;;
    1338  esac  esac
    1339    
    1340    if [[ ${SMAGE_BUILD_LOGGING} != false ]]
    1341    then
    1342     bzip2 -9f /var/log/smage/${PKGNAME}.log
    1343    else
    1344     [[ -f /var/log/smage/${PKGNAME}.log ]] && rm /var/log/smage/${PKGNAME}.log
    1345    fi
    1346    
    1347  # for sure  # for sure
    1348  unset NOPKGBUILD  unset NOPKGBUILD
    1349  unset NOSTRIP  unset NOSTRIP
    Legend:
    Removed from v.406  
    changed lines
      Added in v.941