arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-17 22:23:10 +03:00
Code Activity

Bundled core is again inside the hardware folder.

Browse Source 
Fixed a handful of glitches when dealing with multiple installed cores
This commit is contained in:
Federico Fissore
2015-03-31 17:00:01 +02:00
parent 98f364ea38
commit 29cb42eb50
27 changed files with 359 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
arduino-core/src/processing/app/BaseNoGui.java
View File

@ -578,12 +578,11 @@ public class BaseNoGui {
static public void initPackages() throws Exception {
indexer = new ContributionsIndexer(BaseNoGui.getSettingsFolder());
File indexFile = indexer.getIndexFile();
File avrCoreFolder = FileUtils.newFile(indexFile.getParentFile(), "packages", "arduino", "hardware", "avr");
if (!indexFile.isFile() || !(avrCoreFolder.exists() && avrCoreFolder.isDirectory())) {
File distFile = findDefaultPackageFile();
if (distFile != null) {
new ArchiveExtractor(getPlatform()).extract(distFile, BaseNoGui.getSettingsFolder(), 0, true);
} else if (!indexFile.isFile()) {
if (!indexFile.isFile()) {
File defaultPackageJsonFile = new File(getContentFile("dist"), "package_index.json");
if (defaultPackageJsonFile.isFile()) {
FileUtils.copyFile(defaultPackageJsonFile, indexFile);
} else {
// Otherwise create an empty packages index
FileOutputStream out = null;
try {
@ -598,7 +597,7 @@ public class BaseNoGui {
}
}
indexer.parseIndex();
indexer.syncWithFilesystem();
indexer.syncWithFilesystem(getHardwareFolder());
packages = new HashMap<String, TargetPackage>();
loadHardware(getHardwareFolder());
@ -626,18 +625,6 @@ public class BaseNoGui {
librariesIndexer.parseIndex();
}
private static File findDefaultPackageFile() {
File distFolder = getContentFile("dist");
if (!distFolder.exists()) {
return null;
}
File[] files = distFolder.listFiles(new OnlyFilesWithExtension("tar.bz2", "zip", "tar.gz", "tar"));
if (files.length > 1) {
throw new IllegalStateException("More than one file in " + distFolder);
}
return files[0];
}
static protected void initPlatform() {
try {
Class<?> platformClass = Class.forName("processing.app.Platform");
@ -697,7 +684,7 @@ public class BaseNoGui {
try {
packages.put(target, new LegacyTargetPackage(target, subfolder));
} catch (TargetPlatformException e) {
System.out.println("WARNING: Error loading hardware folder " + target);
System.out.println("WARNING: Error loading hardware folder " + new File(folder, target));
System.out.println(" " + e.getMessage());
}
}
@ -777,12 +764,9 @@ public class BaseNoGui {
PreferencesData.removeAllKeysWithPrefix(prefix);
for (ContributedTool tool : indexer.getInstalledTools()) {
String path = tool.getDownloadableContribution().getInstalledFolder()
.getAbsolutePath();
String toolId = tool.getName();
PreferencesData.set(prefix + toolId + ".path", path);
toolId += "-" + tool.getVersion();
PreferencesData.set(prefix + toolId + ".path", path);
String path = tool.getDownloadableContribution().getInstalledFolder().getAbsolutePath();
PreferencesData.set(prefix + tool.getName() + ".path", path);
PreferencesData.set(prefix + tool.getName() + "-" + tool.getVersion() + ".path", path);
}
}

5
arduino-core/src/processing/app/debug/LegacyTargetPackage.java
View File

@ -77,6 +77,11 @@ public class LegacyTargetPackage implements TargetPackage {
return platforms.get(platform);
}
@Override
public boolean hasPlatform(TargetPlatform platform) {
return platforms.containsKey(platform.getId());
}
@Override
public String getId() {
return id;

13
arduino-core/src/processing/app/debug/TargetPackage.java
View File

@ -25,12 +25,13 @@ import java.util.Map;
public interface TargetPackage {
public String getId();
public Map<String, TargetPlatform> getPlatforms();
String getId();
public Collection<TargetPlatform> platforms();
Map<String, TargetPlatform> getPlatforms();
public TargetPlatform get(String platform);
Collection<TargetPlatform> platforms();
TargetPlatform get(String platform);
boolean hasPlatform(TargetPlatform platform);
}