rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-03-15 12:29:26 +01:00
Code Issues Releases Activity

Started fat (multi-architecture) libraries support (work in progress)

Browse Source
This commit is contained in:
Cristian Maglie 2012-07-04 12:00:35 +02:00
parent 01bd432af3
commit 5c0eca5fa7
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1038,12 +1038,27 @@ public class Base {
continue; continue;
} }
subfolder = scanFatLibrary(subfolder);
// (also replace previously found libs with the same name) // (also replace previously found libs with the same name)
res.put(libName, subfolder); if (subfolder != null)
res.put(libName, subfolder);
} }
return res; return res;
} }
public File scanFatLibrary(File libFolder) {
// Fat libraries must have metadata.txt file
File propFile = new File(libFolder, "metadata.txt");
if (!propFile.exists())
return libFolder;
// Search for a subfolder for actual architecture, return null if not found
File archSubfolder = new File(libFolder, Base.getTargetPlatform().getName());
if (!archSubfolder.exists() || !archSubfolder.isDirectory())
return null;
return archSubfolder;
}
public void onBoardOrPortChange() { public void onBoardOrPortChange() {
// Calculate paths for libraries and examples // Calculate paths for libraries and examples
examplesFolder = getContentFile("examples"); examplesFolder = getContentFile("examples");