arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-20 21:01:25 +03:00
Code Activity

Removed --no-op from CLI. Preferences now not-saved by default.

Browse Source 
See https://github.com/arduino/Arduino/pull/2000 for details.

Close #2000
This commit is contained in:
Cristian Maglie
2014-08-22 15:39:33 +02:00
parent e3dc5e75e3
commit ec1310e1bd
2 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -360,6 +360,7 @@ public class Base {
ACTION action = ACTION.GUI;
boolean doVerboseBuild = false;
boolean doVerboseUpload = false;
boolean forceSavePrefs = false;
String getPref = null;
List<String> filenames = new LinkedList<String>();
@ -367,14 +368,13 @@ public class Base {
final Map<String, ACTION> actions = new HashMap<String, ACTION>();
actions.put("--verify", ACTION.VERIFY);
actions.put("--upload", ACTION.UPLOAD);
actions.put("--noop", ACTION.NOOP);
actions.put("--get-pref", ACTION.GET_PREF);
// Check if any files were passed in on the command line
for (int i = 0; i < args.length; i++) {
ACTION a = actions.get(args[i]);
if (a != null) {
if (action != ACTION.GUI) {
if (action != ACTION.GUI && action != ACTION.NOOP) {
String[] valid = actions.keySet().toArray(new String[0]);
String mess = I18n.format(_("Can only pass one of: {0}"), PApplet.join(valid, ", "));
showError(null, mess, 3);
@ -391,14 +391,20 @@ public class Base {
if (args[i].equals("--verbose") || args[i].equals("-v")) {
doVerboseBuild = true;
doVerboseUpload = true;
if (action == ACTION.GUI)
action = ACTION.NOOP;
continue;
}
if (args[i].equals("--verbose-build")) {
doVerboseBuild = true;
if (action == ACTION.GUI)
action = ACTION.NOOP;
continue;
}
if (args[i].equals("--verbose-upload")) {
doVerboseUpload = true;
if (action == ACTION.GUI)
action = ACTION.NOOP;
continue;
}
if (args[i].equals("--board")) {
@ -406,6 +412,8 @@ public class Base {
if (i >= args.length)
showError(null, _("Argument required for --board"), 3);
processBoardArgument(args[i]);
if (action == ACTION.GUI)
action = ACTION.NOOP;
continue;
}
if (args[i].equals("--port")) {
@ -413,6 +421,8 @@ public class Base {
if (i >= args.length)
showError(null, _("Argument required for --port"), 3);
Base.selectSerialPort(args[i]);
if (action == ACTION.GUI)
action = ACTION.NOOP;
continue;
}
if (args[i].equals("--curdir")) {
@ -427,10 +437,12 @@ public class Base {
if (i >= args.length)
showError(null, _("Argument required for --pref"), 3);
processPrefArgument(args[i]);
if (action == ACTION.GUI)
action = ACTION.NOOP;
continue;
}
if (args[i].equals("--no-save-prefs")) {
Preferences.setDoSave(false);
if (args[i].equals("--save-prefs")) {
forceSavePrefs = true;
continue;
}
if (args[i].equals("--preferences-file")) {
@ -472,6 +484,8 @@ public class Base {
}
boolean showEditor = (action == ACTION.GUI);
if (!forceSavePrefs)
Preferences.setDoSave(showEditor);
if (handleOpen(file, nextEditorLocation(), showEditor) == null) {
String mess = I18n.format(_("Failed to open sketch: \"{0}\""), path);
// Open failure is fatal in upload/verify mode