Magellan Linux

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

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

revision 403 by niro, Fri Dec 29 22:42:22 2006 UTC revision 411 by niro, Wed Jan 17 21:18:17 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.45 2006-12-29 22:42:22 niro Exp $  # $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.48 2007-01-17 21:18:17 niro Exp $
8    
9  #01.10.2004  #01.10.2004
10  # added ccache support  # added ccache support
# Line 311  munpack() Line 311  munpack()
311   DEST=$2   DEST=$2
312   fi   fi
313    
314     [[ ! -d ${DEST} ]] && install -d ${DEST}
315    
316   case "${SRCFILE##*.}" in   case "${SRCFILE##*.}" in
317   bz2)   bz2)
318   IFTAR="$(basename $SRCFILE .bz2)"   IFTAR="$(basename $SRCFILE .bz2)"
# Line 533  build_mage_script() Line 535  build_mage_script()
535   > ${dest}   > ${dest}
536    
537   # header   # header
538   echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.45 2006-12-29 22:42:22 niro Exp $' >> ${dest}   echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.48 2007-01-17 21:18:17 niro Exp $' >> ${dest}
539   echo  >> ${dest}   echo  >> ${dest}
540    
541   # pgkname and state   # pgkname and state
# Line 769  source_pkg_build() Line 771  source_pkg_build()
771   return 0   return 0
772   fi   fi
773    
774     [ -z "${SRCPKGDIR}" ] && die "\$SRCPKGDIR not found. Please setup your mage.rc correctly."
775    
776   echo -e "${COLGREEN}Creating source package tarball ... ${COLDEFAULT}"   echo -e "${COLGREEN}Creating source package tarball ... ${COLDEFAULT}"
777   ( cd ${SOURCEDIR}; tar cvjf ${BUILDDIR}/${PNAME}-${PVER}-${PBUILD}.tar.bz2 ${PNAME}; )   ( cd ${SOURCEDIR}; tar cvjf ${BUILDDIR}/${PNAME}-${PVER}-${PBUILD}.tar.bz2 ${PNAME}; )
778   [[ ! -d ${PKGDIR}/sources ]] && install -d ${PKGDIR}/sources   [[ ! -d ${SRCPKGDIR} ]] && install -d ${SRCPKGDIR}
779   mv ${BUILDDIR}/${PNAME}-${PVER}-${PBUILD}.tar.bz2 ${PKGDIR}/sources/${PNAME}-${PVER}-${PBUILD}.${SRCPKGSUFFIX}   mv ${BUILDDIR}/${PNAME}-${PVER}-${PBUILD}.tar.bz2 ${SRCPKGDIR}/${PNAME}-${PVER}-${PBUILD}.${SRCPKGSUFFIX}
780    
781   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}"
782  }  }
# Line 930  then Line 934  then
934   exit 0   exit 0
935  fi  fi
936    
937  if [ "$1" == "--src-tarball" -a -n "$2" -a -n "$3" ]  if [ "$1" == "--src-tarball" -a -n "$2" ] || [ "$1" == "-st" -a -n "$2" ]
938  then  then
939   # set correct SMAGENAME   # set correct SMAGENAME
940   SMAGENAME="$3"   SMAGENAME="$2"
941   SRCPKGTARBALL="$2"   SRCPKGTARBALL="${SRCPKGDIR}/$(basename ${SMAGENAME} .${SMAGESUFFIX}).${SRCPKGSUFFIX}"
942   USE_SRC_PKG_TARBALL=true   USE_SRC_PKG_TARBALL=true
943    
944   echo -e "${COLGREEN}Using src-tarball ${COLBLUE}${SRCPKGTARBALL}${COLGREEN} ...${COLDEFAULT}"   echo -e "${COLGREEN}Using src-tarball ${COLBLUE}${SRCPKGTARBALL}${COLGREEN} ...${COLDEFAULT}"
# Line 974  then Line 978  then
978   if [[ -d ${SOURCEDIR}/${PNAME} ]]   if [[ -d ${SOURCEDIR}/${PNAME} ]]
979   then   then
980   echo -e "${COLGREEN}Deleting old sourcefiles ${COLBLUE}${SOURCEDIR}/${PNAME}${COLGREEN} ...${COLDEFAULT}"   echo -e "${COLGREEN}Deleting old sourcefiles ${COLBLUE}${SOURCEDIR}/${PNAME}${COLGREEN} ...${COLDEFAULT}"
981   rm -rf ${SOURCEDIR}/${PKGNAME}   rm -rf ${SOURCEDIR}/${PNAME}
982   fi   fi
983  fi  fi
984    

Legend:
Removed from v.403  
changed lines
  Added in v.411