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

Reintroduced warning on development leftovers in 1.5 libraries.

Browse Source 
See #1692
This commit is contained in:
Cristian Maglie
2013-11-20 12:12:05 +01:00
parent a4a660154e
commit 3bec9121cd
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/processing/app/packages/Library.java
View File

@ -1,7 +1,6 @@
package processing.app.packages; package processing.app.packages;
import processing.app.helpers.FileUtils; import static processing.app.helpers.StringUtils.wildcardMatch;
import processing.app.helpers.PreferencesMap;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@ -10,7 +9,8 @@ import java.util.Arrays;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import static processing.app.helpers.StringUtils.wildcardMatch; import processing.app.helpers.FileUtils;
import processing.app.helpers.PreferencesMap;
public class Library { public class Library {
@ -36,7 +36,7 @@ public class Library {
* Scans inside a folder and create a Library object out of it. Automatically * Scans inside a folder and create a Library object out of it. Automatically
* detects pre-1.5 libraries. Automatically fills metadata from * detects pre-1.5 libraries. Automatically fills metadata from
* library.properties file if found. * library.properties file if found.
* *
* @param libFolder * @param libFolder
* @return * @return
*/ */
@ -69,6 +69,17 @@ public class Library {
if (!srcFolder.exists() || !srcFolder.isDirectory()) if (!srcFolder.exists() || !srcFolder.isDirectory())
throw new IOException("Missing 'src' folder"); throw new IOException("Missing 'src' folder");
// 3. Warn if root folder contains development leftovers
for (File file : libFolder.listFiles()) {
if (file.isDirectory()) {
if (FileUtils.isSCCSOrHiddenFile(file)) {
System.out.println("WARNING: Spurious " + file.getName() +
" folder in '" + properties.get("name") + "' library");
continue;
}
}
}
// Extract metadata info // Extract metadata info
List<String> archs = new ArrayList<String>(); List<String> archs = new ArrayList<String>();
for (String arch : properties.get("architectures").split(",")) for (String arch : properties.get("architectures").split(","))

5
build/shared/revisions.txt
View File

@ -1,6 +1,10 @@
ARDUINO 1.5.5 BETA ARDUINO 1.5.5 BETA
NOTICE:
The 1.5 library format is under heavy review on the Arduino Developers mailing list.
We suggest to delay the adoption of the new format until a stable 1.5.x is released.
[ide] [ide]
* Added missing keywords: YunServer, YunClient, pow * Added missing keywords: YunServer, YunClient, pow
* Improved folder ignore: now hidden, starting with a dot, and SCCS folders are ignored * Improved folder ignore: now hidden, starting with a dot, and SCCS folders are ignored
@ -11,6 +15,7 @@ ARDUINO 1.5.5 BETA
* (windows) Upgraded embedded Java runtime to version 7: much faster startup * (windows) Upgraded embedded Java runtime to version 7: much faster startup
* Improved files open/save dialogs * Improved files open/save dialogs
* Added line numbers, can be enabled/disabled from preferences (Cayci Gorlitsky) * Added line numbers, can be enabled/disabled from preferences (Cayci Gorlitsky)
* Removed check on forbidden file in 1.5 formatted libraries (#1692)
[libraries] [libraries]
* avr: Fixed buffer overflow in File::doBuffer() (dreggy) * avr: Fixed buffer overflow in File::doBuffer() (dreggy)