Magellan Linux

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

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

revision 386 by niro, Mon Jul 17 20:52:38 2006 UTC revision 447 by niro, Tue Mar 20 01:15:31 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.44 2006-07-17 20:52:38 niro Exp $  # $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.55 2007-03-20 01:15:31 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"
19  SMAGENAME="$1"  SMAGENAME="$1"
20  SMAGESUFFIX="smage2"  SMAGESUFFIX="smage2"
21  MLIBDIR=/usr/lib/mage  MLIBDIR=/usr/lib/mage
# Line 44  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 63  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  }  }
# Line 143  download_sources() Line 149  download_sources()
149   ( cd ${SOURCEDIR}/${PNAME}; md5sum --check ${DB_MD5_SUM_FILE} &> /dev/null )   ( cd ${SOURCEDIR}/${PNAME}; md5sum --check ${DB_MD5_SUM_FILE} &> /dev/null )
150   if [[ $? = 0 ]]   if [[ $? = 0 ]]
151   then   then
152   # md5's ok, not fetching needed   # md5's ok, no fetching needed
153   FETCHING=false   FETCHING=false
154   else   else
155   FETCHING=true   FETCHING=true
# Line 166  download_sources() Line 172  download_sources()
172   fi   fi
173    
174   # if an mirrored file than replace first the mirror uri   # if an mirrored file than replace first the mirror uri
175   if [ -n "$(echo ${my_SRC_URI} | grep 'mirror://')" ]   if [[ -n $(echo ${my_SRC_URI} | grep 'mirror://') ]]
176   then   then
177   for mirror in ${MIRRORS}   for mirror in ${MIRRORS}
178   do   do
# Line 174  download_sources() Line 180  download_sources()
180    
181   if [[ ${FETCHING} = true ]]   if [[ ${FETCHING} = true ]]
182   then   then
183   echo "==> fetching ${my_SRC_URI_MIRROR}"   echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"
184     wget \
185     --passive-ftp \
186     --tries 3 \
187     --continue \
188     --progress bar \
189     --directory-prefix="${my_SOURCEDIR}" \
190     "${my_SRC_URI_MIRROR}"
191     if [[ $? = 0 ]]
192     then
193     break
194     else
195     continue
196     fi
197     fi
198     done
199     elif [[ -n $(echo ${my_SRC_URI} | grep 'sourceforge://') ]]
200     then
201     for mirror in ${SOURCEFORGE_MIRRORS}
202     do
203     my_SRC_URI_MIRROR="$(echo ${my_SRC_URI} | sed "s|sourceforge:/|${mirror}|g")"
204    
205     if [[ ${FETCHING} = true ]]
206     then
207     echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"
208     wget \
209     --passive-ftp \
210     --tries 3 \
211     --continue \
212     --progress bar \
213     --directory-prefix="${my_SOURCEDIR}" \
214     "${my_SRC_URI_MIRROR}"
215     if [[ $? = 0 ]]
216     then
217     break
218     else
219     continue
220     fi
221     fi
222     done
223     elif [[ -n $(echo ${my_SRC_URI} | grep 'gnu://') ]]
224     then
225     for mirror in ${GNU_MIRRORS}
226     do
227     my_SRC_URI_MIRROR="$(echo ${my_SRC_URI} | sed "s|gnu:/|${mirror}|g")"
228    
229     if [[ ${FETCHING} = true ]]
230     then
231     echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI_MIRROR}${COLDEFAULT}"
232   wget \   wget \
233   --passive-ftp \   --passive-ftp \
234   --tries 3 \   --tries 3 \
# Line 193  download_sources() Line 247  download_sources()
247   else   else
248   if [[ ${FETCHING} = true ]]   if [[ ${FETCHING} = true ]]
249   then   then
250   echo "==> fetching ${my_SRC_URI}"   echo -e "${COLBLUE}==>${COLGREEN} fetching ${my_SRC_URI}${COLDEFAULT}"
251   wget \   wget \
252   --passive-ftp \   --passive-ftp \
253   --tries 3 \   --tries 3 \
# Line 213  download_sources() Line 267  download_sources()
267    
268   # recheck md5 sums   # recheck md5 sums
269   echo   echo
270   echo ">== Checking MD5 sums:"   echo -e "${COLBLUE}===${COLGREEN} Checking MD5 sums:${COLDEFAULT}"
271   ( cd ${SOURCEDIR}/${PNAME}; md5sum --check ${DB_MD5_SUM_FILE} ) || die "md5 failed"   ( cd ${SOURCEDIR}/${PNAME}; md5sum --check ${DB_MD5_SUM_FILE} ) || die "md5 failed"
272   echo   echo
273    
# Line 310  munpack() Line 364  munpack()
364   DEST=$2   DEST=$2
365   fi   fi
366    
367     [[ ! -d ${DEST} ]] && install -d ${DEST}
368    
369   case "${SRCFILE##*.}" in   case "${SRCFILE##*.}" in
370   bz2)   bz2)
371   IFTAR="$(basename $SRCFILE .bz2)"   IFTAR="$(basename $SRCFILE .bz2)"
# Line 343  mpatch() Line 399  mpatch()
399  {  {
400   local PATCHOPTS   local PATCHOPTS
401   local PATCHFILE   local PATCHFILE
402     local i
403    
404   PATCHOPTS=$1   PATCHOPTS=$1
405   PATCHFILE=$2   PATCHFILE=$2
406    
407     if [[ -z $2 ]]
408     then
409     PATCHFILE=$1
410    
411     ## patch level auto-detection, get patch level
412     for ((i=0; i < 10; i++))
413     do
414     patch --dry-run -Np${i} -i ${SOURCEDIR}/${PNAME}/${PATCHFILE} > /dev/null
415     if [[ $? = 0 ]]
416     then
417     PATCHOPTS="-Np${i}"
418     break
419     fi
420     done
421     fi
422    
423   echo -e "${COLBLUE}*** ${COLGREEN}Applying patch '${PATCHFILE}'${COLDEFAULT}"   echo -e "${COLBLUE}*** ${COLGREEN}Applying patch '${PATCHFILE}'${COLDEFAULT}"
424   patch "${PATCHOPTS}" -i ${SOURCEDIR}/${PNAME}/${PATCHFILE}   patch "${PATCHOPTS}" -i ${SOURCEDIR}/${PNAME}/${PATCHFILE}
425  }  }
# Line 405  setup_distcc_environment() Line 478  setup_distcc_environment()
478  {  {
479   if [ -x /usr/bin/distcc ]   if [ -x /usr/bin/distcc ]
480   then   then
481   echo "Using DistCC for compilation ..."   echo -e "${COLBLUE}---${COLGREEN} Using DistCC for compilation ...${COLDEFAULT}"
482   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"
483    
484   export DISTCC_DIR="${DISTCC_DIR}" || die "distcc_dir export failed"   export DISTCC_DIR="${DISTCC_DIR}" || die "distcc_dir export failed"
# Line 420  setup_ccache_environment() Line 493  setup_ccache_environment()
493  {  {
494   if [ -x /usr/bin/ccache ]   if [ -x /usr/bin/ccache ]
495   then   then
496   echo "Using CCache for compilation ..."   echo -e "${COLBLUE}---${COLGREEN} Using CCache for compilation ...${COLDEFAULT}"
497   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"
498   fi   fi
499  }  }
# Line 444  fix_mage_deps() Line 517  fix_mage_deps()
517   # fix DEPEND   # fix DEPEND
518   while read sym dep   while read sym dep
519   do   do
520     # ignore empty lines
521     [[ -z ${dep} ]] && continue
522    
523   cat="$(dirname ${dep})"   cat="$(dirname ${dep})"
524   # change if not virtual   # change if not virtual
525   if [[ ${cat} = virtual ]]   if [[ ${cat} = virtual ]]
# Line 524  build_mage_script() Line 600  build_mage_script()
600   dest="${MAGE_TREE_DEST}/${PCATEGORIE}/${PNAME}${target}/${magefile}"   dest="${MAGE_TREE_DEST}/${PCATEGORIE}/${PNAME}${target}/${magefile}"
601    
602   # show what we are doing   # show what we are doing
603   echo "Generating Mage file:"   echo -e "${COLBLUE}===${COLGREEN} generating mage file:${COLDEFAULT}"
604   echo "  ${dest}"   echo "${dest}"
605    
606   install -d "$(dirname ${dest})"   install -d "$(dirname ${dest})"
607   # now build the mage file   # now build the mage file
608   > ${dest}   > ${dest}
609    
610   # header   # header
611   echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.44 2006-07-17 20:52:38 niro Exp $' >> ${dest}   echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.55 2007-03-20 01:15:31 niro Exp $' >> ${dest}
612   echo  >> ${dest}   echo  >> ${dest}
613    
614   # pgkname and state   # pgkname and state
# Line 731  generate_package_md5sum() Line 807  generate_package_md5sum()
807   # build pkg-md5-sum only if requested   # build pkg-md5-sum only if requested
808   if [[ ${REGEN_MAGE_TREE} = true ]]   if [[ ${REGEN_MAGE_TREE} = true ]]
809   then   then
810   echo -n "Generating a md5sum for ${pkgname}.${PKGSUFFIX} ... "   echo -ne "${COLBLUE}===${COLGREEN} generating md5's for ${pkgname}.${PKGSUFFIX} ... ${COLDEFAULT}"
811    
812   # abort if not exist   # abort if not exist
813   if [ ! -f ${PKGDIR}/${pkgname}.${PKGSUFFIX} ]   if [ ! -f ${PKGDIR}/${pkgname}.${PKGSUFFIX} ]
814   then   then
815   echo "! exists"   echo -e "${COLRED}! exists${COLDEFAULT}"
816   return 0   return 0
817   fi   fi
818    
# Line 750  generate_package_md5sum() Line 826  generate_package_md5sum()
826   # gen md5sum   # gen md5sum
827   ( cd ${PKGDIR}; md5sum "${pkgname}.${PKGSUFFIX}" ) \   ( cd ${PKGDIR}; md5sum "${pkgname}.${PKGSUFFIX}" ) \
828   > ${dest}/${pkgname}.md5   > ${dest}/${pkgname}.md5
829   echo "done"   echo -e "${COLGREEN}done${COLDEFAULT}"
830   fi   fi
831  }  }
832    
833    source_pkg_build()
834    {
835     if [[ ${PKGTYPE} = virtual ]]
836     then
837     echo "Virtual package detected; src-pkg-tarball not necessary ..."
838     return 0
839     fi
840    
841     if [[ ! -d ${SOURCEDIR}/${PNAME} ]]
842     then
843     echo "No SRC_URI defined; src-pkg-tarball not necessary ..."
844     return 0
845     fi
846    
847     [ -z "${SRCPKGDIR}" ] && die "\$SRCPKGDIR not found. Please setup your ${MAGERC} correctly."
848    
849     echo -e "${COLGREEN}Creating source package tarball ... ${COLDEFAULT}"
850    
851     # include the smage2 file
852     cp ${SMAGENAME} ${SOURCEDIR}/${PNAME}
853    
854     ( cd ${SOURCEDIR}; tar cvjf ${BUILDDIR}/${PNAME}-${PVER}-${PBUILD}.tar.bz2 ${PNAME}; )
855     [[ ! -d ${SRCPKGDIR} ]] && install -d ${SRCPKGDIR}
856     mv ${BUILDDIR}/${PNAME}-${PVER}-${PBUILD}.tar.bz2 ${SRCPKGDIR}/${PNAME}-${PVER}-${PBUILD}.${SRCPKGSUFFIX}
857    
858     echo -e "${COLGREEN}Source package ${COLBLUE}${PNAME}-${PVER}-${PBUILD}.${SRCPKGSUFFIX} ${COLGREEN}successfully builded.${COLDEFAULT}"
859    }
860    
861    
862  # print out our version  # print out our version
863  showversion  showversion
864  echo  echo
# Line 885  then Line 990  then
990   exit 0   exit 0
991  fi  fi
992    
993    if [ "$1" == "--create-src-tarball" -a -n "$2" ]
994    then
995     # set correct SMAGENAME
996     SMAGENAME="$2"
997     MD5DIR="$(dirname ${SMAGENAME})/md5"
998    
999     echo -e "${COLGREEN}create-src-tarball called for ${COLBLUE}${SMAGENAME}${COLGREEN} ...${COLDEFAULT}"
1000    
1001     source ${SMAGENAME} || die "regen: smage2 not found"
1002    
1003     if [[ -d ${SOURCEDIR}/${PNAME} ]]
1004     then
1005     echo -e "${COLGREEN}Deleting old sourcefiles ${COLBLUE}${SOURCEDIR}/${PNAME}${COLGREEN} ...${COLDEFAULT}"
1006     rm -rf ${SOURCEDIR}/${PKGNAME}
1007     fi
1008    
1009     download_sources
1010     source_pkg_build ${SMAGENAME}
1011     exit 0
1012    fi
1013    
1014    if [ "$1" == "--src-tarball" -a -n "$2" ] || [ "$1" == "-st" -a -n "$2" ]
1015    then
1016     SRCPKGTARBALL="${2}"
1017     USE_SRC_PKG_TARBALL=true
1018    
1019     # abort if given file is not a source pkg
1020     [[ ${SRCPKGTARBALL##*.} != ${SRCPKGSUFFIX} ]] && die "${SRCPKGTARBALL} is not a valid src-pkg file."
1021    
1022     # set correct SMAGENAME; use the one that the src_pkg provide
1023     # /path/to/SOURCEDIR/PNAME/SMAGENAME
1024     SMAGENAME="${SOURCEDIR}/$(basename ${SRCPKGTARBALL%-*-*})/$(basename ${SRCPKGTARBALL} .${SRCPKGSUFFIX}).${SMAGESUFFIX}"
1025    
1026     echo -e "${COLGREEN}Using src-tarball ${COLBLUE}${SRCPKGTARBALL}${COLGREEN} ...${COLDEFAULT}"
1027    
1028     [[ ! -d ${SOURCEDIR} ]] && install -d ${SOURCEDIR}
1029    
1030     # unpack srctarball
1031     [[ ! -f ${SRCPKGTARBALL} ]] && die "Error: ${SRCPKGTARBALL} does not exist. Aborting."
1032    
1033     tar xvjf ${SRCPKGTARBALL} -C ${SOURCEDIR} || die  "Error unpackung src-tarball ${SRCPKGTARBALL}"
1034    
1035     [[ ! -f ${SMAGENAME} ]] && die "Included smage2 file in src-tarball not found: ${SMAGENAME}"
1036    fi
1037    
1038    
1039  [ ! -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."
1040  [ -z "$(basename ${SMAGENAME} | grep .${SMAGESUFFIX})" ] &&  [ -z "$(basename ${SMAGENAME} | grep .${SMAGESUFFIX})" ] &&
1041   die "File '$(basename ${SMAGENAME})' is not a sMage v${SMAGEVERSION} file. Aborting."   die "File '$(basename ${SMAGENAME})' is not a sMage v${SMAGEVERSION} file. Aborting."
1042  [ -z "${SOURCEDIR}" ] && die "\$SOURCEDIR not found. Please setup your mage.rc correctly."  [ -z "${SOURCEDIR}" ] && die "\$SOURCEDIR not found. Please setup your ${MAGERC} correctly."
1043  [ -z "${SMAGESCRIPTSDIR}" ] && die "\$SMAGESCRIPTSDIR not found. Please setup your mage.rc correctly."  [ -z "${SMAGESCRIPTSDIR}" ] && die "\$SMAGESCRIPTSDIR not found. Please setup your ${MAGERC} correctly."
1044  [ -z "${SMAGE2RSYNC}" ] && die "\$SMAGE2RSYNC not found. Please setup your mage.rc correctly."  [ -z "${SMAGE2RSYNC}" ] && die "\$SMAGE2RSYNC not found. Please setup your ${MAGERC} correctly."
1045  [ -z "${BINDIR}" ] && die "no BINDIR variable found in /etc/mage.rc"  [ -z "${BINDIR}" ] && die "no BINDIR variable found in ${MAGERC}"
1046  [ -z "${CHOST}" ] && die "no CHOST variable found in /etc/mage.rc"  [ -z "${CHOST}" ] && die "no CHOST variable found in ${MAGERC}"
1047  [ -z "${CFLAGS}" ] && die "no CFLAGS variable found in /etc/mage.rc"  [ -z "${CFLAGS}" ] && die "no CFLAGS variable found in ${MAGERC}"
1048  [ -z "${CXXFLAGS}" ] && die "no CXXFLAGS variable found in /etc/mage.rc"  [ -z "${CXXFLAGS}" ] && die "no CXXFLAGS variable found in ${MAGERC}"
1049    
1050  source ${SMAGENAME} || die "source failed"  source ${SMAGENAME} || die "source failed"
1051  PKGNAME="${PNAME}-${PVER}-${ARCH}-${PBUILD}"  PKGNAME="${PNAME}-${PVER}-${ARCH}-${PBUILD}"
1052  MD5DIR="$(dirname ${SMAGENAME})/md5"  MD5DIR="$(dirname ${SMAGENAME})/md5"
1053    
1054  xtitle "Compiling ${PKGNAME}"  xtitle "Compiling ${PKGNAME}"
1055  echo "Compiling ${PKGNAME}"  echo -e "${COLGREEN}Compiling ${PKGNAME}${COLDEFAULT}"
1056    
1057  # auto regen mage tree if requested  # auto regen mage tree if requested
1058  regen_mage_tree  regen_mage_tree
1059    
1060    if [[ ${CREATE_SRC_PKG_TARBALL} = true ]]
1061    then
1062     if [[ -d ${SOURCEDIR}/${PNAME} ]]
1063     then
1064     echo -e "${COLBLUE}===${COLGREEN} deleting old sourcefiles ${COLBLUE}${SOURCEDIR}/${PNAME}${COLGREEN} ...${COLDEFAULT}"
1065     rm -rf ${SOURCEDIR}/${PNAME}
1066     fi
1067    fi
1068    
1069  # download sources  # download sources
1070  download_sources  [[ ${USE_SRC_PKG_TARBALL} != true ]] && download_sources
1071    
1072  # fixes some issues with these functions  # fixes some issues with these functions
1073  export -f src_prepare || die "src_prepare export failed"  export -f src_prepare || die "src_prepare export failed"
# Line 970  src_install || die "src_install failed" Line 1130  src_install || die "src_install failed"
1130    
1131    
1132  # compressing doc, info & man files  # compressing doc, info & man files
 echo -e "Compressing man-pages ..."  
1133  if [ -d ${BUILDDIR}/builded/usr/share/man ]  if [ -d ${BUILDDIR}/builded/usr/share/man ]
1134  then  then
1135     echo -e "${COLBLUE}===${COLGREEN} compressing man-pages ...${COLDEFAULT}"
1136   ${MLIBDIR}/compressdoc -g -9 ${BUILDDIR}/builded/usr/share/man   ${MLIBDIR}/compressdoc -g -9 ${BUILDDIR}/builded/usr/share/man
1137  fi  fi
1138    
 echo -e "Compressing info-pages ..."  
1139  if [ -d ${BUILDDIR}/builded/usr/share/info ]  if [ -d ${BUILDDIR}/builded/usr/share/info ]
1140  then  then
1141     echo -e "${COLBLUE}===${COLGREEN} compressing info-pages ...${COLDEFAULT}"
1142   ${MLIBDIR}/compressdoc -g -9 ${BUILDDIR}/builded/usr/share/info   ${MLIBDIR}/compressdoc -g -9 ${BUILDDIR}/builded/usr/share/info
1143  fi  fi
1144    
# Line 988  case ${NOSTRIP} in Line 1148  case ${NOSTRIP} in
1148   echo -e "NOSTRIP=true detected; Package will not be stripped ..."   echo -e "NOSTRIP=true detected; Package will not be stripped ..."
1149   ;;   ;;
1150   *)   *)
1151   echo -e "Stripping binaries ..."   echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}"
1152   mstripbins ${BINDIR}   mstripbins ${BINDIR}
1153   echo -e "Stripping libraries ..."   echo -e "${COLBLUE}===${COLGREEN} stripping libraries ...${COLDEFAULT}"
1154   mstriplibs ${BINDIR}   mstriplibs ${BINDIR}
1155   ;;   ;;
1156  esac  esac
# Line 1026  case ${NOPKGBUILD} in Line 1186  case ${NOPKGBUILD} in
1186   --parch "${ARCH}" \   --parch "${ARCH}" \
1187   --target "${target}"   --target "${target}"
1188    
1189   echo -e "\nPackage ${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n"   echo -e "${COLGREEN}\nPackage ${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"
1190   done   done
1191   else   else
1192   ${MLIBDIR}/pkgbuild_dir.sh ${PKGNAME} ${BINDIR} || die "package-build failed"   ${MLIBDIR}/pkgbuild_dir.sh ${PKGNAME} ${BINDIR} || die "package-build failed"
# Line 1039  case ${NOPKGBUILD} in Line 1199  case ${NOPKGBUILD} in
1199   --pbuild "${PBUILD}" \   --pbuild "${PBUILD}" \
1200   --parch "${ARCH}"   --parch "${ARCH}"
1201    
1202   echo -e "\nPackage ${PKGNAME} successfully builded.\n"   echo -e "${COLGREEN}\nPackage ${PKGNAME} successfully builded.\n${COLDEFAULT}"
1203   fi   fi
1204    
1205     # build src-pkg-tarball if requested
1206     [[ ${CREATE_SRC_PKG_TARBALL} = true ]] && source_pkg_build ${SMAGENAME}
1207   ;;   ;;
1208  esac  esac
1209    

Legend:
Removed from v.386  
changed lines
  Added in v.447