Magellan Linux

Diff of /branches/mage-0_3_7-r6/mage/usr/lib/mage/smage2.sh

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

trunk/mage/usr/lib/mage/smage2.sh revision 199 by niro, Sun Aug 21 21:23:48 2005 UTC branches/mage-0_3_7-r6/mage/usr/lib/mage/smage2.sh revision 398 by niro, Mon Nov 20 12:48:17 2006 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.30 2005-08-21 21:23:48 niro Exp $  # $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.36.2.1 2006-11-20 12:48:17 niro Exp $
8    
9  #01.10.2004  #01.10.2004
10  # added ccache support  # added ccache support
# Line 24  SMAGEVERSION="$( < ${MLIBDIR}/version)" Line 24  SMAGEVERSION="$( < ${MLIBDIR}/version)"
24  export LC_ALL=C  export LC_ALL=C
25    
26  source /etc/mage.rc  source /etc/mage.rc
27    source ${MLIBDIR}/mage3.functions.sh
28    
29  showversion() {  showversion() {
30   echo -en "Magellan Source Install v${SMAGEVERSION} "   echo -en "Magellan Source Install v${SMAGEVERSION} "
# Line 426  fix_mage_deps() { Line 427  fix_mage_deps() {
427   do   do
428   cat="$(dirname ${dep})"   cat="$(dirname ${dep})"
429   # change if not virtual   # change if not virtual
430   if [[ ${cat} != virtual ]]   if [[ ${cat} = virtual ]]
431   then   then
432     pname="$(basename ${dep})"
433     else
434   # fix pver to target-pver   # fix pver to target-pver
435   # to get pname-target-pver   # to get pname-target-pver
436    
437   # doing it backwards !   # doing it backwards !
438   pver="${dep##*-}"   pver="${dep##*-}"
439   pname=$(basename ${dep/-${pver}/})   # full pver
440     pname="$(basename ${dep/-${pver}/})${target}-${pver}"
441   fi   fi
442    
443   # do not add empty lines   # do not add empty lines
444   if [ -z "${NDEPEND}" ]   if [ -z "${NDEPEND}" ]
445   then   then
446   NDEPEND="${sym} ${cat}/${pname}${target}-${pver}"   NDEPEND="${sym} ${cat}/${pname}"
447   else   else
448   NDEPEND="${NDEPEND}   NDEPEND="${NDEPEND}
449   ${sym} ${cat}/${pname}${target}-${pver}"   ${sym} ${cat}/${pname}"
450   fi   fi
451    
452   unset cat pname pver   unset cat pname pver
# Line 509  build_mage_script() Line 513  build_mage_script()
513   > ${dest}   > ${dest}
514    
515   # header   # header
516   echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.30 2005-08-21 21:23:48 niro Exp $' >> ${dest}   echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.36.2.1 2006-11-20 12:48:17 niro Exp $' >> ${dest}
517   echo  >> ${dest}   echo  >> ${dest}
518    
519   # pgkname and state   # pgkname and state
# Line 524  build_mage_script() Line 528  build_mage_script()
528    
529   # special tags and vars   # special tags and vars
530   echo "PKGTYPE=\"${PKGTYPE}\""  >> ${dest}   echo "PKGTYPE=\"${PKGTYPE}\""  >> ${dest}
531    
532     # echo MAGE_TARGETS ## note -target is needed !
533     echo "MAGE_TARGETS=\"${target}\"" >> ${dest}
534     echo >> ${dest}
535    
536   # add special vars   # add special vars
537   if [ -n "${SPECIAL_VARS}" ]   if [ -n "${SPECIAL_VARS}" ]
538   then   then
# Line 535  build_mage_script() Line 544  build_mage_script()
544   done   done
545   echo  >> ${dest}   echo  >> ${dest}
546   fi   fi
547    
548   # add at least all includes   # add at least all includes
549   if [ -n "${INHERITS}" ]   if [ -n "${INHERITS}" ]
550   then   then
# Line 564  build_mage_script() Line 574  build_mage_script()
574   do   do
575   # add to mage (quotes needed !)   # add to mage (quotes needed !)
576   typeset -f "${i}" >> ${dest}   typeset -f "${i}" >> ${dest}
577     echo >> ${dest}
578   # unset to be safe (quotes needed !)   # unset to be safe (quotes needed !)
579   #unset "${i}" <-- later to get every target built   #unset "${i}" <-- later to get every target built
580   done   done
# Line 743  then Line 754  then
754   exit 0   exit 0
755  fi  fi
756    
757    # regen-mage-tree
758    if [ "$1" == "only-regen-tree" -a -n "$2" ]
759    then
760     # set correct SMAGENAME
761     SMAGENAME="$2"
762     MD5DIR="$(dirname ${SMAGENAME})/md5"
763     source ${SMAGENAME} || die "regen: smage2 not found"
764    
765     regen_mage_tree
766     exit 0
767    fi
768    
769  if [ ! -e ${MLIBDIR}/pkgbuild_dir.sh ]  if [ ! -e ${MLIBDIR}/pkgbuild_dir.sh ]
770  then  then
771   die "Error: ${MLIBDIR}/pkgbuild_dir.sh not found. Aborting."   die "Error: ${MLIBDIR}/pkgbuild_dir.sh not found. Aborting."

Legend:
Removed from v.199  
changed lines
  Added in v.398