Index: build/build.sh =================================================================== diff -u -r204cb01168591828ed3bc8db4ade44b995fe7fc0 -rc30fcf626d81911871ef01e903df2532d151e0fb --- build/build.sh (.../build.sh) (revision 204cb01168591828ed3bc8db4ade44b995fe7fc0) +++ build/build.sh (.../build.sh) (revision c30fcf626d81911871ef01e903df2532d151e0fb) @@ -37,8 +37,8 @@ # Build specs out_path="build" setBuildVariables ${buildSpecs[@]} -REPORT_DIR=$(getRemoteCopyAddress "DEN_UI") -STATUS_REPORT=$REPORT_DIR/"StatusReport.csv" +REMOTE_DIR=$(getRemoteCopyAddress "DEN_UI") +STATUS_REPORT=$REMOTE_DIR/"StatusReport.csv" REPORT=Report # Get the build variables @@ -193,14 +193,14 @@ ./setupscript/projectsetup.sh "ui" cd application echo " ------------------------------ run the cppcheck" -cppCheckStatus=$(runCppcheck $(pwd) $REPORT_DIR $STATUS_REPORT) +cppCheckStatus=$(runCppcheck $(pwd) $REMOTE_DIR $STATUS_REPORT) if [[ $cppCheckStatus -eq 1 ]] then hasTestPassed=false fi #./cppcheck.sh ../$out_path/ #TODO remove -#cd .. +cd .. echo " ------------------------------ set the build type (debug/release)" buildType "$1" @@ -286,17 +286,17 @@ echo " ------------------------------ copy the out file into the server" LOG=Logs echo " ------------------------------ $poky_out" -mkdir -p $REPORT_DIR/$REPORT_DIR/$LOG -cp $out_path/* $REPORT_DIR/$REPORT_DIR/$LOG -mkdir -p $REPORT_DIR/$REPORT_DIR/bin/$poky_out -cp $out_path/$poky_out/denali $REPORT_DIR/$REPORT_DIR/bin/$poky_out +mkdir -p $REMOTE_DIR/$REPORT_DIR/$LOG +cp $out_path/* $REMOTE_DIR/$REPORT_DIR/$LOG +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 $REPORT_DIR/$REPORT_DIR/$LOG -cp $out_path/* $REPORT_DIR/$REPORT_DIR/$LOG -mkdir -p $REPORT_DIR/$REPORT_DIR/bin/$gcc_out -cp $out_path/$gcc_out/denali $REPORT_DIR/$REPORT_DIR/bin/$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; # Open up the statu report and parse for the word Faild. This is @@ -326,10 +326,10 @@ fi # Generate code review project -getCodeReviewReport "UI" $REPORT_DIR +getCodeReviewReport "UI" $REMOTE_DIR # Mark pass/fail to the build folder -markRemoteFolderWithPassFail $hasTestPassed $REPORT_DIR +markRemoteFolderWithPassFail $hasTestPassed $REMOTE_DIR