From 41d5cad91eb40d2609a34fb83d38034ff8d15519 Mon Sep 17 00:00:00 2001
From: Federico Fissore <f.fissore@arduino.cc>
Date: Tue, 24 Mar 2015 16:44:39 +0100
Subject: [PATCH] MacOSX: appbundler is now the upstream one, not our fork

---
 .gitignore                                          |  1 +
 build/build.xml                                     | 10 +++++-----
 build/macosx/appbundler-1.0ea-arduino2.jar.zip.sha  |  1 -
 build/macosx/appbundler-1.0ea-upstream1.jar.zip.sha |  1 +
 build/shared/revisions.txt                          |  1 +
 5 files changed, 8 insertions(+), 6 deletions(-)
 delete mode 100644 build/macosx/appbundler-1.0ea-arduino2.jar.zip.sha
 create mode 100644 build/macosx/appbundler-1.0ea-upstream1.jar.zip.sha

diff --git a/.gitignore b/.gitignore
index e10e495c5e..8df7ccb2e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,7 @@ build/macosx/appbundler*.jar
 build/macosx/appbundler*.zip
 build/macosx/appbundler
 build/macosx/appbundler-1.0ea-arduino2
+build/macosx/appbundler-1.0ea-upstream1
 build/linux/work/
 build/linux/dist/*.tar.gz
 build/linux/dist/*.tar.bz2
diff --git a/build/build.xml b/build/build.xml
index cf2afc88b3..8ca0e10193 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -248,15 +248,15 @@
 
   <target name="macosx-java-latest-build" if="macosx" depends="revision-check, macosx-checkos, subprojects-build" description="Build Mac OS X version">
     <antcall target="unzip">
-      <param name="archive_file" value="${staging_folder}/appbundler-1.0ea-arduino2.jar.zip" />
-      <param name="archive_url" value="http://arduino.cc/download.php?f=/appbundler-1.0ea-arduino2.jar.zip" />
-      <param name="final_folder" value="${staging_folder}/appbundler-1.0ea-arduino2" />
-      <param name="dest_folder" value="${staging_folder}/appbundler-1.0ea-arduino2" />
+      <param name="archive_file" value="${staging_folder}/appbundler-1.0ea-upstream1.jar.zip" />
+      <param name="archive_url" value="http://arduino.cc/download.php?f=/appbundler-1.0ea-upstream1.jar.zip" />
+      <param name="final_folder" value="${staging_folder}/appbundler-1.0ea-upstream1" />
+      <param name="dest_folder" value="${staging_folder}/appbundler-1.0ea-upstream1" />
     </antcall>
 
     <mkdir dir="${staging_folder}/work" />
 
-    <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="${staging_folder}/appbundler-1.0ea-arduino2/appbundler-1.0ea-arduino2.jar"/>
+    <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="${staging_folder}/appbundler-1.0ea-upstream1/appbundler-1.0ea-upstream1.jar"/>
 
     <bundleapp
             jvmRequired="1.7"
diff --git a/build/macosx/appbundler-1.0ea-arduino2.jar.zip.sha b/build/macosx/appbundler-1.0ea-arduino2.jar.zip.sha
deleted file mode 100644
index bcf3f61e6a..0000000000
--- a/build/macosx/appbundler-1.0ea-arduino2.jar.zip.sha
+++ /dev/null
@@ -1 +0,0 @@
-929bc65f3ba6ecb868254a6328f8502ad86fe4e5
diff --git a/build/macosx/appbundler-1.0ea-upstream1.jar.zip.sha b/build/macosx/appbundler-1.0ea-upstream1.jar.zip.sha
new file mode 100644
index 0000000000..b8179c64cf
--- /dev/null
+++ b/build/macosx/appbundler-1.0ea-upstream1.jar.zip.sha
@@ -0,0 +1 @@
+5bb6377a65edf7af7b5b3820711bab0e377bdee1
diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt
index 68afb1f22b..03d9fe8c74 100644
--- a/build/shared/revisions.txt
+++ b/build/shared/revisions.txt
@@ -6,6 +6,7 @@ ARDUINO 1.6.2
 * Windows and MacOSX JVM Xmx halved to 512M
 * Introduced starting splashscreen with progress status: will be used for notifying user of long running startup tasks
 * Available ports list is now generated in background: hence "tools" menu is much faster
+* MacOSX: appbundler merged our contribution, switching to upstream version https://bitbucket.org/infinitekind/appbundler/
 
 [libraries]
 * EEPROM: Replaced existing library with more complete implementation @Chris--A