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

Removed useless defaults in platform. Remove useless boards.txt/*.platform keys. Renamed some method to a more meaningful name

Browse Source
This commit is contained in:
Cristian Maglie
2012-01-02 17:39:43 +01:00
parent 06b6d060db
commit 812265f1c0
4 changed files with 75 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,13 +83,8 @@ public class Compiler implements MessageConsumer {
PreferencesMap boardPreferences = Base.getBoardPreferences();
// Check for null platform, and use system default if not found
String platform = boardPreferences.get("platform");
PreferencesMap platformPreferences;
if (platform == null)
platformPreferences = Base.getPlatformPreferences();
else
platformPreferences = Base.getPlatformPreferences(platform);
TargetPlatform targetPlatform = Base.getTargetPlatform();
PreferencesMap platformPreferences = targetPlatform.getPreferences();
// Merge all the global preference configuration in order of priority
prefs = new PreferencesMap();
@ -104,10 +99,7 @@ public class Compiler implements MessageConsumer {
toolsPath = prefs.get("compiler.path");
if (toolsPath == null) {
toolsPath = Base.getAvrBasePath();
System.out.println("avrBasePath: " + toolsPath);
} else {
System.out.println("avrBasePath:exists: " + toolsPath);
// Put in the system path in the compiler path if available
MessageFormat compileFormat = new MessageFormat(toolsPath);
String basePath = System.getProperty("user.dir");
@ -131,7 +123,7 @@ public class Compiler implements MessageConsumer {
File coreFolder;
if (!core.contains(":")) {
TargetPlatform t = Base.getTarget();
TargetPlatform t = Base.getTargetPlatform();
coreFolder = new File(t.getFolder(), "cores");
coreFolder = new File(coreFolder, core);
} else {
@ -148,7 +140,7 @@ public class Compiler implements MessageConsumer {
if (variant != null) {
File variantFolder;
if (!variant.contains(":")) {
TargetPlatform t = Base.getTarget();
TargetPlatform t = Base.getTargetPlatform();
variantFolder = new File(t.getFolder(), "variants");
variantFolder = new File(variantFolder, variant);
} else {