[arch-commits] Commit in arduino/repos (10 files)
NicoHood
nicohood at archlinux.org
Sat Jan 7 13:59:49 UTC 2017
Date: Saturday, January 7, 2017 @ 13:59:49
Author: nicohood
Revision: 206027
archrelease: copy trunk to community-testing-i686, community-testing-x86_64
Added:
arduino/repos/community-testing-i686/
arduino/repos/community-testing-i686/PKGBUILD
(from rev 206026, arduino/trunk/PKGBUILD)
arduino/repos/community-testing-i686/arduino.install
(from rev 206026, arduino/trunk/arduino.install)
arduino/repos/community-testing-i686/arduino.sh
(from rev 206026, arduino/trunk/arduino.sh)
arduino/repos/community-testing-i686/build.patch
(from rev 206026, arduino/trunk/build.patch)
arduino/repos/community-testing-x86_64/
arduino/repos/community-testing-x86_64/PKGBUILD
(from rev 206026, arduino/trunk/PKGBUILD)
arduino/repos/community-testing-x86_64/arduino.install
(from rev 206026, arduino/trunk/arduino.install)
arduino/repos/community-testing-x86_64/arduino.sh
(from rev 206026, arduino/trunk/arduino.sh)
arduino/repos/community-testing-x86_64/build.patch
(from rev 206026, arduino/trunk/build.patch)
------------------------------------------+
community-testing-i686/PKGBUILD | 102 ++++++++++++
community-testing-i686/arduino.install | 31 +++
community-testing-i686/arduino.sh | 3
community-testing-i686/build.patch | 239 +++++++++++++++++++++++++++++
community-testing-x86_64/PKGBUILD | 102 ++++++++++++
community-testing-x86_64/arduino.install | 31 +++
community-testing-x86_64/arduino.sh | 3
community-testing-x86_64/build.patch | 239 +++++++++++++++++++++++++++++
8 files changed, 750 insertions(+)
Copied: arduino/repos/community-testing-i686/PKGBUILD (from rev 206026, arduino/trunk/PKGBUILD)
===================================================================
--- community-testing-i686/PKGBUILD (rev 0)
+++ community-testing-i686/PKGBUILD 2017-01-07 13:59:49 UTC (rev 206027)
@@ -0,0 +1,102 @@
+# Maintainer: NicoHood <archlinux {cat} nicohood {dog} de>
+# PGP ID: 97312D5EB9D7AE7D0BD4307351DAE9B7C1AE9161
+# Contributor: Tomas Schertel <tschertel at gmail dot com>
+# Contributor: Christopher Loen <christopherloen at gmail dot com>
+# Contributor: Peter Reschenhofer <peter.reschenhofer at gmail.com>
+# Contributor: Niels Martignène <niels.martignene at gmail.com>
+# Contributor: PyroPeter <googlemail.com at abi1789>
+# Contributor: darkapex <me at jailuthra.in>
+# Contributor: tty0 <vt.tty0[d0t]gmail.com>
+
+pkgname=arduino
+pkgver=1.8.0
+pkgrel=3
+epoch=1
+pkgdesc="Arduino prototyping platform SDK"
+arch=('i686' 'x86_64')
+url="https://github.com/arduino/Arduino"
+license=('GPL' 'LGPL')
+depends=('gtk2' 'desktop-file-utils' 'shared-mime-info' 'java-runtime=8' 'arduino-builder')
+makedepends=('java-environment=8' 'apache-ant' 'unzip')
+optdepends=('arduino-docs: Offline documentation for arduino'
+ 'arduino-avr-core: AVR core with upstream avr-gcc and avrdude'
+ 'python2: Intel Galileo Board installation')
+options=(!strip)
+install="arduino.install"
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/arduino/Arduino/archive/${pkgver}.tar.gz"
+ "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.8.3/WiFi101-Updater-ArduinoIDE-Plugin-0.8.3.zip"
+ "https://downloads.arduino.cc/libastylej-2.05.1-3.zip"
+ "https://downloads.arduino.cc/liblistSerials/liblistSerials-1.4.0.zip"
+ "arduino.sh"
+ "build.patch")
+sha512sums=('25edea8cb188155ead2e2e9364067e445cf9d160d2fb7caea3c25adeb2e5e13072de8e7b1a45dfbd40c3346356decfad9de1d2e67838c532bd5ef8550678033d'
+ 'fb2c5f77ea047c060e67705886d106379ac4a297f3a7d1f7d6d0b2410c4592f09cece4578aeeaed867c03a2efe5fe8d124ccc36c4189ee5c875cd16473a6faab'
+ '7f82d64e34ef2d85a6b037caeecfa338b72f8edfc57a9903af3ab89b1d42cf7dfd9a6170abe8131ae3e6506850d82ed5092c3b08983a16d9c80319cd24c14555'
+ 'd78270ee9007fc8427b7f962aced6c14fd4772deca1bbf4ad47c3c74d9addb74e67184e80516af4613cf8d7270bc50d4019437d9ad84274d6fc26b68c4a00db1'
+ 'd97e73a6764232c5fbcdbd46d98f1dfde1d95d8256f578fb05480694423842ec864c49d572a325c7d00b026619d84dc114f1e3e0d2f8219b94871dce1718f05a'
+ '9963e964fe2206ce11a2981d3655ff73aa79e8a9dcbc5b03ee4fa84fd036b0d4b28af6ddd6c8bd0cdf8564c42209b738838141da9b185eeb47067ddb78afd9b7')
+
+prepare()
+{
+ # Patch arduino build process.
+ # See PR: https://github.com/arduino/Arduino/pull/5438
+ cd "${srcdir}/Arduino-${pkgver}"
+ patch -Np1 -i "${srcdir}/build.patch"
+}
+
+build() {
+ cd "Arduino-${pkgver}/build"
+
+ # Compile with java8
+ export PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:$PATH
+
+ # Do not include their avr-core + tools and no docs. We build them seperately
+ ant clean dist -Dversion=${pkgver} build -Dlight_bundle=true \
+ -Dno_docs=true \
+ -Dlocal_sources=true \
+ -Dno_arduino_builder=true
+}
+
+package() {
+ cd "Arduino-${pkgver}/build/linux/work"
+
+ # Create directories
+ install -dm755 "${pkgdir}/usr/share/"{doc,icons/hicolor,applications,mime/packages}
+
+ # Copy the whole SDK
+ cp -a . "${pkgdir}/usr/share/arduino"
+
+ # Create wrapper for java8 + buider and documentation symlink
+ install -Dm755 "${srcdir}/arduino.sh" "${pkgdir}/usr/bin/arduino"
+
+ # Link arduino-builder, libastylej, libserialport and docs
+ # TODO astyle libserialport do not work yet
+ # TODO remove unzip dependency once all deps are resolved
+ # https://github.com/arduino/ctags/issues/12
+ # https://github.com/arduino/Arduino/issues/5538
+ # https://github.com/arduino/listSerialPortsC/issues/9
+
+ # Arduino-builder
+ # https://bugs.archlinux.org/task/52377
+ ln -s /usr/bin/arduino-builder "${pkgdir}/usr/share/arduino/arduino-builder"
+ install -dm755 "${pkgdir}/usr/share/arduino/tools-builder"
+
+ #rm "${pkgdir}/usr/share/arduino/lib/libastylej.so"
+ #ln -s /usr/lib/libastyle-2.05.1.so "${pkgdir}/usr/share/arduino/lib/libastylej.so"
+ #rm "${pkgdir}/usr/share/arduino/lib/liblistSerialsj.so"
+ #ln -s /usr/lib/libserialport.so "${pkgdir}/usr/share/arduino/lib/liblistSerialsj.so"
+ rm -r "${pkgdir}/usr/share/arduino/reference"
+ ln -s /usr/share/doc/arduino "${pkgdir}/usr/share/arduino/reference"
+
+ # Install desktop icons (keep a symlink for the arduino binary)
+ cp -a lib/icons/* "${pkgdir}/usr/share/icons/hicolor"
+ rm -rf "${pkgdir}/usr/share/arduino/lib/icons"
+ ln -s /usr/share/icons/hicolor "${pkgdir}/usr/share/arduino/lib/icons"
+
+ # Create desktop file using existing template
+ sed "s,<BINARY_LOCATION>,arduino %U,g;s,<ICON_NAME>,arduino,g" "lib/desktop.template" \
+ > "${pkgdir}/usr/share/applications/arduino.desktop"
+
+ # Install Arduino mime type
+ ln -s /usr/share/arduino/lib/arduino-arduinoide.xml "${pkgdir}/usr/share/mime/packages/arduino.xml"
+}
Copied: arduino/repos/community-testing-i686/arduino.install (from rev 206026, arduino/trunk/arduino.install)
===================================================================
--- community-testing-i686/arduino.install (rev 0)
+++ community-testing-i686/arduino.install 2017-01-07 13:59:49 UTC (rev 206027)
@@ -0,0 +1,31 @@
+post_install() {
+ echo "Add yourself to the uucp group to access the serial ports:"
+ echo "sudo usermod -a -G uucp <user>"
+ echo "Please checkout the wiki for further information."
+}
+
+pre_upgrade() {
+ if [[ $(vercmp 1:1.6.12-1 "$2") -eq 1 ]]; then
+ echo "If arduino fails to install try to manually remove it first:"
+ echo "sudo pacman -Rs arduino"
+ fi
+}
+
+_1:1.6.12_1_changes() {
+ echo ":: arduino is now split into arduino-builder, arduino-avr-core and arduino-docs"
+ echo " If arduino fails to run, check for a zombie folder:"
+ echo " ls -la /usr/share/arduino/hardware/avr"
+ echo " It might be left from a very old upgrade. Please remove it."
+}
+
+post_upgrade() {
+ local v upgrades=(
+ 1:1.6.12-1
+ )
+
+ for v in "${upgrades[@]}"; do
+ if [[ $(vercmp "$v" "$2") -eq 1 ]]; then
+ "_${v//-/_}_changes"
+ fi
+ done
+}
Copied: arduino/repos/community-testing-i686/arduino.sh (from rev 206026, arduino/trunk/arduino.sh)
===================================================================
--- community-testing-i686/arduino.sh (rev 0)
+++ community-testing-i686/arduino.sh 2017-01-07 13:59:49 UTC (rev 206027)
@@ -0,0 +1,3 @@
+#!/bin/sh
+export PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:"$PATH"
+exec /usr/share/arduino/arduino "$@"
Copied: arduino/repos/community-testing-i686/build.patch (from rev 206026, arduino/trunk/build.patch)
===================================================================
--- community-testing-i686/build.patch (rev 0)
+++ community-testing-i686/build.patch 2017-01-07 13:59:49 UTC (rev 206027)
@@ -0,0 +1,239 @@
+diff -aur Arduino-1.8.0/build/build.xml Arduino-1.8.0_new/build/build.xml
+--- Arduino-1.8.0/build/build.xml 2016-12-21 16:12:44.000000000 +0100
++++ Arduino-1.8.0_new/build/build.xml 2016-12-23 23:20:06.520217000 +0100
+@@ -178,29 +178,7 @@
+
+ <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>
+-
+- <!-- Fix wrong permissions from zip file root folder -->
+- <chmod perm="755" dir="${target.path}/reference/Galileo_help_files" />
+- <chmod perm="755" dir="${target.path}/reference/Edison_help_files" />
++ <antcall target="assemble-docs" />
+
+ <!-- Write the revision file! -->
+ <echo file="${target.path}/lib/version.txt" message="${version}" />
+@@ -216,8 +194,35 @@
+ </antcall>
+ </target>
+
++ <target name="assemble-docs" unless="no_docs">
++ <!-- 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>
++
++ <!-- Fix wrong permissions from zip file root folder -->
++ <chmod perm="755" dir="${target.path}/reference/Galileo_help_files" />
++ <chmod perm="755" dir="${target.path}/reference/Edison_help_files" />
++ </target>
++
+ <!-- copy library folder -->
+- <target name="assemble-libraries" unless="light_bundle">
++ <target name="assemble-libraries" depends="assemble-libraries-full, assemble-libraries-light" />
++ <target name="assemble-libraries-full" unless="light_bundle">
+ <copy todir="${target.path}/libraries">
+ <fileset dir="../libraries"/>
+ </copy>
+@@ -235,6 +240,9 @@
+ <download-library name="SD" version="1.1.0"/>
+ <download-library githubuser="Adafruit" name="Adafruit_CircuitPlayground" version="1.6.4"/>
+ </target>
++ <target name="assemble-libraries-light" if="light_bundle">
++ <mkdir dir="${target.path}/libraries" />
++ </target>
+
+ <macrodef name="download-library">
+ <attribute name="name"/>
+@@ -253,13 +261,17 @@
+ </macrodef>
+
+ <!-- copy hardware folder -->
+- <target name="assemble-hardware" unless="light_bundle">
++ <target name="assemble-hardware" depends="assemble-hardware-full, assemble-hardware-light" />
++ <target name="assemble-hardware-full" unless="light_bundle">
+ <copy todir="${target.path}/hardware">
+ <fileset dir="../hardware">
+ <exclude name="arduino/sam/**"/>
+ </fileset>
+ </copy>
+ </target>
++ <target name="assemble-hardware-light" if="light_bundle">
++ <copy file="../hardware/package_index_bundled.json" todir="${target.path}/hardware" />
++ </target>
+
+ <!-- - - - - - - - - -->
+ <!-- Revision check -->
+@@ -468,21 +480,7 @@
+ <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">
+- <param name="archive_file" value="./arduino-builder-macosx-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
+- <param name="archive_url" value="http://downloads.arduino.cc/tools/arduino-builder-macosx-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
+- <param name="final_folder" value="${staging_folder}/arduino-builder-macosx/arduino-builder" />
+- <param name="dest_folder" value="${staging_folder}/arduino-builder-macosx" />
+- </antcall>
+- <copy file="${staging_folder}/arduino-builder-macosx/arduino-builder" tofile="macosx/work/${staging_hardware_folder}/../arduino-builder" />
+- <chmod perm="755" file="macosx/work/${staging_hardware_folder}/../arduino-builder" />
+- <move file="${staging_folder}/arduino-builder-macosx/tools" tofile="macosx/work/${staging_hardware_folder}/../tools-builder"/>
+- <copy todir="macosx/work/${staging_hardware_folder}" overwrite="true">
+- <fileset dir="${staging_folder}/arduino-builder-macosx/hardware" includes="*.txt"/>
+- </copy>
+- <delete dir="${staging_folder}/arduino-builder-macosx" includeemptydirs="true"/>
++ <antcall target="build-arduino-builder" />
+
+ <antcall target="portable-${portable}">
+ <param name="parentdir" value="macosx/work/${staging_hardware_folder}/.." />
+@@ -702,21 +700,7 @@
+ <param name="JVM" value="${LINUXARM_BUNDLED_JVM}"/>
+ </antcall>
+
+- <delete dir="${staging_folder}/arduino-builder-arm" includeemptydirs="true"/>
+- <mkdir dir="${staging_folder}/arduino-builder-arm"/>
+- <antcall target="untar">
+- <param name="archive_file" value="./arduino-builder-arm-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
+- <param name="archive_url" value="http://downloads.arduino.cc/tools/arduino-builder-arm-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
+- <param name="final_folder" value="${staging_folder}/arduino-builder-arm/arduino-builder" />
+- <param name="dest_folder" value="${staging_folder}/arduino-builder-arm" />
+- </antcall>
+- <copy file="${staging_folder}/arduino-builder-arm/arduino-builder" tofile="linux/work/arduino-builder" />
+- <chmod perm="755" file="linux/work/arduino-builder" />
+- <move file="${staging_folder}/arduino-builder-arm/tools" tofile="linux/work/tools-builder"/>
+- <copy todir="linux/work/hardware" overwrite="true">
+- <fileset dir="${staging_folder}/arduino-builder-arm/hardware" includes="*.txt"/>
+- </copy>
+- <delete dir="${staging_folder}/arduino-builder-arm" includeemptydirs="true"/>
++ <antcall target="build-arduino-builder" />
+
+ <antcall target="avr-toolchain-bundle">
+ <param name="unpack_target" value="untar"/>
+@@ -734,21 +718,7 @@
+ <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="build-arduino-builder" />
+
+ <antcall target="avr-toolchain-bundle">
+ <param name="unpack_target" value="untar"/>
+@@ -766,21 +736,7 @@
+ <param name="JVM" value="${LINUX64_BUNDLED_JVM}"/>
+ </antcall>
+
+- <delete dir="${staging_folder}/arduino-builder-linux64" includeemptydirs="true"/>
+- <mkdir dir="${staging_folder}/arduino-builder-linux64"/>
+- <antcall target="untar">
+- <param name="archive_file" value="./arduino-builder-linux64-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
+- <param name="archive_url" value="http://downloads.arduino.cc/tools/arduino-builder-linux64-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
+- <param name="final_folder" value="${staging_folder}/arduino-builder-linux64/arduino-builder" />
+- <param name="dest_folder" value="${staging_folder}/arduino-builder-linux64" />
+- </antcall>
+- <copy file="${staging_folder}/arduino-builder-linux64/arduino-builder" tofile="linux/work/arduino-builder" />
+- <chmod perm="755" file="linux/work/arduino-builder" />
+- <move file="${staging_folder}/arduino-builder-linux64/tools" tofile="linux/work/tools-builder"/>
+- <copy todir="linux/work/hardware" overwrite="true">
+- <fileset dir="${staging_folder}/arduino-builder-linux64/hardware" includes="*.txt"/>
+- </copy>
+- <delete dir="${staging_folder}/arduino-builder-linux64" includeemptydirs="true"/>
++ <antcall target="build-arduino-builder" />
+
+ <antcall target="avr-toolchain-bundle">
+ <param name="unpack_target" value="untar"/>
+@@ -823,6 +779,24 @@
+ <exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
+ </target>
+
++ <target name="build-arduino-builder" unless="no_arduino_builder">
++ <delete dir="${staging_folder}/arduino-builder-${platform}" includeemptydirs="true"/>
++ <mkdir dir="${staging_folder}/arduino-builder-${platform}"/>
++ <antcall target="untar">
++ <param name="archive_file" value="./arduino-builder-${platform}-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
++ <param name="archive_url" value="https://downloads.arduino.cc/tools/arduino-builder-${platform}-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
++ <param name="final_folder" value="${staging_folder}/arduino-builder-${platform}/arduino-builder" />
++ <param name="dest_folder" value="${staging_folder}/arduino-builder-${platform}" />
++ </antcall>
++ <copy file="${staging_folder}/arduino-builder-${platform}/arduino-builder" tofile="linux/work/arduino-builder" />
++ <chmod perm="755" file="linux/work/arduino-builder" />
++ <move file="${staging_folder}/arduino-builder-${platform}/tools" tofile="linux/work/tools-builder"/>
++ <copy todir="linux/work/hardware" overwrite="true">
++ <fileset dir="${staging_folder}/arduino-builder-${platform}/hardware" includes="*.txt"/>
++ </copy>
++ <delete dir="${staging_folder}/arduino-builder-${platform}" includeemptydirs="true"/>
++ </target>
++
+ <!-- Set '${dist_file}_available' property if toolchain dist_file is downloaded -->
+ <!-- Set '${dist_file}_installed' property if toolchain is installed in working directory -->
+ <!-- hardware/tools/${dist_check_file} is checked for existence -->
+@@ -833,8 +807,21 @@
+
+ <!-- Retrieve tool -->
+ <target name="untar-unzip-download" depends="untar-unzip-check" unless="${archive_file}_available">
++ <antcall target="untar-unzip-download-web" />
++ <antcall target="untar-unzip-download-local" />
++ </target>
++ <target name="untar-unzip-download-web" unless="local_sources">
+ <get src="${archive_url}" dest="${archive_file}" verbose="true" ignoreerrors="true" />
+ </target>
++ <target name="untar-unzip-download-local" if="local_sources">
++ <basename file="${archive_file}" property="basename" />
++ <echo>Skipping download of ${archive_url}, using makepkg downloaded ${basename}</echo>
++ <exec executable="ln" failonerror="true">
++ <arg value="-s" />
++ <arg value="${basedir}/../../${basename}" />
++ <arg value="${archive_file}" />
++ </exec>
++ </target>
+
+ <target name="untar-unzip-checksum" depends="untar-unzip-download">
+ <echo>Testing checksum of "${archive_file}"</echo>
Copied: arduino/repos/community-testing-x86_64/PKGBUILD (from rev 206026, arduino/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2017-01-07 13:59:49 UTC (rev 206027)
@@ -0,0 +1,102 @@
+# Maintainer: NicoHood <archlinux {cat} nicohood {dog} de>
+# PGP ID: 97312D5EB9D7AE7D0BD4307351DAE9B7C1AE9161
+# Contributor: Tomas Schertel <tschertel at gmail dot com>
+# Contributor: Christopher Loen <christopherloen at gmail dot com>
+# Contributor: Peter Reschenhofer <peter.reschenhofer at gmail.com>
+# Contributor: Niels Martignène <niels.martignene at gmail.com>
+# Contributor: PyroPeter <googlemail.com at abi1789>
+# Contributor: darkapex <me at jailuthra.in>
+# Contributor: tty0 <vt.tty0[d0t]gmail.com>
+
+pkgname=arduino
+pkgver=1.8.0
+pkgrel=3
+epoch=1
+pkgdesc="Arduino prototyping platform SDK"
+arch=('i686' 'x86_64')
+url="https://github.com/arduino/Arduino"
+license=('GPL' 'LGPL')
+depends=('gtk2' 'desktop-file-utils' 'shared-mime-info' 'java-runtime=8' 'arduino-builder')
+makedepends=('java-environment=8' 'apache-ant' 'unzip')
+optdepends=('arduino-docs: Offline documentation for arduino'
+ 'arduino-avr-core: AVR core with upstream avr-gcc and avrdude'
+ 'python2: Intel Galileo Board installation')
+options=(!strip)
+install="arduino.install"
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/arduino/Arduino/archive/${pkgver}.tar.gz"
+ "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.8.3/WiFi101-Updater-ArduinoIDE-Plugin-0.8.3.zip"
+ "https://downloads.arduino.cc/libastylej-2.05.1-3.zip"
+ "https://downloads.arduino.cc/liblistSerials/liblistSerials-1.4.0.zip"
+ "arduino.sh"
+ "build.patch")
+sha512sums=('25edea8cb188155ead2e2e9364067e445cf9d160d2fb7caea3c25adeb2e5e13072de8e7b1a45dfbd40c3346356decfad9de1d2e67838c532bd5ef8550678033d'
+ 'fb2c5f77ea047c060e67705886d106379ac4a297f3a7d1f7d6d0b2410c4592f09cece4578aeeaed867c03a2efe5fe8d124ccc36c4189ee5c875cd16473a6faab'
+ '7f82d64e34ef2d85a6b037caeecfa338b72f8edfc57a9903af3ab89b1d42cf7dfd9a6170abe8131ae3e6506850d82ed5092c3b08983a16d9c80319cd24c14555'
+ 'd78270ee9007fc8427b7f962aced6c14fd4772deca1bbf4ad47c3c74d9addb74e67184e80516af4613cf8d7270bc50d4019437d9ad84274d6fc26b68c4a00db1'
+ 'd97e73a6764232c5fbcdbd46d98f1dfde1d95d8256f578fb05480694423842ec864c49d572a325c7d00b026619d84dc114f1e3e0d2f8219b94871dce1718f05a'
+ '9963e964fe2206ce11a2981d3655ff73aa79e8a9dcbc5b03ee4fa84fd036b0d4b28af6ddd6c8bd0cdf8564c42209b738838141da9b185eeb47067ddb78afd9b7')
+
+prepare()
+{
+ # Patch arduino build process.
+ # See PR: https://github.com/arduino/Arduino/pull/5438
+ cd "${srcdir}/Arduino-${pkgver}"
+ patch -Np1 -i "${srcdir}/build.patch"
+}
+
+build() {
+ cd "Arduino-${pkgver}/build"
+
+ # Compile with java8
+ export PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:$PATH
+
+ # Do not include their avr-core + tools and no docs. We build them seperately
+ ant clean dist -Dversion=${pkgver} build -Dlight_bundle=true \
+ -Dno_docs=true \
+ -Dlocal_sources=true \
+ -Dno_arduino_builder=true
+}
+
+package() {
+ cd "Arduino-${pkgver}/build/linux/work"
+
+ # Create directories
+ install -dm755 "${pkgdir}/usr/share/"{doc,icons/hicolor,applications,mime/packages}
+
+ # Copy the whole SDK
+ cp -a . "${pkgdir}/usr/share/arduino"
+
+ # Create wrapper for java8 + buider and documentation symlink
+ install -Dm755 "${srcdir}/arduino.sh" "${pkgdir}/usr/bin/arduino"
+
+ # Link arduino-builder, libastylej, libserialport and docs
+ # TODO astyle libserialport do not work yet
+ # TODO remove unzip dependency once all deps are resolved
+ # https://github.com/arduino/ctags/issues/12
+ # https://github.com/arduino/Arduino/issues/5538
+ # https://github.com/arduino/listSerialPortsC/issues/9
+
+ # Arduino-builder
+ # https://bugs.archlinux.org/task/52377
+ ln -s /usr/bin/arduino-builder "${pkgdir}/usr/share/arduino/arduino-builder"
+ install -dm755 "${pkgdir}/usr/share/arduino/tools-builder"
+
+ #rm "${pkgdir}/usr/share/arduino/lib/libastylej.so"
+ #ln -s /usr/lib/libastyle-2.05.1.so "${pkgdir}/usr/share/arduino/lib/libastylej.so"
+ #rm "${pkgdir}/usr/share/arduino/lib/liblistSerialsj.so"
+ #ln -s /usr/lib/libserialport.so "${pkgdir}/usr/share/arduino/lib/liblistSerialsj.so"
+ rm -r "${pkgdir}/usr/share/arduino/reference"
+ ln -s /usr/share/doc/arduino "${pkgdir}/usr/share/arduino/reference"
+
+ # Install desktop icons (keep a symlink for the arduino binary)
+ cp -a lib/icons/* "${pkgdir}/usr/share/icons/hicolor"
+ rm -rf "${pkgdir}/usr/share/arduino/lib/icons"
+ ln -s /usr/share/icons/hicolor "${pkgdir}/usr/share/arduino/lib/icons"
+
+ # Create desktop file using existing template
+ sed "s,<BINARY_LOCATION>,arduino %U,g;s,<ICON_NAME>,arduino,g" "lib/desktop.template" \
+ > "${pkgdir}/usr/share/applications/arduino.desktop"
+
+ # Install Arduino mime type
+ ln -s /usr/share/arduino/lib/arduino-arduinoide.xml "${pkgdir}/usr/share/mime/packages/arduino.xml"
+}
Copied: arduino/repos/community-testing-x86_64/arduino.install (from rev 206026, arduino/trunk/arduino.install)
===================================================================
--- community-testing-x86_64/arduino.install (rev 0)
+++ community-testing-x86_64/arduino.install 2017-01-07 13:59:49 UTC (rev 206027)
@@ -0,0 +1,31 @@
+post_install() {
+ echo "Add yourself to the uucp group to access the serial ports:"
+ echo "sudo usermod -a -G uucp <user>"
+ echo "Please checkout the wiki for further information."
+}
+
+pre_upgrade() {
+ if [[ $(vercmp 1:1.6.12-1 "$2") -eq 1 ]]; then
+ echo "If arduino fails to install try to manually remove it first:"
+ echo "sudo pacman -Rs arduino"
+ fi
+}
+
+_1:1.6.12_1_changes() {
+ echo ":: arduino is now split into arduino-builder, arduino-avr-core and arduino-docs"
+ echo " If arduino fails to run, check for a zombie folder:"
+ echo " ls -la /usr/share/arduino/hardware/avr"
+ echo " It might be left from a very old upgrade. Please remove it."
+}
+
+post_upgrade() {
+ local v upgrades=(
+ 1:1.6.12-1
+ )
+
+ for v in "${upgrades[@]}"; do
+ if [[ $(vercmp "$v" "$2") -eq 1 ]]; then
+ "_${v//-/_}_changes"
+ fi
+ done
+}
Copied: arduino/repos/community-testing-x86_64/arduino.sh (from rev 206026, arduino/trunk/arduino.sh)
===================================================================
--- community-testing-x86_64/arduino.sh (rev 0)
+++ community-testing-x86_64/arduino.sh 2017-01-07 13:59:49 UTC (rev 206027)
@@ -0,0 +1,3 @@
+#!/bin/sh
+export PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:"$PATH"
+exec /usr/share/arduino/arduino "$@"
Copied: arduino/repos/community-testing-x86_64/build.patch (from rev 206026, arduino/trunk/build.patch)
===================================================================
--- community-testing-x86_64/build.patch (rev 0)
+++ community-testing-x86_64/build.patch 2017-01-07 13:59:49 UTC (rev 206027)
@@ -0,0 +1,239 @@
+diff -aur Arduino-1.8.0/build/build.xml Arduino-1.8.0_new/build/build.xml
+--- Arduino-1.8.0/build/build.xml 2016-12-21 16:12:44.000000000 +0100
++++ Arduino-1.8.0_new/build/build.xml 2016-12-23 23:20:06.520217000 +0100
+@@ -178,29 +178,7 @@
+
+ <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>
+-
+- <!-- Fix wrong permissions from zip file root folder -->
+- <chmod perm="755" dir="${target.path}/reference/Galileo_help_files" />
+- <chmod perm="755" dir="${target.path}/reference/Edison_help_files" />
++ <antcall target="assemble-docs" />
+
+ <!-- Write the revision file! -->
+ <echo file="${target.path}/lib/version.txt" message="${version}" />
+@@ -216,8 +194,35 @@
+ </antcall>
+ </target>
+
++ <target name="assemble-docs" unless="no_docs">
++ <!-- 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>
++
++ <!-- Fix wrong permissions from zip file root folder -->
++ <chmod perm="755" dir="${target.path}/reference/Galileo_help_files" />
++ <chmod perm="755" dir="${target.path}/reference/Edison_help_files" />
++ </target>
++
+ <!-- copy library folder -->
+- <target name="assemble-libraries" unless="light_bundle">
++ <target name="assemble-libraries" depends="assemble-libraries-full, assemble-libraries-light" />
++ <target name="assemble-libraries-full" unless="light_bundle">
+ <copy todir="${target.path}/libraries">
+ <fileset dir="../libraries"/>
+ </copy>
+@@ -235,6 +240,9 @@
+ <download-library name="SD" version="1.1.0"/>
+ <download-library githubuser="Adafruit" name="Adafruit_CircuitPlayground" version="1.6.4"/>
+ </target>
++ <target name="assemble-libraries-light" if="light_bundle">
++ <mkdir dir="${target.path}/libraries" />
++ </target>
+
+ <macrodef name="download-library">
+ <attribute name="name"/>
+@@ -253,13 +261,17 @@
+ </macrodef>
+
+ <!-- copy hardware folder -->
+- <target name="assemble-hardware" unless="light_bundle">
++ <target name="assemble-hardware" depends="assemble-hardware-full, assemble-hardware-light" />
++ <target name="assemble-hardware-full" unless="light_bundle">
+ <copy todir="${target.path}/hardware">
+ <fileset dir="../hardware">
+ <exclude name="arduino/sam/**"/>
+ </fileset>
+ </copy>
+ </target>
++ <target name="assemble-hardware-light" if="light_bundle">
++ <copy file="../hardware/package_index_bundled.json" todir="${target.path}/hardware" />
++ </target>
+
+ <!-- - - - - - - - - -->
+ <!-- Revision check -->
+@@ -468,21 +480,7 @@
+ <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">
+- <param name="archive_file" value="./arduino-builder-macosx-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
+- <param name="archive_url" value="http://downloads.arduino.cc/tools/arduino-builder-macosx-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
+- <param name="final_folder" value="${staging_folder}/arduino-builder-macosx/arduino-builder" />
+- <param name="dest_folder" value="${staging_folder}/arduino-builder-macosx" />
+- </antcall>
+- <copy file="${staging_folder}/arduino-builder-macosx/arduino-builder" tofile="macosx/work/${staging_hardware_folder}/../arduino-builder" />
+- <chmod perm="755" file="macosx/work/${staging_hardware_folder}/../arduino-builder" />
+- <move file="${staging_folder}/arduino-builder-macosx/tools" tofile="macosx/work/${staging_hardware_folder}/../tools-builder"/>
+- <copy todir="macosx/work/${staging_hardware_folder}" overwrite="true">
+- <fileset dir="${staging_folder}/arduino-builder-macosx/hardware" includes="*.txt"/>
+- </copy>
+- <delete dir="${staging_folder}/arduino-builder-macosx" includeemptydirs="true"/>
++ <antcall target="build-arduino-builder" />
+
+ <antcall target="portable-${portable}">
+ <param name="parentdir" value="macosx/work/${staging_hardware_folder}/.." />
+@@ -702,21 +700,7 @@
+ <param name="JVM" value="${LINUXARM_BUNDLED_JVM}"/>
+ </antcall>
+
+- <delete dir="${staging_folder}/arduino-builder-arm" includeemptydirs="true"/>
+- <mkdir dir="${staging_folder}/arduino-builder-arm"/>
+- <antcall target="untar">
+- <param name="archive_file" value="./arduino-builder-arm-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
+- <param name="archive_url" value="http://downloads.arduino.cc/tools/arduino-builder-arm-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
+- <param name="final_folder" value="${staging_folder}/arduino-builder-arm/arduino-builder" />
+- <param name="dest_folder" value="${staging_folder}/arduino-builder-arm" />
+- </antcall>
+- <copy file="${staging_folder}/arduino-builder-arm/arduino-builder" tofile="linux/work/arduino-builder" />
+- <chmod perm="755" file="linux/work/arduino-builder" />
+- <move file="${staging_folder}/arduino-builder-arm/tools" tofile="linux/work/tools-builder"/>
+- <copy todir="linux/work/hardware" overwrite="true">
+- <fileset dir="${staging_folder}/arduino-builder-arm/hardware" includes="*.txt"/>
+- </copy>
+- <delete dir="${staging_folder}/arduino-builder-arm" includeemptydirs="true"/>
++ <antcall target="build-arduino-builder" />
+
+ <antcall target="avr-toolchain-bundle">
+ <param name="unpack_target" value="untar"/>
+@@ -734,21 +718,7 @@
+ <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="build-arduino-builder" />
+
+ <antcall target="avr-toolchain-bundle">
+ <param name="unpack_target" value="untar"/>
+@@ -766,21 +736,7 @@
+ <param name="JVM" value="${LINUX64_BUNDLED_JVM}"/>
+ </antcall>
+
+- <delete dir="${staging_folder}/arduino-builder-linux64" includeemptydirs="true"/>
+- <mkdir dir="${staging_folder}/arduino-builder-linux64"/>
+- <antcall target="untar">
+- <param name="archive_file" value="./arduino-builder-linux64-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
+- <param name="archive_url" value="http://downloads.arduino.cc/tools/arduino-builder-linux64-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
+- <param name="final_folder" value="${staging_folder}/arduino-builder-linux64/arduino-builder" />
+- <param name="dest_folder" value="${staging_folder}/arduino-builder-linux64" />
+- </antcall>
+- <copy file="${staging_folder}/arduino-builder-linux64/arduino-builder" tofile="linux/work/arduino-builder" />
+- <chmod perm="755" file="linux/work/arduino-builder" />
+- <move file="${staging_folder}/arduino-builder-linux64/tools" tofile="linux/work/tools-builder"/>
+- <copy todir="linux/work/hardware" overwrite="true">
+- <fileset dir="${staging_folder}/arduino-builder-linux64/hardware" includes="*.txt"/>
+- </copy>
+- <delete dir="${staging_folder}/arduino-builder-linux64" includeemptydirs="true"/>
++ <antcall target="build-arduino-builder" />
+
+ <antcall target="avr-toolchain-bundle">
+ <param name="unpack_target" value="untar"/>
+@@ -823,6 +779,24 @@
+ <exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
+ </target>
+
++ <target name="build-arduino-builder" unless="no_arduino_builder">
++ <delete dir="${staging_folder}/arduino-builder-${platform}" includeemptydirs="true"/>
++ <mkdir dir="${staging_folder}/arduino-builder-${platform}"/>
++ <antcall target="untar">
++ <param name="archive_file" value="./arduino-builder-${platform}-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
++ <param name="archive_url" value="https://downloads.arduino.cc/tools/arduino-builder-${platform}-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
++ <param name="final_folder" value="${staging_folder}/arduino-builder-${platform}/arduino-builder" />
++ <param name="dest_folder" value="${staging_folder}/arduino-builder-${platform}" />
++ </antcall>
++ <copy file="${staging_folder}/arduino-builder-${platform}/arduino-builder" tofile="linux/work/arduino-builder" />
++ <chmod perm="755" file="linux/work/arduino-builder" />
++ <move file="${staging_folder}/arduino-builder-${platform}/tools" tofile="linux/work/tools-builder"/>
++ <copy todir="linux/work/hardware" overwrite="true">
++ <fileset dir="${staging_folder}/arduino-builder-${platform}/hardware" includes="*.txt"/>
++ </copy>
++ <delete dir="${staging_folder}/arduino-builder-${platform}" includeemptydirs="true"/>
++ </target>
++
+ <!-- Set '${dist_file}_available' property if toolchain dist_file is downloaded -->
+ <!-- Set '${dist_file}_installed' property if toolchain is installed in working directory -->
+ <!-- hardware/tools/${dist_check_file} is checked for existence -->
+@@ -833,8 +807,21 @@
+
+ <!-- Retrieve tool -->
+ <target name="untar-unzip-download" depends="untar-unzip-check" unless="${archive_file}_available">
++ <antcall target="untar-unzip-download-web" />
++ <antcall target="untar-unzip-download-local" />
++ </target>
++ <target name="untar-unzip-download-web" unless="local_sources">
+ <get src="${archive_url}" dest="${archive_file}" verbose="true" ignoreerrors="true" />
+ </target>
++ <target name="untar-unzip-download-local" if="local_sources">
++ <basename file="${archive_file}" property="basename" />
++ <echo>Skipping download of ${archive_url}, using makepkg downloaded ${basename}</echo>
++ <exec executable="ln" failonerror="true">
++ <arg value="-s" />
++ <arg value="${basedir}/../../${basename}" />
++ <arg value="${archive_file}" />
++ </exec>
++ </target>
+
+ <target name="untar-unzip-checksum" depends="untar-unzip-download">
+ <echo>Testing checksum of "${archive_file}"</echo>
More information about the arch-commits
mailing list