parent
163a2e0fad
commit
79c16c5fa6
2 changed files with 40 additions and 33 deletions
srcpkgs/arduino
|
@ -1,11 +1,11 @@
|
|||
--- build/build.xml.orig 2016-12-29 08:09:30.185309472 -0700
|
||||
+++ build/build.xml 2016-12-29 08:11:41.992661097 -0700
|
||||
@@ -449,17 +449,6 @@
|
||||
--- build/build.xml.orig 2017-06-26 21:25:28.372389852 +0000
|
||||
+++ build/build.xml 2017-06-26 21:36:00.450346631 +0000
|
||||
@@ -456,17 +456,6 @@
|
||||
</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="archive_url" value="https://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>
|
||||
|
@ -16,9 +16,9 @@
|
|||
-
|
||||
- <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="archive_url" value="https://downloads.arduino.cc/liblistSerials/liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
|
||||
<param name="final_folder" value="${staging_folder}/liblistSerials-${LIBLISTSERIAL-VERSION}" />
|
||||
@@ -491,16 +480,6 @@
|
||||
@@ -484,20 +473,6 @@
|
||||
|
||||
<!-- Unzip AVR tools -->
|
||||
<target name="macosx-build-avr-toolchain" unless="light_bundle">
|
||||
|
@ -28,20 +28,24 @@
|
|||
- <param name="gcc_version" value="${AVRGCC-VERSION}"/>
|
||||
- <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i386-apple-darwin11.tar.bz2"/>
|
||||
- <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
|
||||
- <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-osx.tar.bz2"/>
|
||||
- <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-darwin_amd64.tar.bz2"/>
|
||||
- <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
|
||||
- </antcall>
|
||||
-
|
||||
<chmod perm="+x">
|
||||
<fileset dir="${staging_folder}/work/${staging_hardware_folder}/tools" includes="**/bin/*"/>
|
||||
<fileset dir="${staging_folder}/work/${staging_hardware_folder}/tools" includes="**/libexec/gcc/avr/4.8.1/*"/>
|
||||
@@ -648,15 +627,6 @@
|
||||
- <chmod perm="+x">
|
||||
- <fileset dir="${staging_folder}/work/${staging_hardware_folder}/tools" includes="**/bin/*"/>
|
||||
- <fileset dir="${staging_folder}/work/${staging_hardware_folder}/tools" includes="**/libexec/gcc/avr/4.8.1/*"/>
|
||||
- </chmod>
|
||||
</target>
|
||||
|
||||
<target name="macosx-run" depends="build,start"/>
|
||||
@@ -641,15 +616,6 @@
|
||||
</target>
|
||||
|
||||
<target name="linux-libastyle-x86" depends="linux-build" description="Download libastyle.so for x86/x64 arch">
|
||||
- <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="archive_url" value="https://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>
|
||||
|
@ -51,13 +55,13 @@
|
|||
<antcall target="portable-${portable}">
|
||||
<param name="parentdir" value="linux/work" />
|
||||
</antcall>
|
||||
@@ -673,15 +643,6 @@
|
||||
@@ -666,15 +632,6 @@
|
||||
</target>
|
||||
|
||||
<target name="linux-libastyle-arm" depends="linux-build" description="Download libastyle.so for ARM">
|
||||
- <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="archive_url" value="https://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>
|
||||
|
@ -67,60 +71,63 @@
|
|||
<antcall target="portable-${portable}">
|
||||
<param name="parentdir" value="linux/work" />
|
||||
</antcall>
|
||||
@@ -718,15 +679,6 @@
|
||||
</copy>
|
||||
<delete dir="${staging_folder}/arduino-builder-arm" includeemptydirs="true"/>
|
||||
@@ -696,16 +653,6 @@
|
||||
</antcall>
|
||||
|
||||
<antcall target="build-arduino-builder" />
|
||||
-
|
||||
- <antcall target="avr-toolchain-bundle">
|
||||
- <param name="unpack_target" value="untar"/>
|
||||
- <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-armhf-pc-linux-gnu.tar.bz2"/>
|
||||
- <param name="gcc_version" value="${AVRGCC-VERSION}"/>
|
||||
- <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-armhf-pc-linux-gnu.tar.bz2"/>
|
||||
- <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
|
||||
- <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linuxarm.tar.bz2"/>
|
||||
- <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux_arm.tar.bz2"/>
|
||||
- <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
|
||||
- </antcall>
|
||||
</target>
|
||||
|
||||
<target name="linux32-build" depends="linux-libastyle-x86" description="Build linux (32-bit) version">
|
||||
@@ -750,15 +702,6 @@
|
||||
</copy>
|
||||
<delete dir="${staging_folder}/arduino-builder-linux32" includeemptydirs="true"/>
|
||||
@@ -714,16 +661,6 @@
|
||||
</antcall>
|
||||
|
||||
<antcall target="build-arduino-builder" />
|
||||
-
|
||||
- <antcall target="avr-toolchain-bundle">
|
||||
- <param name="unpack_target" value="untar"/>
|
||||
- <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
|
||||
- <param name="gcc_version" value="${AVRGCC-VERSION}"/>
|
||||
- <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
|
||||
- <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
|
||||
- <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux32.tar.bz2"/>
|
||||
- <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux_386.tar.bz2"/>
|
||||
- <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
|
||||
- </antcall>
|
||||
</target>
|
||||
|
||||
<target name="linux64-build" depends="linux-libastyle-x86" description="Build linux (64-bit) version">
|
||||
@@ -782,15 +725,6 @@
|
||||
</copy>
|
||||
<delete dir="${staging_folder}/arduino-builder-linux64" includeemptydirs="true"/>
|
||||
@@ -732,16 +669,6 @@
|
||||
</antcall>
|
||||
|
||||
<antcall target="build-arduino-builder" />
|
||||
-
|
||||
- <antcall target="avr-toolchain-bundle">
|
||||
- <param name="unpack_target" value="untar"/>
|
||||
- <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
|
||||
- <param name="gcc_version" value="${AVRGCC-VERSION}"/>
|
||||
- <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
|
||||
- <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
|
||||
- <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux64.tar.bz2"/>
|
||||
- <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux_amd64.tar.bz2"/>
|
||||
- <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
|
||||
- </antcall>
|
||||
</target>
|
||||
|
||||
<target name="linux-jvm-noop"/>
|
||||
@@ -987,16 +921,6 @@
|
||||
@@ -982,16 +909,6 @@
|
||||
<antcall target="windows-build-avr-toolchain" />
|
||||
|
||||
<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="archive_url" value="https://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>
|
||||
|
@ -130,9 +137,9 @@
|
|||
-
|
||||
- <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="archive_url" value="https://downloads.arduino.cc/liblistSerials/liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
|
||||
<param name="final_folder" value="${staging_folder}/liblistSerials-${LIBLISTSERIAL-VERSION}" />
|
||||
@@ -1070,15 +994,6 @@
|
||||
@@ -1112,15 +1029,6 @@
|
||||
</target>
|
||||
|
||||
<target name="windows-build-avr-toolchain">
|
||||
|
@ -142,7 +149,7 @@
|
|||
- <param name="gcc_version" value="${AVRGCC-VERSION}"/>
|
||||
- <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-w64-mingw32.zip"/>
|
||||
- <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
|
||||
- <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-windows.zip"/>
|
||||
- <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-windows_386.zip"/>
|
||||
- <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
|
||||
- </antcall>
|
||||
</target>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Template file for 'arduino'
|
||||
pkgname=arduino
|
||||
version=1.8.0
|
||||
version=1.8.3
|
||||
revision=1
|
||||
hostmakedepends="apache-ant unzip ImageMagick openjdk"
|
||||
depends="virtual?java-runtime avr-binutils avr-gcc avr-libc avrdude"
|
||||
|
@ -11,7 +11,7 @@ homepage="http://arduino.cc/"
|
|||
distfiles="
|
||||
https://github.com/arduino/Arduino/archive/${version}.tar.gz
|
||||
${SOURCEFORGE_SITE}/astyle/astyle_2.05.1_linux.tar.gz"
|
||||
checksum="221a81f6bafeb49c5a97e3e87e7be7d47afb038c819a4261459d1bc1cc693817
|
||||
checksum="754476522b2fe49641b23dfc6e9cb5e0130a6df2eff5a8b76008f7e86885e9eb
|
||||
fbdfc6f1966a972d19a215927266c76d4183eee235ed1e2bd7ec551c2a270eac"
|
||||
nostrip=yes
|
||||
wrksrc=Arduino-$version
|
||||
|
|
Loading…
Reference in a new issue