rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-30 19:52:13 +01:00
Code Issues Releases Activity

MacOSX: appbundler is now the upstream one, not our fork

Browse Source
This commit is contained in:
Federico Fissore 2015-03-24 16:44:39 +01:00
parent c25dc61bd6
commit 41d5cad91e
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -34,6 +34,7 @@ build/macosx/appbundler*.jar
build/macosx/appbundler*.zip build/macosx/appbundler*.zip
build/macosx/appbundler build/macosx/appbundler
build/macosx/appbundler-1.0ea-arduino2 build/macosx/appbundler-1.0ea-arduino2
build/macosx/appbundler-1.0ea-upstream1
build/linux/work/ build/linux/work/
build/linux/dist/*.tar.gz build/linux/dist/*.tar.gz
build/linux/dist/*.tar.bz2 build/linux/dist/*.tar.bz2

10
build/build.xml
View File

@ -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"> <target name="macosx-java-latest-build" if="macosx" depends="revision-check, macosx-checkos, subprojects-build" description="Build Mac OS X version">
<antcall target="unzip"> <antcall target="unzip">
<param name="archive_file" value="${staging_folder}/appbundler-1.0ea-arduino2.jar.zip" /> <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-arduino2.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-arduino2" /> <param name="final_folder" value="${staging_folder}/appbundler-1.0ea-upstream1" />
<param name="dest_folder" value="${staging_folder}/appbundler-1.0ea-arduino2" /> <param name="dest_folder" value="${staging_folder}/appbundler-1.0ea-upstream1" />
</antcall> </antcall>
<mkdir dir="${staging_folder}/work" /> <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 <bundleapp
jvmRequired="1.7" jvmRequired="1.7"

1
build/macosx/appbundler-1.0ea-arduino2.jar.zip.sha
View File

@ -1 +0,0 @@
929bc65f3ba6ecb868254a6328f8502ad86fe4e5

1
build/macosx/appbundler-1.0ea-upstream1.jar.zip.sha Normal file
View File

@ -0,0 +1 @@
5bb6377a65edf7af7b5b3820711bab0e377bdee1

1
build/shared/revisions.txt
View File

@ -6,6 +6,7 @@ ARDUINO 1.6.2
* Windows and MacOSX JVM Xmx halved to 512M * 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 * 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 * 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] [libraries]
* EEPROM: Replaced existing library with more complete implementation @Chris--A * EEPROM: Replaced existing library with more complete implementation @Chris--A