Added latest arduino (1.6.9)

2016-07-04 22:55:05 +02:00
parent 60dfb28a5f
commit 6daa628c7d
42 changed files with 990 additions and 0 deletions
@@ -0,0 +1,61 @@
+diff -ur Arduino-1.6.9.orig/build/build.xml Arduino-1.6.9/build/build.xml
+--- Arduino-1.6.9.orig/build/build.xml	2016-05-10 10:36:07.000000000 +0200
+++ Arduino-1.6.9/build/build.xml	2016-07-04 22:46:28.719469457 +0200
+@@ -437,26 +437,6 @@
+       <param name="target.path" value="${staging_folder}/work/${staging_hardware_folder}/.." />
+     </antcall>
+ 
+-    <antcall target="unzip">
+-      <param name="archive_file" value="./libastylej-2.05.1-3.zip" />
+-      <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
+-      <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
+-      <param name="dest_folder" value="${staging_folder}" />
+-    </antcall>
+-    <copy file="macosx/libastylej-2.05.1/libastylej.jnilib" todir="macosx/work/${staging_hardware_folder}/../lib/" />
+-    <chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/libastylej.jnilib" />
+-    <copy file="macosx/libastylej-2.05.1/libastylej.jnilib" tofile="macosx/work/${staging_hardware_folder}/../lib/libastylej.dylib" />
+-    <chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/libastylej.dylib" />
+-
+-    <antcall target="unzip">
+-      <param name="archive_file" value="./liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
+-      <param name="archive_url" value="http://downloads.arduino.cc/liblistSerials/liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
+-      <param name="final_folder" value="${staging_folder}/liblistSerials-${LIBLISTSERIAL-VERSION}" />
+-      <param name="dest_folder" value="${staging_folder}" />
+-    </antcall>
+-    <copy file="macosx/liblistSerials-${LIBLISTSERIAL-VERSION}/osx/liblistSerialsj.dylib" todir="macosx/work/${staging_hardware_folder}/../lib/" />
+-    <chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/liblistSerialsj.dylib" />
+-
+     <delete dir="${staging_folder}/arduino-builder-macosx" includeemptydirs="true"/>
+     <mkdir dir="${staging_folder}/arduino-builder-macosx"/>
+     <antcall target="untar">
+@@ -726,30 +706,6 @@
+       <param name="JVM" value="${LINUX32_BUNDLED_JVM}"/>
+     </antcall>
+ 
+-    <delete dir="${staging_folder}/arduino-builder-linux32" includeemptydirs="true"/>
+-    <mkdir dir="${staging_folder}/arduino-builder-linux32"/>
+-    <antcall target="untar">
+-      <param name="archive_file" value="./arduino-builder-linux32-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
+-      <param name="archive_url" value="http://downloads.arduino.cc/tools/arduino-builder-linux32-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
+-      <param name="final_folder" value="${staging_folder}/arduino-builder-linux32/arduino-builder" />
+-      <param name="dest_folder" value="${staging_folder}/arduino-builder-linux32" />
+-    </antcall>
+-    <copy file="${staging_folder}/arduino-builder-linux32/arduino-builder" tofile="linux/work/arduino-builder" />
+-    <chmod perm="755" file="linux/work/arduino-builder" />
+-    <move file="${staging_folder}/arduino-builder-linux32/tools" tofile="linux/work/tools-builder"/>
+-    <copy todir="linux/work/hardware" overwrite="true">
+-      <fileset dir="${staging_folder}/arduino-builder-linux32/hardware" includes="*.txt"/>
+-    </copy>
+-    <delete dir="${staging_folder}/arduino-builder-linux32" includeemptydirs="true"/>
+-
+-    <antcall target="avr-toolchain-bundle">
+-      <param name="unpack_target" value="untar"/>
+-      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-i686-pc-linux-gnu.tar.bz2"/>
+-      <param name="gcc_version" value="4.8.1-arduino5"/>
+-      <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2"/>
+-      <param name="avrdude_version" value="6.0.1-arduino5"/>
+-    </antcall>
+-
+     <antcall target="package-library-index-json-bundle"/>
+   </target>
+ 
@@ -0,0 +1,29 @@
+--- build/build.xml.orig2	2016-03-18 01:03:33.298185636 -0400
+++ build/build.xml	2016-03-18 01:03:35.047162990 -0400
+@@ -166,26 +166,6 @@
+ 
+     <mkdir dir="${target.path}/reference"/>
+ 
+-    <!-- Unzip documentation -->
+-    <antcall target="unzip">
+-      <param name="archive_file" value="shared/reference-1.6.6-3.zip" />
+-      <param name="archive_url" value="http://downloads.arduino.cc/reference-1.6.6-3.zip" />
+-      <param name="final_folder" value="${target.path}/reference/www.arduino.cc" />
+-      <param name="dest_folder" value="${target.path}/reference/" />
+-    </antcall>
+-    <antcall target="unzip">
+-      <param name="archive_file" value="shared/Galileo_help_files-1.6.2.zip" />
+-      <param name="archive_url" value="http://downloads.arduino.cc/Galileo_help_files-1.6.2.zip" />
+-      <param name="final_folder" value="${target.path}/reference/Galileo_help_files" />
+-      <param name="dest_folder" value="${target.path}/reference/" />
+-    </antcall>
+-    <antcall target="unzip">
+-      <param name="archive_file" value="shared/Edison_help_files-1.6.2.zip" />
+-      <param name="archive_url" value="http://downloads.arduino.cc/Edison_help_files-1.6.2.zip" />
+-      <param name="final_folder" value="${target.path}/reference/Edison_help_files" />
+-      <param name="dest_folder" value="${target.path}/reference/" />
+-    </antcall>
+-
+     <!-- Write the revision file! -->
+     <echo file="${target.path}/lib/version.txt" message="${version}" />
+ 
@@ -0,0 +1,85 @@
+--- a/app/src/processing/app/Base.java	2016-03-13 22:15:01.741451380 -0400
+++ b/app/src/processing/app/Base.java	2016-03-14 19:18:48.020801765 -0400
+@@ -747,6 +747,8 @@
+     } catch (IOException e) {
+       if (activeEditor != null) {
+         activeEditor.statusError(e);
+      } else {
+        e.printStackTrace();
+       }
+     }
+   }
+--- a/arduino-core/src/processing/app/Platform.java	2016-03-17 00:29:33.841099694 -0400
+++ b/arduino-core/src/processing/app/Platform.java	2016-03-17 00:29:56.909802119 -0400
+@@ -145,7 +145,7 @@
+   }
+ 
+   static {
+-    loadLib(new File(BaseNoGui.getContentFile("lib"), System.mapLibraryName("listSerialsj")));
+    System.loadLibrary("listSerialsj");
+   };
+ 
+   private static void loadLib(File lib) {
+--- a/app/src/cc/arduino/packages/formatter/AStyleInterface.java	2016-03-17 23:58:11.616069086 -0400
+++ b/app/src/cc/arduino/packages/formatter/AStyleInterface.java	2016-03-17 23:58:27.564864023 -0400
+@@ -41,7 +41,7 @@
+       loadLib(Base.getContentFile(System.mapLibraryName("msvcp100")));
+       loadLib(Base.getContentFile(System.mapLibraryName("msvcr100")));
+     }
+-    loadLib(new File(Base.getContentFile("lib"), System.mapLibraryName("astylej")));
+    System.loadLibrary("astylej");
+   }
+ 
+   private static void loadLib(File lib) {
+--- a/app/src/processing/app/Base.java	2016-03-18 00:30:57.537608387 -0400
+++ b/app/src/processing/app/Base.java	2016-03-18 00:31:15.267371958 -0400
+@@ -47,7 +47,6 @@
+ import processing.app.helpers.filefilters.OnlyFilesWithExtension;
+ import processing.app.javax.swing.filechooser.FileNameExtensionFilter;
+ import processing.app.legacy.PApplet;
+-import processing.app.macosx.ThinkDifferent;
+ import processing.app.packages.LibraryList;
+ import processing.app.packages.UserLibrary;
+ import processing.app.syntax.PdeKeywords;
+@@ -129,10 +128,6 @@
+ 
+     splashScreenHelper.splashText(tr("Loading configuration..."));
+ 
+-    if (OSUtils.isMacOS()) {
+-      ThinkDifferent.init();
+-    }
+-
+     try {
+       guardedMain(args);
+     } catch (Throwable e) {
+--- a/arduino-core/src/processing/app/linux/Platform.java	2016-03-18 00:34:37.179690507 -0400
+++ b/arduino-core/src/processing/app/linux/Platform.java	2016-03-18 00:34:38.536672987 -0400
+@@ -37,7 +37,6 @@
+   // TODO Need to be smarter here since KDE people ain't gonna like that GTK.
+   //      It may even throw a weird exception at 'em for their trouble.
+   public void setLookAndFeel() throws Exception {
+-    GTKLookAndFeelFixer.installGtkPopupBugWorkaround();
+   }
+ 
+ 
+--- a/arduino-core/src/processing/app/BaseNoGui.java	2016-03-26 19:12:50.769791536 -0400
+++ b/arduino-core/src/processing/app/BaseNoGui.java	2016-03-26 19:17:57.352927746 -0400
+@@ -161,8 +161,17 @@
+     return prefs;
+   }
+ 
+  static public boolean isAppDir(String name) {
+    String dirs[] = name.split("//*", 3);
+    if (dirs.length == 0) {
+       return false;
+    }
+    int index = dirs.length >= 2 && dirs[0].equals("") ? 1 : 0;
+    return dirs[index].equals("lib") || dirs[index].equals("dist");
+  }
+
+   static public File getContentFile(String name) {
+-    String appDir = System.getProperty("APP_DIR");
+    String appDir = System.getProperty(isAppDir(name) ? "APP_DIR" : "CORE_DIR");
+     if (appDir == null || appDir.length() == 0) {
+       appDir = currentDirectory;
+     }
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Name=arduino-ide
+Comment=Open-source electronics prototyping platform
+Exec=arduino-ide
+Icon=arduino-ide
+Terminal=false
+Type=Application
+Categories=Development;
+StartupNotify=false