62 lines
3.7 KiB
Diff
62 lines
3.7 KiB
Diff
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>
|
|
|