Skip to content

Linux: Removed X11 requirement when running in command line mode #5578

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Nov 25, 2016
Merged

Linux: Removed X11 requirement when running in command line mode #5578

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
fbe6bf3
Moved all initializations into Base constructor
cmaglie Nov 7, 2016
cf54cce
SplashScreenHelper output progress in console for text-only mode
cmaglie Nov 7, 2016
b73bc92
Moving some other graphic related parts into GUI initialization
cmaglie Nov 7, 2016
fedc2b6
Give sense to `isCommandLine()` method
cmaglie Nov 7, 2016
8d84432
Prompt for sketchbook folder only if in GUI mode
cmaglie Nov 7, 2016
21bcb64
Build menus only in gui mode
cmaglie Nov 7, 2016
df1841f
Initialize Editor only in GUI mode (part 1/3)
cmaglie Nov 7, 2016
611ed08
Use PreferenceData.setBoolean() where appropriate
cmaglie Nov 25, 2016
ae99095
...now Verify works again... (part 2/3)
cmaglie Nov 7, 2016
1a640f6
...and Upload too (part 3/3)
cmaglie Nov 7, 2016
3d52de7
Removed useless `showEditor` parameter from `Base.handleOpen`
cmaglie Nov 7, 2016
8eae641
Removed old prototype code from #2328 that is now in Base
cmaglie Nov 7, 2016
c363777
Reduce verbosity during downloads in text-only mode
cmaglie Nov 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
...now Verify works again... (part 2/3)
  • Loading branch information
@cmaglie
cmaglie committed Nov 25, 2016
commit ae990954d3b67feef79140f85a5c9e90a61f85cc
36 changes: 24 additions & 12 deletions app/src/processing/app/Base.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

package processing.app;

import cc.arduino.Compiler;
import cc.arduino.Constants;
import cc.arduino.UpdatableBoardsLibsFakeURLsHandler;
import cc.arduino.contributions.*;
Expand Down Expand Up @@ -349,31 +350,42 @@ public Base(String[] args) throws Exception {
System.exit(0);

} else if (parser.isVerifyOrUploadMode()) {
splash.close();
// Set verbosity for command line build
PreferencesData.setBoolean("build.verbose", parser.isDoVerboseBuild());
PreferencesData.setBoolean("upload.verbose", parser.isDoVerboseUpload());

// Set preserve-temp flag
PreferencesData.setBoolean("runtime.preserve.temp.files", parser.isPreserveTempFiles());
Copy link
Collaborator

@matthijskooijman matthijskooijman Nov 23, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps changing set to setBoolean should end up in a separate commit?


// Make sure these verbosity preferences are only for the
// current session
// Make sure these verbosity preferences are only for the current session
PreferencesData.setDoSave(false);

Editor editor = editors.get(0);
Sketch sketch = null;
String outputFile = null;

if (parser.isUploadMode()) {
splash.splashText(tr("Verifying and uploading..."));
editor.exportHandler.run();
} else {
try {
// Build
splash.splashText(tr("Verifying..."));
editor.runHandler.run();
}

// Error during build or upload
if (editor.status.isErr()) {
File sketchFile = new File(parser.getFilenames().get(0));
sketch = new Sketch(sketchFile);

outputFile = new Compiler(sketch).build(progress -> {}, false);
} catch (Exception e) {
// Error during build
System.exit(1);
}

if (parser.isUploadMode()) {
splash.splashText(tr("Verifying and uploading..."));
// XXX: TODO
//editor.exportHandler.run();
// Error during upload
//if (editor.status.isErr()) {
// System.exit(1);
//}
}

// No errors exit gracefully
System.exit(0);
} else if (parser.isGuiMode()) {
Expand Down