Merge branch 'ide-1.5.x' into ide-1.5.x-jssc

Author: Federico Fissore

app/src/processing/app/Base.java

@@ -61,9 +61,9 @@
  * files and images, etc) that comes from that.
  */
 public class Base {
-  public static final int REVISION = 154;
+  public static final int REVISION = 155;
   /** This might be replaced by main() if there's a lib/version.txt file. */
-  static String VERSION_NAME = "0154";
+  static String VERSION_NAME = "0155";
   /** Set true if this a proper release rather than a numbered revision. */
   static public boolean RELEASE = false;
 

app/src/processing/app/packages/Library.java

@@ -1,7 +1,6 @@
 package processing.app.packages;
 
-import processing.app.helpers.FileUtils;
-import processing.app.helpers.PreferencesMap;
+import static processing.app.helpers.StringUtils.wildcardMatch;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,7 +9,8 @@
 import java.util.Comparator;
 import java.util.List;
 
-import static processing.app.helpers.StringUtils.wildcardMatch;
+import processing.app.helpers.FileUtils;
+import processing.app.helpers.PreferencesMap;
 
 public class Library {
 
@@ -31,17 +31,12 @@ public class Library {
       .asList(new String[] { "architectures", "author", "core-dependencies",
           "dependencies", "email", "name", "paragraph", "sentence", "url",
           "version" });
-  private static final List<String> OPTIONAL_FOLDERS = Arrays
-      .asList(new String[] { "arch", "examples", "extras", "src" });
-  private static final List<String> OPTIONAL_FILES = Arrays
-      .asList(new String[] { "keywords.txt", "library.properties" });
-
 
   /**
    * Scans inside a folder and create a Library object out of it. Automatically
    * detects pre-1.5 libraries. Automatically fills metadata from
    * library.properties file if found.
-   *
+   * 
    * @param libFolder
    * @return
    */
@@ -74,18 +69,14 @@ private static Library createLibrary(File libFolder) throws IOException {
     if (!srcFolder.exists() || !srcFolder.isDirectory())
       throw new IOException("Missing 'src' folder");
 
-    // 3. check if root folder contains prohibited stuff
+    // 3. Warn if root folder contains development leftovers
     for (File file : libFolder.listFiles()) {
       if (file.isDirectory()) {
         if (FileUtils.isSCCSOrHiddenFile(file)) {
-          System.out.println("WARNING: Ignoring spurious " + file.getName() + " folder in '" + properties.get("name") + "' library");
+          System.out.println("WARNING: Spurious " + file.getName() +
+              " folder in '" + properties.get("name") + "' library");
           continue;
         }
-        if (!OPTIONAL_FOLDERS.contains(file.getName()))
-          throw new IOException("Invalid folder '" + file.getName() + "'.");
-      } else {
-        if (!OPTIONAL_FILES.contains(file.getName()))
-          throw new IOException("Invalid file '" + file.getName() + "'.");
       }
     }
 

build/build.xml

@@ -664,7 +664,8 @@
     </copy>
 
     <!-- Unzip AVR tools -->
-    <unzip dest="windows/work/hardware" src="windows/avr_tools.zip" overwrite="false"/>
+    <get src="http://downloads.arduino.cc/WinAVR-20081205-arduino-2.zip" dest="windows" usetimestamp="true" skipexisting="true" verbose="true" />
+    <unzip dest="windows/work/hardware" src="windows/WinAVR-20081205-arduino-2.zip" overwrite="false"/>
 
     <copy todir="windows/work/hardware/tools/avr/avr/include/avr">
       <fileset file="windows/eeprom.h" />

build/shared/revisions.txt

@@ -1,6 +1,10 @@
 
 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]
 * Added missing keywords: YunServer, YunClient, pow
 * 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
 * Improved files open/save dialogs
 * Added line numbers, can be enabled/disabled from preferences (Cayci Gorlitsky)
+* Removed check on forbidden file in 1.5 formatted libraries (#1692)
 
 [libraries]
 * avr: Fixed buffer overflow in File::doBuffer() (dreggy)