rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-30 19:52:13 +01:00
Code Issues Releases Activity

Compiler: don't filter out existing sketch files, overwrite them. Fixes #3440

Browse Source
This commit is contained in:
Federico Fissore 2015-06-30 15:18:19 +02:00
parent 4313f2ab42
commit 9a01e30675
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,6 +29,7 @@ import java.io.*;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
import java.util.*; import java.util.*;
import java.util.stream.Stream; import java.util.stream.Stream;
@ -1416,11 +1417,10 @@ public class Compiler implements MessageConsumer {
throw new RunnerException(e); throw new RunnerException(e);
} }
otherFilesStream.map((path) -> new Pair<>(path, Paths.get(buildPath, sketchPath.relativize(path).toString()))) otherFilesStream.map((path) -> new Pair<>(path, Paths.get(buildPath, sketchPath.relativize(path).toString())))
.filter((pair) -> !Files.exists(pair.value))
.forEach((pair) -> { .forEach((pair) -> {
try { try {
Files.createDirectories(pair.value.getParent()); Files.createDirectories(pair.value.getParent());
Files.copy(pair.key, pair.value); Files.copy(pair.key, pair.value, StandardCopyOption.REPLACE_EXISTING);
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
throw new RuntimeException(I18n.format(_("Problem moving {0} to the build folder"), sketchPath.relativize(pair.key).toString())); throw new RuntimeException(I18n.format(_("Problem moving {0} to the build folder"), sketchPath.relativize(pair.key).toString()));