arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-08-01 03:47:23 +03:00
Code Activity

Platform is now implicit when referring to other packages, e.g. 'arduino:avr:arduino' becomes 'arduino:arduino'

Browse Source
This commit is contained in:
Cristian Maglie
2011-12-31 15:23:54 +01:00
parent 770c8dfe35
commit a417455d5a
3 changed files with 40 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/processing/app/debug/Compiler.java
View File

@ -135,10 +135,11 @@ public class Compiler implements MessageConsumer {
coreFolder = new File(t.getFolder(), "cores");
coreFolder = new File(coreFolder, core);
} else {
String[] split = core.split(":", 3);
TargetPlatform t = Base.getTargetPlatform(split[0], split[1]);
String[] split = core.split(":", 2);
TargetPlatform t = Base.getTargetPlatform(split[0], Preferences
.get("target_platform"));
coreFolder = new File(t.getFolder(), "cores");
coreFolder = new File(coreFolder, split[2]);
coreFolder = new File(coreFolder, split[1]);
}
String corePath = coreFolder.getAbsolutePath();
@ -151,10 +152,11 @@ public class Compiler implements MessageConsumer {
variantFolder = new File(t.getFolder(), "variants");
variantFolder = new File(variantFolder, variant);
} else {
String[] split = variant.split(":");
TargetPlatform t = Base.getTargetPlatform(split[0], split[1]);
String[] split = variant.split(":", 2);
TargetPlatform t = Base.getTargetPlatform(split[0], Preferences
.get("target_platform"));
variantFolder = new File(t.getFolder(), "variants");
variantFolder = new File(variantFolder, split[2]);
variantFolder = new File(variantFolder, split[1]);
}
variantPath = variantFolder.getAbsolutePath();
}