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

Windows: Compiler wasn't supplying Windows command line with the correct double quotes

Browse Source
This commit is contained in:
Federico Fissore
2015-04-24 12:03:41 +02:00
parent d805fb4e1f
commit f54851ecfa
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arduino-core/src/processing/app/debug/Compiler.java
View File

@ -54,7 +54,7 @@ import processing.app.preproc.PdePreprocessor;
import processing.app.legacy.PApplet; import processing.app.legacy.PApplet;
import processing.app.packages.LegacyUserLibrary; import processing.app.packages.LegacyUserLibrary;
import processing.app.packages.UserLibrary; import processing.app.packages.UserLibrary;
import processing.app.tools.ArgumentsWithSpaceAwareCommandLine; import processing.app.tools.DoubleQuotedArgumentsOnWindowsCommandLine;
public class Compiler implements MessageConsumer { public class Compiler implements MessageConsumer {
@ -723,7 +723,7 @@ public class Compiler implements MessageConsumer {
} }
}); });
CommandLine commandLine = new ArgumentsWithSpaceAwareCommandLine(command[0]); CommandLine commandLine = new DoubleQuotedArgumentsOnWindowsCommandLine(command[0]);
for (int i = 1; i < command.length; i++) { for (int i = 1; i < command.length; i++) {
commandLine.addArgument(command[i], false); commandLine.addArgument(command[i], false);
} }

12
arduino-core/src/processing/app/tools/ArgumentsWithSpaceAwareCommandLine.java → arduino-core/src/processing/app/tools/DoubleQuotedArgumentsOnWindowsCommandLine.java
View File

@ -7,24 +7,24 @@ import processing.app.helpers.OSUtils;
import java.io.File; import java.io.File;
public class ArgumentsWithSpaceAwareCommandLine extends CommandLine { public class DoubleQuotedArgumentsOnWindowsCommandLine extends CommandLine {
public ArgumentsWithSpaceAwareCommandLine(String executable) { public DoubleQuotedArgumentsOnWindowsCommandLine(String executable) {
super(executable); super(executable);
} }
public ArgumentsWithSpaceAwareCommandLine(File executable) { public DoubleQuotedArgumentsOnWindowsCommandLine(File executable) {
super(executable); super(executable);
} }
public ArgumentsWithSpaceAwareCommandLine(CommandLine other) { public DoubleQuotedArgumentsOnWindowsCommandLine(CommandLine other) {
super(other); super(other);
} }
@Override @Override
public CommandLine addArgument(String argument, boolean handleQuoting) { public CommandLine addArgument(String argument, boolean handleQuoting) {
if (argument.contains(" ") && OSUtils.isWindows()) { if (argument.contains("\"") && OSUtils.isWindows()) {
argument = argument.replaceAll("\"", "").replaceAll("'", ""); argument = argument.replace("\"", "\\\"");
} }
return super.addArgument(argument, handleQuoting); return super.addArgument(argument, handleQuoting);