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

Merge pull request #1790 from cmaglie/platform-paths

Browse Source 
Fixed "runtime.hardware.path" and "runtime.platform.path" values
This commit is contained in:
Cristian Maglie 2014-01-09 04:30:00 -08:00
commit 8595d1444c
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1554,6 +1554,10 @@ public class Base {
Preferences.set("target_platform", targetPlatform.getId()); Preferences.set("target_platform", targetPlatform.getId());
Preferences.set("board", targetBoard.getId()); Preferences.set("board", targetBoard.getId());
File platformFolder = targetPlatform.getFolder();
Preferences.set("runtime.platform.path", platformFolder.getAbsolutePath());
Preferences.set("runtime.hardware.path", platformFolder.getParentFile().getAbsolutePath());
filterVisibilityOfSubsequentBoardMenus(targetBoard, 1); filterVisibilityOfSubsequentBoardMenus(targetBoard, 1);
onBoardOrPortChange(); onBoardOrPortChange();

1
app/src/processing/app/Preferences.java
View File

@ -231,7 +231,6 @@ public class Preferences {
// set some runtime constants (not saved on preferences file) // set some runtime constants (not saved on preferences file)
File hardwareFolder = Base.getHardwareFolder(); File hardwareFolder = Base.getHardwareFolder();
table.put("runtime.hardware.path", hardwareFolder.getAbsolutePath());
table.put("runtime.ide.path", hardwareFolder.getParentFile().getAbsolutePath()); table.put("runtime.ide.path", hardwareFolder.getParentFile().getAbsolutePath());
table.put("runtime.ide.version", "" + Base.REVISION); table.put("runtime.ide.version", "" + Base.REVISION);

2
hardware/arduino/avr/platform.txt
View File

@ -84,7 +84,7 @@ tools.avrdude.erase.pattern="{cmd.path}" "-C{config.path}" {erase.verbose} -p{bu
tools.avrdude.bootloader.params.verbose=-v -v -v -v tools.avrdude.bootloader.params.verbose=-v -v -v -v
tools.avrdude.bootloader.params.quiet=-q -q tools.avrdude.bootloader.params.quiet=-q -q
tools.avrdude.bootloader.pattern="{cmd.path}" "-C{config.path}" {bootloader.verbose} -p{build.mcu} -c{protocol} {program.extra_params} "-Uflash:w:{runtime.ide.path}/hardware/arduino/avr/bootloaders/{bootloader.file}:i" -Ulock:w:{bootloader.lock_bits}:m tools.avrdude.bootloader.pattern="{cmd.path}" "-C{config.path}" {bootloader.verbose} -p{build.mcu} -c{protocol} {program.extra_params} "-Uflash:w:{runtime.platform.path}/bootloaders/{bootloader.file}:i" -Ulock:w:{bootloader.lock_bits}:m
# USB Default Flags # USB Default Flags