rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-26 20:54:22 +01:00
Code Issues Releases Activity

...and Upload too (part 3/3)

Browse Source 
This commit concludes the refactoring.
This commit is contained in:
Cristian Maglie 2016-11-07 17:34:13 +01:00
parent ae990954d3
commit 1a640f6139
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/src/processing/app/Base.java
View File

@ -25,6 +25,7 @@ package processing.app;
import cc.arduino.Compiler;
import cc.arduino.Constants;
import cc.arduino.UpdatableBoardsLibsFakeURLsHandler;
import cc.arduino.UploaderUtils;
import cc.arduino.contributions.*;
import cc.arduino.contributions.libraries.*;
import cc.arduino.contributions.libraries.ui.LibraryManagerUI;
@ -377,13 +378,29 @@ public class Base {
}
if (parser.isUploadMode()) {
splash.splashText(tr("Verifying and uploading..."));
// XXX: TODO
//editor.exportHandler.run();
// Error during upload
//if (editor.status.isErr()) {
// System.exit(1);
//}
// Upload
splash.splashText(tr("Uploading..."));
try {
List<String> warnings = new ArrayList<>();
UploaderUtils uploader = new UploaderUtils();
boolean res = uploader.upload(sketch, null, outputFile,
parser.isDoUseProgrammer(),
parser.isNoUploadPort(), warnings);
for (String warning : warnings) {
System.out.println(tr("Warning") + ": " + warning);
}
if (!res) {
throw new Exception();
}
} catch (Exception e) {
// Error during upload
System.out.flush();
System.err.flush();
System.err
.println(tr("An error occurred while uploading the sketch"));
System.exit(1);
}
}
// No errors exit gracefully