[arch-commits] Commit in arduino/trunk (4 files)
NicoHood
nicohood at archlinux.org
Sat Dec 24 12:11:52 UTC 2016
Date: Saturday, December 24, 2016 @ 12:11:50
Author: nicohood
Revision: 201479
upgpkg: arduino 1:1.8.0-1
Added:
arduino/trunk/platform.keys.rewrite.txt
arduino/trunk/platform.txt
Modified:
arduino/trunk/PKGBUILD
arduino/trunk/build.patch
---------------------------+
PKGBUILD | 46 +++++++-------
build.patch | 137 ++++++++++++++++++++++++++++++++++++++++----
platform.keys.rewrite.txt | 42 +++++++++++++
platform.txt | 12 +++
4 files changed, 204 insertions(+), 33 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-12-24 11:59:27 UTC (rev 201478)
+++ PKGBUILD 2016-12-24 12:11:50 UTC (rev 201479)
@@ -1,4 +1,4 @@
-# Maintainer: NicoHood <archlinux {at} nicohood {dot} de>
+# 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>
@@ -9,7 +9,7 @@
# Contributor: tty0 <vt.tty0[d0t]gmail.com>
pkgname=arduino
-pkgver=1.6.13
+pkgver=1.8.0
pkgrel=1
epoch=1
pkgdesc="Arduino prototyping platform SDK"
@@ -16,7 +16,7 @@
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')
+depends=('gtk2' 'desktop-file-utils' 'shared-mime-info' 'java-runtime=8' 'arduino-builder' 'arduino-ctags')
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'
@@ -26,30 +26,26 @@
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.2.0.zip"
+ "https://downloads.arduino.cc/liblistSerials/liblistSerials-1.4.0.zip"
"arduino.sh"
- "build.patch")
-source_i686=("https://downloads.arduino.cc/tools/arduino-builder-linux32-1.3.21_r1.tar.bz2")
-source_x86_64=("https://downloads.arduino.cc/tools/arduino-builder-linux64-1.3.21_r1.tar.bz2")
-sha512sums=('54643199a56fd01ac9e031fc03f174c38a2cc7b0b13953e1c543aae58f2d0987ad127abe224e3863eb6ec9c81022288073613f86b75543babfc9d186f75a15f9'
+ "build.patch"
+ "platform.txt"
+ "platform.keys.rewrite.txt")
+sha512sums=('25edea8cb188155ead2e2e9364067e445cf9d160d2fb7caea3c25adeb2e5e13072de8e7b1a45dfbd40c3346356decfad9de1d2e67838c532bd5ef8550678033d'
'fb2c5f77ea047c060e67705886d106379ac4a297f3a7d1f7d6d0b2410c4592f09cece4578aeeaed867c03a2efe5fe8d124ccc36c4189ee5c875cd16473a6faab'
'7f82d64e34ef2d85a6b037caeecfa338b72f8edfc57a9903af3ab89b1d42cf7dfd9a6170abe8131ae3e6506850d82ed5092c3b08983a16d9c80319cd24c14555'
- '79f2eaf75c5f948c8388b6d89d3ce1f14518390ee2df111e1603eafb490f54a5c071af61b228cae3bfa8c20bc0a5450b1131f2328c419241ba0d127837b97292'
+ 'd78270ee9007fc8427b7f962aced6c14fd4772deca1bbf4ad47c3c74d9addb74e67184e80516af4613cf8d7270bc50d4019437d9ad84274d6fc26b68c4a00db1'
'd97e73a6764232c5fbcdbd46d98f1dfde1d95d8256f578fb05480694423842ec864c49d572a325c7d00b026619d84dc114f1e3e0d2f8219b94871dce1718f05a'
- '8f0186a6554a54c3067bcf71b8891a6e51b2613fd9135f4b0a10e6e24f4797757ca968ee1195f5bcac01f0aa22b73005b273939346a3aea9aee391e8d31a3588')
-sha512sums_i686=('a0df7ba3d7f313aeac4c32365b9aaf32feb374c18e0b82516d61e51be10db897f368e46b6ff4e1574fec8b78fe584c39a76215974b32b440e85e27a1434e3d12')
-sha512sums_x86_64=('223b81ae4cdb14962e3e6b271f78a88c055185785991d0ff32b3dbb3db9a4861cec495e5e726718df484e8c9901f5d3f0650d4d1e3b8d7bdb8f197c23222e748')
+ '9963e964fe2206ce11a2981d3655ff73aa79e8a9dcbc5b03ee4fa84fd036b0d4b28af6ddd6c8bd0cdf8564c42209b738838141da9b185eeb47067ddb78afd9b7'
+ 'a311271ee4aa86b93678875b0a0121ab075fd5b56422fc7e1b6beb6626b554482e474cd6bb16d40a44bacd6e4808de5a873892c1ab6c71ae51f70757289f7364'
+ '913b183eb5828fbebe565c259cd199e7c97d56af8e13d0b516fe825716feecdba8cd298b97bd24efac2612eae8c4f30c35f9b82d7499a6ae6256e1ee48510470')
prepare()
{
- # Patch arduino build process. See PR: https://github.com/arduino/Arduino/pull/5438
+ # Patch arduino build process.
+ # See PR: https://github.com/arduino/Arduino/pull/5438
cd "${srcdir}/Arduino-${pkgver}"
patch -Np1 -i "${srcdir}/build.patch"
-
- # echo -e "\n# By default, don't notify the user of a new upstream version." \
- # "\n# https://bugzilla.redhat.com/show_bug.cgi?id=773519" \
- # "\nupdate.check=false" \
- # >> build/shared/lib/preferences.txt
}
build() {
@@ -59,7 +55,10 @@
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
+ ant clean dist -Dversion=${pkgver} build -Dlight_bundle=true \
+ -Dno_docs=true \
+ -Dlocal_sources=true \
+ -Dno_arduino_builder=true
}
package() {
@@ -80,11 +79,12 @@
# https://github.com/arduino/ctags/issues/12
# https://github.com/arduino/Arduino/issues/5538
# https://github.com/arduino/listSerialPortsC/issues/9
- rm "${pkgdir}/usr/share/arduino/arduino-builder"
+
+ # Arduino-builder + ctags
ln -s /usr/bin/arduino-builder "${pkgdir}/usr/share/arduino/arduino-builder"
- # ctags TODO -> patch platform.txt and not the binary ln
- #rm "${pkgdir}/usr/share/arduino/tools-builder/ctags/5.8-arduino10/ctags"
- #ln -s /usr/bin/ctags "${pkgdir}/usr/share/arduino/tools-builder/ctags/5.8-arduino10/ctags"
+ install -Dm644 "${srcdir}/platform.txt" "${pkgdir}/usr/share/arduino/hardware/platform.txt"
+ install -Dm644 "${srcdir}/platform.keys.rewrite.txt" "${pkgdir}/usr/share/arduino/hardware/platform.keys.rewrite.txt"
+
#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"
Modified: build.patch
===================================================================
--- build.patch 2016-12-24 11:59:27 UTC (rev 201478)
+++ build.patch 2016-12-24 12:11:50 UTC (rev 201479)
@@ -1,7 +1,7 @@
-diff -aur Arduino-1.6.13/build/build.xml Arduino-1.6.13_new/build/build.xml
---- Arduino-1.6.13/build/build.xml 2016-11-22 15:49:35.000000000 +0100
-+++ Arduino-1.6.13_new/build/build.xml 2016-12-12 18:37:31.499962000 +0100
-@@ -177,29 +177,7 @@
+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"/>
@@ -32,7 +32,7 @@
<!-- Write the revision file! -->
<echo file="${target.path}/lib/version.txt" message="${version}" />
-@@ -215,8 +193,35 @@
+@@ -216,8 +194,35 @@
</antcall>
</target>
@@ -69,9 +69,9 @@
<copy todir="${target.path}/libraries">
<fileset dir="../libraries"/>
</copy>
-@@ -233,6 +238,9 @@
- <download-library name="Keyboard" version="1.0.1"/>
- <download-library name="SD" version="1.0.9"/>
+@@ -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" />
@@ -79,7 +79,7 @@
<macrodef name="download-library">
<attribute name="name"/>
-@@ -251,13 +259,17 @@
+@@ -253,13 +261,17 @@
</macrodef>
<!-- copy hardware folder -->
@@ -98,8 +98,125 @@
<!-- - - - - - - - - -->
<!-- Revision check -->
-@@ -823,8 +835,21 @@
+@@ -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" />
Added: platform.keys.rewrite.txt
===================================================================
--- platform.keys.rewrite.txt (rev 0)
+++ platform.keys.rewrite.txt 2016-12-24 12:11:50 UTC (rev 201479)
@@ -0,0 +1,42 @@
+old.0.compiler.path={runtime.ide.path}/hardware/tools/avr/bin/
+new.0.compiler.path={runtime.tools.avr-gcc.path}/bin/
+
+old.1.tools.avrdude.cmd.path={runtime.ide.path}/hardware/tools/avr/bin/avrdude
+new.1.tools.avrdude.cmd.path={path}/bin/avrdude
+
+old.2.tools.avrdude.config.path={runtime.ide.path}/hardware/tools/avr/etc/avrdude.conf
+new.2.tools.avrdude.config.path={path}/etc/avrdude.conf
+
+old.3.compiler.path={runtime.ide.path}/hardware/tools/gcc-arm-none-eabi-4.8.3-2014q1/bin/
+new.3.compiler.path={runtime.tools.arm-none-eabi-gcc.path}/bin/
+
+old.4.tools.bossac.path={runtime.ide.path}/hardware/tools
+new.4.tools.bossac.path={runtime.tools.bossac.path}
+
+old.5.recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} -mcpu={build.mcu} "-T{build.variant.path}/{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" "-L{build.path}" -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols -Wl,--start-group "{build.path}/syscalls_sam3.c.o" {object_files} "{build.variant.path}/{build.variant_system_lib}" "{build.path}/{archive_file}" -Wl,--end-group -lm -gcc
+new.5.recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} -mcpu={build.mcu} "-T{build.variant.path}/{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" "-L{build.path}" -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols -Wl,--start-group "{build.path}/core/syscalls_sam3.c.o" {object_files} "{build.variant.path}/{build.variant_system_lib}" "{build.path}/{archive_file}" -Wl,--end-group -lm -gcc
+
+#specific to RedBearLab nRF51822 Boards
+old.6.recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" -mcpu={build.mcu} -mthumb -Wl,--gc-sections --specs=nano.specs -Wl,--wrap,main -Wl,-Map={build.path}/{build.project_name}.map,--cref "-T{build.variant.path}/{build.ldscript}" -o "{build.path}/{build.project_name}.elf" -Wl,--start-group "{build.path}/system_nrf51.c.o" {object_files} "{build.path}/startup_NRF51822.s.o" "{build.path}/{archive_file}" -Wl,--end-group -lstdc++ -lsupc++ -lm -lc -lgcc -lnosys
+new.6.recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" -mcpu={build.mcu} -mthumb -Wl,--gc-sections --specs=nano.specs -Wl,--wrap,main -Wl,-Map={build.path}/{build.project_name}.map,--cref "-T{build.variant.path}/{build.ldscript}" -o "{build.path}/{build.project_name}.elf" -Wl,--start-group "{build.path}/core/mbed/targets/cmsis/TARGET_NORDIC/TARGET_MCU_NRF51822/system_nrf51.c.o" {object_files} "{build.path}/core/startup_NRF51822.S.o" "{build.path}/{archive_file}" -Wl,--end-group -lstdc++ -lsupc++ -lm -lc -lgcc -lnosys
+
+#specific to RFduino 1.6.3
+old.7.recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} -mcpu={build.mcu} {build.extra_flags} "-T{build.variant.path}/{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" -Wl,--cref -o "{build.path}/{build.project_name}.elf" "-L{build.path}" -Wl,--warn-common -Wl,--warn-section-align -Wl,--start-group "{build.path}/syscalls.c.o" {object_files} "{build.variant.path}/{build.variant_system_lib}" "{build.variant.path}/libRFduino.a" "{build.variant.path}/libRFduinoBLE.a" "{build.variant.path}/libRFduinoGZLL.a" "{build.path}/{archive_file}" -Wl,--end-group
+new.7.recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} -mcpu={build.mcu} {build.extra_flags} "-T{build.variant.path}/{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" -Wl,--cref -o "{build.path}/{build.project_name}.elf" "-L{build.path}" -Wl,--warn-common -Wl,--warn-section-align -Wl,--start-group "{build.path}/core/syscalls.c.o" {object_files} "{build.variant.path}/{build.variant_system_lib}" "{build.variant.path}/libRFduino.a" "{build.variant.path}/libRFduinoBLE.a" "{build.variant.path}/libRFduinoGZLL.a" "{build.path}/{archive_file}" -Wl,--end-group
+
+old.8.recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{build.path}/{archive_file}" "{object_file}"
+new.8.recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{archive_file_path}" "{object_file}"
+
+old.9.recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} -mcpu={build.mcu} "-T{build.variant.path}/{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" "-L{build.path}" -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--start-group "{build.path}/syscalls_sam3.c.o" {object_files} "{build.variant.path}/{build.variant_system_lib}" "{build.path}/{archive_file}" -Wl,--end-group -lm -gcc
+new.9.recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} -mcpu={build.mcu} "-T{build.variant.path}/{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" {compiler.c.elf.extra_flags} -o "{build.path}/{build.project_name}.elf" "-L{build.path}" -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=Reset_Handler -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--start-group "{build.path}/core/syscalls_sam3.c.o" {object_files} "{build.variant.path}/{build.variant_system_lib}" "{build.path}/{archive_file}" -Wl,--end-group -lm -gcc
+
+#specific to Digistump AVR Boards 1.5.4
+old.10.recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} "{build.path}/{archive_file}" "{object_file}"
+new.10.recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} "{archive_file_path}" "{object_file}"
+
+old.11.recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} -mmcu={build.mcu} -o "{build.path}/{build.project_name}.elf" {object_files} "{build.path}/{archive_file}" "-L{build.path}" -lm
+new.11.recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} -mmcu={build.mcu} -o "{build.path}/{build.project_name}.elf" {object_files} "{archive_file_path}" "-L{build.path}" -lm
+
+#generic again
+old.12.recipe.preproc.macros="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} {preproc.macros.flags} -mmcu={build.mcu} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {includes} "{source_file}"
+new.12.recipe.preproc.macros="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} {preproc.macros.flags} -mmcu={build.mcu} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{preprocessed_file_path}"
\ No newline at end of file
Added: platform.txt
===================================================================
--- platform.txt (rev 0)
+++ platform.txt 2016-12-24 12:11:50 UTC (rev 201479)
@@ -0,0 +1,12 @@
+# ctags
+# ------------------------------
+tools.ctags.path=/usr/bin
+tools.ctags.cmd.path={path}/arduino-ctags
+tools.ctags.pattern="{cmd.path}" -u --language-force=c++ -f - --c++-kinds=svpf --fields=KSTtzns --line-directives "{source_file}"
+
+# additional entries
+tools.avrdude.path={runtime.tools.avrdude.path}
+
+preproc.macros.flags=-w -x c++ -E -CC
+#preproc.macros.compatibility_flags={build.mbed_api_include} {build.nRF51822_api_include} {build.ble_api_include} {compiler.libsam.c.flags} {compiler.arm.cmsis.path} {build.variant_system_include}
+#recipe.preproc.macros="{compiler.path}{compiler.cpp.cmd}" {compiler.cpreprocessor.flags} {compiler.cpp.flags} {preproc.macros.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {preproc.macros.compatibility_flags} {includes} "{source_file}" -o "{preprocessed_file_path}"
More information about the arch-commits
mailing list