Merge pull request #427 from infthi/no_upload_on_errors

Issue #284: Upload occurs even if build fails.

@infthi 
Thanks for this. I have been looking and asking for something like this.
@rlogiacco 
I'm accepting this. If there are false positives (I would not be surprised if it didn't) we can decide to add a flag for testing or add a dialogue which says something like "it looks as if the build has failed: do you want to upload anyway?"

Author: jantje

it.baeyens.arduino.core/src/it/baeyens/arduino/actions/UploadProjectHandler.java

@@ -3,10 +3,13 @@
 import java.net.URL;
 
 import org.eclipse.cdt.core.model.CoreModel;
+import org.eclipse.cdt.core.model.ICModelMarker;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IncrementalProjectBuilder;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -34,6 +37,21 @@ public UploadJobHandler(IProject buildProject) {
 		super(Messages.ArduinoUploadProjectHandler_Upload_for_project + buildProject.getName());
 		this.myBuildProject = buildProject;
 	}
+	
+	/**
+	 * Checks if build completed successfully.
+	 * @return true iff project was not built successfully last time.
+	 * @throws CoreException if current project does not exist or is not open.
+	 */
+	private boolean hasBuildErrors() throws CoreException {
+		IMarker[] markers = this.myBuildProject.findMarkers(ICModelMarker.C_MODEL_PROBLEM_MARKER, true, IResource.DEPTH_INFINITE);
+		for (IMarker marker: markers) {
+			if (marker.getAttribute(IMarker.SEVERITY, IMarker.SEVERITY_INFO) == IMarker.SEVERITY_ERROR) {
+				return true;
+			}
+		}
+		return false;
+	}
 
 	@Override
 	protected IStatus run(IProgressMonitor monitor) {
@@ -62,12 +80,20 @@ protected IStatus run(IProgressMonitor _monitor) {
 				};
 				job.setPriority(Job.DECORATE);
 				job.schedule();
+				if (hasBuildErrors()) {
+					throw new CoreException(new Status(IStatus.ERROR, Const.CORE_PLUGIN_ID, "Build completed with errors."));
+				}
 			} catch (CoreException e) {
-				Shell theShell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-				MessageBox dialog = new MessageBox(theShell, SWT.ICON_QUESTION | SWT.OK);
-				dialog.setText(Messages.ArduinoUploadProjectHandler_Build_failed);
-				dialog.setMessage(Messages.ArduinoUploadProjectHandler_Build_failed_so_no_upload);
-				dialog.open();
+				Display.getDefault().asyncExec(new Runnable() {
+					@Override
+					public void run() {
+						Shell theShell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
+						MessageBox dialog = new MessageBox(theShell, SWT.ICON_QUESTION | SWT.OK);
+						dialog.setText(Messages.ArduinoUploadProjectHandler_Build_failed);
+						dialog.setMessage(Messages.ArduinoUploadProjectHandler_Build_failed_so_no_upload);
+						dialog.open();
+					}
+				});
 				return Status.OK_STATUS;
 			}
 		}