X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=util%2Fabuild%2Fabuild;h=8b81ea17fc9b6ffdbbbd80a9199f4bc3236d7698;hb=3db85f3c1b7d6f167a517dbdd3b4d74971ea620c;hp=8b292ddcb8238f6eef0b92695569ad5685a86554;hpb=89ec3760a9c2e5189681240aae866b20a9d6b592;p=coreboot.git diff --git a/util/abuild/abuild b/util/abuild/abuild index 8b292ddcb..8b81ea17f 100755 --- a/util/abuild/abuild +++ b/util/abuild/abuild @@ -14,12 +14,15 @@ #set -x # Turn echo on.... -ABUILD_DATE="January 29th, 2010" -ABUILD_VERSION="0.9" +ABUILD_DATE="December 10th, 2010" +ABUILD_VERSION="0.9.1" + +TOP=$PWD # Where shall we place all the build trees? TARGET=coreboot-builds -XMLFILE=$( pwd )/abuild.xml +XMLFILE=$TOP/abuild.xml +REAL_XMLFILE=$XMLFILE # path to payload. Should be more generic PAYLOAD=/dev/null @@ -35,6 +38,9 @@ cpus=1 # Configure-only mode configureonly=0 +# Did any board fail to build? +failed=0 + # One might want to adjust these in case of cross compiling for i in make gmake gnumake nonexistant_make; do $i --version 2>/dev/null |grep "GNU Make" >/dev/null && break @@ -106,6 +112,20 @@ function xmlfile } >> $XMLFILE } +function junit +{ + test "$mode" == "junit" && printf "$*\n" >> $XMLFILE + return 0 +} + +function junitfile +{ + test "$mode" == "junit" && { + printf '\n' + } >> $XMLFILE +} function vendors @@ -154,7 +174,6 @@ function create_config fi [ "$update" = "true" ] && mv ${build_dir}/coreboot.rom coreboot.rom.tmp - $MAKE distclean obj=${build_dir} mkdir -p ${build_dir} mkdir -p $TARGET/sharedutils [ "$update" = "true" ] && mv coreboot.rom.tmp ${build_dir}/coreboot.rom @@ -162,7 +181,7 @@ function create_config if [ "$CONFIG" != "" ]; then printf " Using existing configuration $CONFIG ... " xml " $CONFIG" - cp $CONFIG ${build_dir}/config.build + cp src/mainboard/$VENDOR/$MAINBOARD/$CONFIG ${build_dir}/config.build else printf " Creating config file... " xml " autogenerated" @@ -176,8 +195,9 @@ function create_config echo "CONFIG_CBFS_PREFIX=\"$cbfs_prefix\"" >> ${build_dir}/config.build if [ "$PAYLOAD" != "/dev/null" ]; then echo "# CONFIG_PAYLOAD_NONE is not set" >> ${build_dir}/config.build + echo "# CONFIG_PAYLOAD_SEABIOS is not set" >> ${build_dir}/config.build echo "CONFIG_PAYLOAD_ELF=y" >> ${build_dir}/config.build - echo "CONFIG_FALLBACK_PAYLOAD_FILE=\"$PAYLOAD\"" >> ${build_dir}/config.build + echo "CONFIG_PAYLOAD_FILE=\"$PAYLOAD\"" >> ${build_dir}/config.build fi if [ "$loglevel" != "default" ]; then @@ -205,7 +225,7 @@ function create_config fi fi - #yes "" | $MAKE oldconfig -j $cpus obj=${build_dir} objutil=$TARGET/sharedutils &> ${build_dir}/config.log + #yes "" | $MAKE oldconfig obj=${build_dir} objutil=$TARGET/sharedutils &> ${build_dir}/config.log yes "" | $MAKE oldconfig DOTCONFIG=${build_dir}/config.build obj=${build_dir} objutil=$TARGET/sharedutils &> ${build_dir}/config.log ret=$? if [ $ret -eq 0 ]; then @@ -240,12 +260,18 @@ function create_buildenv # Allow simple "make" in the target directory MAKEFILE=$TARGET/${VENDOR}_${MAINBOARD}/Makefile - echo "# autogenerated makefile" > $MAKEFILE + echo "# autogenerated" > $MAKEFILE echo "TOP=$ROOT" >> $MAKEFILE - echo "OUT=$TARGET/${VENDOR}_${MAINBOARD}" >> $MAKEFILE + echo "BUILD=$TARGET" >> $MAKEFILE + echo "OBJ=\$(BUILD)/${VENDOR}_${MAINBOARD}" >> $MAKEFILE + echo "OBJUTIL=\$(BUILD)/sharedutils" >> $MAKEFILE echo "all:" >> $MAKEFILE - echo " cd \$(TOP); \$(MAKE) oldconfig DOTCONFIG=\$(OUT)/config.build obj=\$(OUT)" >> $MAKEFILE - echo " cd \$(TOP); \$(MAKE) DOTCONFIG=\$(OUT)/config.build obj=\$(OUT)" >> $MAKEFILE + echo " @cp -a config.h config.h.bak" >> $MAKEFILE + echo " @cd \$(TOP); \$(MAKE) oldconfig DOTCONFIG=\$(OBJ)/config.build objutil=\$(OBJUTIL) obj=\$(OBJ)" >> $MAKEFILE + echo " @tail -n+6 config.h > config.new; tail -n+6 config.h.bak > config.old" >> $MAKEFILE + echo " @cmp -s config.new config.old && cp -a config.h.bak config.h || echo \"Config file changed\"" >> $MAKEFILE + echo " @rm config.h.bak config.new config.old" >> $MAKEFILE + echo " @cd \$(TOP); \$(MAKE) DOTCONFIG=\$(OBJ)/config.build objutil=\$(OBJUTIL) obj=\$(OBJ)" >> $MAKEFILE return $ret } @@ -263,15 +289,16 @@ function compile_target CURR=$( pwd ) #stime=`perl -e 'print time();' 2>/dev/null || date +%s` build_dir=$TARGET/${VENDOR}_${MAINBOARD} - eval $MAKE $silent -j $cpus DOTCONFIG=${build_dir}/config.build obj=${build_dir} objutil=$TARGET/sharedutils \ + eval $MAKE $silent DOTCONFIG=${build_dir}/config.build obj=${build_dir} objutil=$TARGET/sharedutils \ &> ${build_dir}/make.log ret=$? - mv .xcompile ${build_dir}/xcompile.build + cp .xcompile ${build_dir}/xcompile.build cd $TARGET/${VENDOR}_${MAINBOARD} etime=`perl -e 'print time();' 2>/dev/null || date +%s` duration=$(( $etime - $stime )) xml " ${duration}s" + junit " " xml " " xmlfile make.log @@ -279,33 +306,26 @@ function compile_target if [ $ret -eq 0 ]; then xml " ok" + junit "" + junitfile make.log + junit "" printf "ok\n" > compile.status printf "ok. (took ${duration}s)\n" cd $CURR return 0 else xml " failed" + junit "" + junitfile make.log + junit "" printf "FAILED after ${duration}s!\nLog excerpt:\n" tail -n $CONTEXT make.log 2> /dev/null || tail -$CONTEXT make.log cd $CURR + failed=1 return 1 fi } -function built_successfully -{ - CURR=`pwd` - status="fail" - if [ -d "$TARGET/${VENDOR}_${MAINBOARD}" ]; then - cd $TARGET/${VENDOR}_${MAINBOARD} - if [ -r compile.status ] ; then - status=`cat compile.status` - fi - cd $CURR - fi - [ "$buildall" != "true" -a "$status" == "ok" ] -} - function build_broken { CURR=`pwd` @@ -346,6 +366,7 @@ function build_target HOSTCC='gcc' printf "Building $VENDOR/$MAINBOARD; " + XMLFILE=$TOP/$TARGET/${VENDOR}_${MAINBOARD}/abuild.xml xml "" xml "" @@ -389,6 +410,9 @@ function build_target xml "" xml "" + junit " " + junit "No cross-compiler for $TARCH found" + return 0 else printf "$TARCH: ok, $ARCH using ${CROSS_COMPILE}gcc\n" @@ -406,21 +430,14 @@ function build_target CC="$CC -fno-stack-protector" fi - built_successfully $VENDOR $MAINBOARD && test $update = "false" && \ - { - printf " ( mainboard/$VENDOR/$MAINBOARD previously ok )\n\n" - xml " previouslyok" - xml "" - xml "" - return 0 - } - build_broken $VENDOR $MAINBOARD || \ { printf " ( broken mainboard/$VENDOR/$MAINBOARD skipped )\n\n" xml " knownbroken" xml "" xml "" + junit " " + junit "Board is marked as broken" return 0 } @@ -445,6 +462,7 @@ function build_target xml "" xml "" + junit "" printf "\n" } @@ -524,6 +542,8 @@ function myhelp printf " [-h|--help] print this help and exit\n" printf " [-x|--xml] write xml log file \n" printf " (defaults to $XMLFILE)\n" + printf " [-J|--junit] write JUnit formatted xml log file \n" + printf " (defaults to $XMLFILE)\n" printf " [-T|--test] submit image(s) to automated test system\n" printf " [-c|--cpus ] build on at the same time\n" printf " [-s|--silent] omit compiler calls in logs\n" @@ -567,11 +587,11 @@ test "$ROOT" = "" && ROOT=$( cd ../..; pwd ) getoptbrand="`getopt -V`" if [ "${getoptbrand:0:6}" == "getopt" ]; then # Detected GNU getopt that supports long options. - args=`getopt -l version,verbose,help,all,target:,broken,payloads:,test,cpus:,silent,xml,config,loglevel:,remove,prefix:,update,nostackprotect,scan-build,ccache -o Vvhat:bp:Tc:sxCl:rP:uy -- "$@"` + args=`getopt -l version,verbose,help,all,target:,broken,payloads:,test,cpus:,silent,junit,xml,config,loglevel:,remove,prefix:,update,nostackprotect,scan-build,ccache -o Vvhat:bp:Tc:sJxCl:rP:uy -- "$@"` eval set -- $args else # Detected non-GNU getopt - args=`getopt Vvhat:bp:Tc:sxCl:rP:uy $*` + args=`getopt Vvhat:bp:Tc:sJxCl:rP:uy $*` set -- $args fi @@ -583,6 +603,7 @@ fi while true ; do case "$1" in -x|--xml) shift; mode=xml; rm -f $XMLFILE ;; + -J|--junit) shift; mode=junit; rm -f $XMLFILE ;; -t|--target) shift; target="$1"; shift;; -a|--all) shift; buildall=true;; -b|--broken) shift; buildbroken=true;; @@ -607,6 +628,10 @@ while true ; do esac done +if [ "$cpus" != "1" ]; then + export MAKEFLAGS="-j $cpus" +fi + # /path/to/freebios2/ test -z "$1" || ROOT=$1 @@ -615,6 +640,9 @@ debug "ROOT=$ROOT" xml '' xml '' +junit '' +junit '' + if [ "$target" != "" ]; then # build a single board VENDOR=`printf $target|cut -f1 -d/` @@ -623,10 +651,13 @@ if [ "$target" != "" ]; then if [ ! -r $ROOT/src/mainboard/$target ]; then printf "No such target: $target\n" xml '' + junit '' exit 1 fi build_target $VENDOR $MAINBOARD $CONFIG test_target $VENDOR $MAINBOARD + cat $TARGET/${VENDOR}_${MAINBOARD}/abuild.xml >> $REAL_XMLFILE + XMLFILE=$REAL_XMLFILE else # build all boards per default for VENDOR in $( vendors ); do @@ -636,6 +667,12 @@ else remove_target $VENDOR $MAINBOARD done done + for xmlfile in $TARGET/*_*/abuild.xml; do + cat $xmlfile >> $REAL_XMLFILE + done + XMLFILE=$REAL_XMLFILE fi xml '' +junit '' +exit $failed