Skip to content

Test json-aware builder #5197

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

Closed
wants to merge 1 commit into from
Closed

Test json-aware builder #5197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions arduino-core/src/cc/arduino/Compiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,13 @@ private void callArduinoBuilder(TargetBoard board, TargetPlatform platform, Targ
}
});

commandLine.addArgument("-package-index", false);
commandLine.addArgument("\"" + BaseNoGui.getSettingsFolder() + "\"", false);

commandLine.addArgument("-prefs", false);
commandLine.addArgument("\"" + Constants.PREF_BOARDS_MANAGER_ADDITIONAL_URLS + "=" +
"package_index.json," + PreferencesData.get(Constants.PREF_BOARDS_MANAGER_ADDITIONAL_URLS, "") + "\"", false);

Stream.of(BaseNoGui.getContentFile("tools-builder").getAbsolutePath(), Paths.get(BaseNoGui.getHardwarePath(), "tools", "avr").toAbsolutePath().toString(), new File(BaseNoGui.getSettingsFolder(), "packages").getAbsolutePath())
.forEach(p -> {
if (Files.exists(Paths.get(p))) {
Expand Down
0 build/arduino-builder-arm-1.3.19.tar.bz2.sha → ...duino-builder-arm-1.3.20-json.tar.bz2.sha
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion build/arduino-builder-linux32-1.3.19.tar.bz2.sha
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions build/arduino-builder-linux32-1.3.20-json.tar.bz2.sha
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
953cf49dc9becd21236187345d47f023975bb6b0
1 change: 0 additions & 1 deletion build/arduino-builder-linux64-1.3.19.tar.bz2.sha
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions build/arduino-builder-linux64-1.3.20-json.tar.bz2.sha
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ed947f5b0d0be3b6331c5e3d45a0dc52c722bfa6
1 change: 0 additions & 1 deletion build/arduino-builder-macosx-1.3.19.tar.bz2.sha
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions build/arduino-builder-macosx-1.3.20-json.tar.bz2.sha
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
58fd6795ce3ac05cd2a03d7265a746da1452ac36
1 change: 0 additions & 1 deletion build/arduino-builder-windows-1.3.19.zip.sha
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions build/arduino-builder-windows-1.3.20-json.zip.sha
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
06c060be2e6bdd04814b95541f246e42b8d57259
2 changes: 1 addition & 1 deletion build/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@

<property name="portable" value="false" />

<property name="ARDUINO-BUILDER-VERSION" value="1.3.19" />
<property name="ARDUINO-BUILDER-VERSION" value="1.3.20-json" />
<property name="LIBLISTSERIAL-VERSION" value="1.1.4" />
<property name="AVRGCC-VERSION" value="4.9.2-atmel3.5.3-arduino2" />
<property name="AVRDUDE-VERSION" value="6.3.0-arduino2" />
Expand Down