Index: build/build.sh =================================================================== diff -u -r8f5e61e699354797f948e8778701d5df8609aac4 -re2aadd9c338efd3f5cf26f04244fce444d87c710 --- build/build.sh (.../build.sh) (revision 8f5e61e699354797f948e8778701d5df8609aac4) +++ build/build.sh (.../build.sh) (revision e2aadd9c338efd3f5cf26f04244fce444d87c710) @@ -1,7 +1,5 @@ #!/bin/bash # $./run.unittest.sh release 5.12.5 /media/sf_VMSHARE -#Setting up Display number - #setup Qt dir version if [[ "$2" = "" ]]; then QT_VER="" @@ -35,7 +33,7 @@ REPORT=Report # gcc env -gcc_qmake="/opt/Qt$QT_VER/5.12.4/gcc_64/bin/qmake" +gcc_qmake="/opt/Qt$QT_VER/5.12.5/gcc_64/bin/qmake" gcc_make="/usr/bin/make" gcc_out_base="gcc_64" gcc_out=$gcc_out_base"_"$pro_type @@ -102,29 +100,54 @@ exit 1 fi +# ============================================================= +echo " ------------------------------ Start building [$gcc_out]" +mkdir -p $gcc_out +cd $gcc_out -echo " ------------------------------ Start building [poky_64]" +echo " ------------------------------ run qmake" +$gcc_qmake ../../$pro_path/$pro_name $gcc_spec $pro_build + +echo " ------------------------------ run make" +build_err=../build_$gcc_out.err +build_log=../build_$gcc_out.log +$gcc_make -j4 1> $build_log 2> $build_err + +if [[ $(grep "error:" $build_err) != "" ]]; then + echo "ERROR: Application Build Failed [$gcc_out]" + exit 2 +fi + +if [[ $(grep "warning:" $build_err) != "" ]]; then + echo "WARNING: Application Build Has Warnings [$gcc_out]" + #exit 3 +fi +cd .. + +# ============================================================= +echo " ------------------------------ Start building [$poky_out]" mkdir -p $poky_out cd $poky_out echo " ------------------------------ run qmake" $poky_qmake ../../$pro_path/$pro_name $poky_spec $pro_build echo " ------------------------------ run make" -build_err=../build.err -build_log=../build.log +build_err=../build_$poky_out.err +build_log=../build_$poky_out.log $poky_make -j4 1> $build_log 2> $build_err if [[ $(grep "error:" $build_err) != "" ]]; then - echo "ERROR: Application Build Failed" + echo "ERROR: Application Build Failed [$poky_out]" exit 2 fi if [[ $(grep "warning:" $build_err) != "" ]]; then - echo "WARNING: Application Build Has Warnings" + echo "WARNING: Application Build Has Warnings [$poky_out]" #exit 3 fi +# ============================================================= echo " ------------------------------ stop denali on device" ssh $device 'killall denali' sleep 1 @@ -142,10 +165,17 @@ echo " ------------------------------ copy the out file into the server" LOG=Logs +echo " ------------------------------ $poky_out" mkdir -p $REMOTE_DIR/$REPORT_DIR/$LOG cp $out_path/* $REMOTE_DIR/$REPORT_DIR/$LOG -mkdir -p $REMOTE_DIR/$REPORT_DIR/bin -cp $out_path/$poky_out/denali $REMOTE_DIR/$REPORT_DIR/bin +mkdir -p $REMOTE_DIR/$REPORT_DIR/bin/$poky_out +cp $out_path/$poky_out/denali $REMOTE_DIR/$REPORT_DIR/bin/$poky_out sync;sync;sync; +echo " ------------------------------ $gcc_out" +mkdir -p $REMOTE_DIR/$REPORT_DIR/$LOG +cp $out_path/* $REMOTE_DIR/$REPORT_DIR/$LOG +mkdir -p $REMOTE_DIR/$REPORT_DIR/bin/$gcc_out +cp $out_path/$gcc_out/denali $REMOTE_DIR/$REPORT_DIR/bin/$gcc_out +sync;sync;sync;