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 406 by niro, Fri Dec 29 23:37:56 2006 UTC revision 413 by niro, Fri Jan 19 23:15:04 2007 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.50 2007-01-19 23:15:04 niro Exp $
    8    
    9  #01.10.2004  #01.10.2004
    10  # added ccache support  # added ccache support
    # Line 64  showversion() Line 64  showversion()
    64  die()  die()
    65  {  {
    66   xtitleclean   xtitleclean
    67     echo -e ${COLRED}"Exited ${BASH_SOURCE} at line no ${BASH_LINENO}."${COLDEFAULT}
    68   echo "SMAGE failed: $@"   echo "SMAGE failed: $@"
    69   exit 1   exit 1
    70  }  }
    # Line 311  munpack() Line 312  munpack()
    312   DEST=$2   DEST=$2
    313   fi   fi
    314    
    315     [[ ! -d ${DEST} ]] && install -d ${DEST}
    316    
    317   case "${SRCFILE##*.}" in   case "${SRCFILE##*.}" in
    318   bz2)   bz2)
    319   IFTAR="$(basename $SRCFILE .bz2)"   IFTAR="$(basename $SRCFILE .bz2)"
    # Line 533  build_mage_script() Line 536  build_mage_script()
    536   > ${dest}   > ${dest}
    537    
    538   # header   # header
    539   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.50 2007-01-19 23:15:04 niro Exp $' >> ${dest}
    540   echo  >> ${dest}   echo  >> ${dest}
    541    
    542   # pgkname and state   # pgkname and state
    # Line 772  source_pkg_build() Line 775  source_pkg_build()
    775   [ -z "${SRCPKGDIR}" ] && die "\$SRCPKGDIR not found. Please setup your mage.rc correctly."   [ -z "${SRCPKGDIR}" ] && die "\$SRCPKGDIR not found. Please setup your mage.rc correctly."
    776    
    777   echo -e "${COLGREEN}Creating source package tarball ... ${COLDEFAULT}"   echo -e "${COLGREEN}Creating source package tarball ... ${COLDEFAULT}"
    778    
    779     # include the smage2 file
    780     cp ${SMAGENAME} ${SOURCEDIR}/${PNAME}
    781    
    782   ( cd ${SOURCEDIR}; tar cvjf ${BUILDDIR}/${PNAME}-${PVER}-${PBUILD}.tar.bz2 ${PNAME}; )   ( cd ${SOURCEDIR}; tar cvjf ${BUILDDIR}/${PNAME}-${PVER}-${PBUILD}.tar.bz2 ${PNAME}; )
    783   [[ ! -d ${SRCPKGDIR} ]] && install -d ${SRCPKGDIR}   [[ ! -d ${SRCPKGDIR} ]] && install -d ${SRCPKGDIR}
    784   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 911  then Line 918  then
    918   exit 0   exit 0
    919  fi  fi
    920    
    921  if [ "$1" == "only-src-pkg" -a -n "$2" ]  if [ "$1" == "--create-src-tarball" -a -n "$2" ]
    922  then  then
    923   # set correct SMAGENAME   # set correct SMAGENAME
    924   SMAGENAME="$2"   SMAGENAME="$2"
    925   MD5DIR="$(dirname ${SMAGENAME})/md5"   MD5DIR="$(dirname ${SMAGENAME})/md5"
    926    
    927   echo -e "${COLGREEN}only-src-pkg called for ${COLBLUE}${SMAGENAME}${COLGREEN} ...${COLDEFAULT}"   echo -e "${COLGREEN}create-src-tarball called for ${COLBLUE}${SMAGENAME}${COLGREEN} ...${COLDEFAULT}"
    928    
    929   source ${SMAGENAME} || die "regen: smage2 not found"   source ${SMAGENAME} || die "regen: smage2 not found"
    930    
    # Line 934  fi Line 941  fi
    941    
    942  if [ "$1" == "--src-tarball" -a -n "$2" ] || [ "$1" == "-st" -a -n "$2" ]  if [ "$1" == "--src-tarball" -a -n "$2" ] || [ "$1" == "-st" -a -n "$2" ]
    943  then  then
    944   # set correct SMAGENAME   SRCPKGTARBALL="${2}"
      SMAGENAME="$2"  
      SRCPKGTARBALL="${SRCPKGDIR}/$(basename ${SMAGENAME} .${SMAGESUFFIX}).${SRCPKGSUFFIX}"  
    945   USE_SRC_PKG_TARBALL=true   USE_SRC_PKG_TARBALL=true
    946    
    947     # abort if given file is not a source pkg
    948     [[ ${SRCPKGTARBALL##*.} != ${SRCPKGSUFFIX} ]] && die "${SRCPKGTARBALL} is not a valid src-pkg file."
    949    
    950     # set correct SMAGENAME; use the one that the src_pkg provide
    951     # /path/to/SOURCEDIR/PNAME/SMAGENAME
    952     SMAGENAME="${SOURCEDIR}/$(basename ${SRCPKGTARBALL%-*-*})/$(basename ${SRCPKGTARBALL} .${SRCPKGSUFFIX}).${SMAGESUFFIX}"
    953    
    954   echo -e "${COLGREEN}Using src-tarball ${COLBLUE}${SRCPKGTARBALL}${COLGREEN} ...${COLDEFAULT}"   echo -e "${COLGREEN}Using src-tarball ${COLBLUE}${SRCPKGTARBALL}${COLGREEN} ...${COLDEFAULT}"
    955    
    956   [[ ! -d ${SOURCEDIR} ]] && install -d ${SOURCEDIR}   [[ ! -d ${SOURCEDIR} ]] && install -d ${SOURCEDIR}
    # Line 947  then Line 959  then
    959   [[ ! -f ${SRCPKGTARBALL} ]] && die "Error: ${SRCPKGTARBALL} does not exist. Aborting."   [[ ! -f ${SRCPKGTARBALL} ]] && die "Error: ${SRCPKGTARBALL} does not exist. Aborting."
    960    
    961   tar xvjf ${SRCPKGTARBALL} -C ${SOURCEDIR} || die  "Error unpackung src-tarball ${SRCPKGTARBALL}"   tar xvjf ${SRCPKGTARBALL} -C ${SOURCEDIR} || die  "Error unpackung src-tarball ${SRCPKGTARBALL}"
    962    
    963     [[ ! -f ${SMAGENAME} ]] && die "Included smage2 file in src-tarball not found: ${SMAGENAME}"
    964  fi  fi
    965    
    966    
    # Line 976  then Line 990  then
    990   if [[ -d ${SOURCEDIR}/${PNAME} ]]   if [[ -d ${SOURCEDIR}/${PNAME} ]]
    991   then   then
    992   echo -e "${COLGREEN}Deleting old sourcefiles ${COLBLUE}${SOURCEDIR}/${PNAME}${COLGREEN} ...${COLDEFAULT}"   echo -e "${COLGREEN}Deleting old sourcefiles ${COLBLUE}${SOURCEDIR}/${PNAME}${COLGREEN} ...${COLDEFAULT}"
    993   rm -rf ${SOURCEDIR}/${PKGNAME}   rm -rf ${SOURCEDIR}/${PNAME}
    994   fi   fi
    995  fi  fi
    996    
    Legend:
    Removed from v.406  
    changed lines
      Added in v.413