Author: jfrederic.clere(a)jboss.com Date: 2009-08-20 10:57:51 -0400 (Thu, 20 Aug 2009) New Revision: 2551 Modified: trunk/build/unix/build.sh Log: Add logic to process srclib like RHATews. Modified: trunk/build/unix/build.sh =================================================================== --- trunk/build/unix/build.sh 2009-08-20 14:56:54 UTC (rev 2550) +++ trunk/build/unix/build.sh 2009-08-20 14:57:51 UTC (rev 2551) @@ -458,6 +458,42 @@ package_output_dir=${build_working_dir}/${package_src_name}/output/${BUILD_TAG} fi +# Copy files according a rule like Override +# $1: source dir +# $2: source file +# $3: dest dir +# $4: version (something like 1.2.3) +# overridecp $build_top/../../srclib/ ${name_prod} ${version_prod} NMAKEmakefile $src_dir +overridecp() +{ + basedir=$1 + prod=$2 + versionstring=$4 + file=$4 + destdir=$5 + versionstring=`echo $versionstring | sed 's:\.: :g'` + verpart1=`echo $versionstring | awk '{ print $1 }'` + verpart2=`echo $versionstring | awk '{ print $2 }'` + + srcfile="" + if [ -f ${basedir}/${prod}/${file} ]; then + srcfile=${basedir}/${prod}/${file} + fi + if [ -f ${basedir}/${prod}/${prod}-${verpart1}/${file} ]; then + srcfile=${basedir}/${prod}/${prod}-${verpart1}/${file} + fi + if [ -f ${basedir}/${prod}/${prod}-${verpart1}.${verpart2}/${file} ]; then + srcfile=${basedir}/${prod}/${prod}-${verpart1}.${verpart2}/${file} + fi + if [ -f ${basedir}/${prod}/${prod}-${versionstring}/${file} ]; then + srcfile=${basedir}/${prod}/${prod}-${versionstring}/${file} + fi + if [ "${srcfile}x" != "x"]; then + echo "copying $srcfile $destdir" + cp $srcfile $destdir + fi +} + # Override a shell command # # $1=script $2..n override() @@ -1066,10 +1102,7 @@ cd $build_cache_dir if [ ! -d ${src_dir} ]; then downloadtaredsrc $src_url $src_url_back - if [ -f $build_top/../../srclib/${name_prod}/NMAKEmakefile ]; then - echo "copying $build_top/../../srclib/${name_prod}/NMAKEmakefile to $package_src_dir/srclib/${name_prod}-${version_prod}/" - cp $build_top/../../srclib/${name_prod}/NMAKEmakefile $src_dir - fi + overridecp $build_top/../../srclib/ ${name_prod} ${version_prod} NMAKEmakefile $src_dir applypatch $src_dir false fi cp -rp ${src_dir} ${package_src_dir}/srclib