Index: build/vsquishqt.sh =================================================================== diff -u -r8a850e06863b766b6f0041a0ba66ec2003adee2a -rbbe6c8c8e6c5ac2cfa8ac170e99de93417f182fe --- build/vsquishqt.sh (.../vsquishqt.sh) (revision 8a850e06863b766b6f0041a0ba66ec2003adee2a) +++ build/vsquishqt.sh (.../vsquishqt.sh) (revision bbe6c8c8e6c5ac2cfa8ac170e99de93417f182fe) @@ -17,7 +17,7 @@ # project pro file project=VSquishQt -pro_path=validation/$project +pro_path=vsquishqt pro_name=$project.pro pro_build="CONFIG+=qtquickcompiler" @@ -30,7 +30,7 @@ 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 +gcc_out=$gcc_out_base gcc_spec="-spec linux-g++" #check if the out folders already exists @@ -58,13 +58,14 @@ mkdir -p $gcc_out cd $gcc_out +build_err=../build_$gcc_out.err +build_log=../build_$gcc_out.log + echo " ------------------------------ run qmake" -$gcc_qmake ../../$pro_path/$pro_name $gcc_spec $pro_build +$gcc_qmake ../../$pro_path/$pro_name $gcc_spec $pro_build 1> $build_log 2> $build_err echo " ------------------------------ run make" -build_err=../build_$gcc_out.err -build_log=../build_$gcc_out.log -$gcc_make -j4 1> $build_log 2> $build_err +$gcc_make -j4 1>> $build_log 2>> $build_err if [[ $(grep "error:" $build_err) != "" ]]; then echo "ERROR: Application Build Failed [$gcc_out]" @@ -90,6 +91,6 @@ 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 +cp $out_path/$gcc_out/$project $REMOTE_DIR/$REPORT_DIR/bin/$gcc_out sync;sync;sync;