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

Disabled 'fat' (multiplatform) library check.

Browse Source 
Conflicts:
	app/src/processing/app/Base.java
This commit is contained in:
Cristian Maglie
2012-10-24 12:50:30 +02:00
parent 8266ac5aad
commit fa9566235d
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2381,7 +2381,7 @@ public class Base {
JFileChooser fileChooser = new JFileChooser(System.getProperty("user.home")); JFileChooser fileChooser = new JFileChooser(System.getProperty("user.home"));
fileChooser.setDialogTitle(_("Select a zip file or a folder containing the library you'd like to add")); fileChooser.setDialogTitle(_("Select a zip file or a folder containing the library you'd like to add"));
fileChooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES); fileChooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);
fileChooser.setFileFilter(new FileNameExtensionFilter("ZIP files or folders", "zip")); fileChooser.setFileFilter(new FileNameExtensionFilter(_("ZIP files or folders"), "zip"));
Dimension preferredSize = fileChooser.getPreferredSize(); Dimension preferredSize = fileChooser.getPreferredSize();
fileChooser.setPreferredSize(new Dimension(preferredSize.width + 200, preferredSize.height + 200)); fileChooser.setPreferredSize(new Dimension(preferredSize.width + 200, preferredSize.height + 200));
@ -2404,7 +2404,7 @@ public class Base {
zipDeflater.deflate(); zipDeflater.deflate();
File[] foldersInTmpFolder = tmpFolder.listFiles(new OnlyDirs()); File[] foldersInTmpFolder = tmpFolder.listFiles(new OnlyDirs());
if (foldersInTmpFolder.length != 1) { if (foldersInTmpFolder.length != 1) {
throw new IOException("Zip doesn't contain one library"); throw new IOException(_("Zip doesn't contain a library"));
} }
sourceFile = foldersInTmpFolder[0]; sourceFile = foldersInTmpFolder[0];
} catch (IOException e) { } catch (IOException e) {
@ -2413,22 +2413,27 @@ public class Base {
} }
} }
// is there a library? // is there a valid library?
File libFolder = scanFatLibrary(sourceFile); File libFolder = sourceFile;
if (libFolder == null) { String libName = libFolder.getName();
editor.statusError("Not a valid library"); if (!Sketch.isSanitaryName(libName)) {
String mess = I18n.format(_("The library \"{0}\" cannot be used.\n"
+ "Library names must contain only basic letters and numbers.\n"
+ "(ASCII only and no spaces, and it cannot start with a number)"),
libName);
editor.statusError(mess);
return; return;
} }
String[] headerFiles = headerListFromIncludePath(libFolder); String[] headerFiles = headerListFromIncludePath(libFolder);
if (headerFiles == null || headerFiles.length == 0) { if (headerFiles == null || headerFiles.length == 0) {
editor.statusError("Not a valid library"); editor.statusError(_("Not a valid library: no header files found"));
return; return;
} }
// copy folder // copy folder
File destinationFolder = new File(getSketchbookLibrariesFolder(), sourceFile.getName()); File destinationFolder = new File(getSketchbookLibrariesFolder(), sourceFile.getName());
if (!destinationFolder.mkdir()) { if (!destinationFolder.mkdir()) {
editor.statusError("A library named " + sourceFile.getName() + " already exists"); editor.statusError(I18n.format(_("A library named {0} already exists"), sourceFile.getName()));
return; return;
} }
try { try {