[arch-commits] Commit in arduino-builder/trunk (3 files)

NicoHood nicohood at archlinux.org
Tue Dec 27 10:50:25 UTC 2016


    Date: Tuesday, December 27, 2016 @ 10:50:24
  Author: nicohood
Revision: 203043

upgpkg: arduino-builder 1.3.23-2

Added:
  arduino-builder/trunk/platform.keys.rewrite.txt
  arduino-builder/trunk/platform.txt
Modified:
  arduino-builder/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   14 +++++++++++---
 platform.keys.rewrite.txt |   42 ++++++++++++++++++++++++++++++++++++++++++
 platform.txt              |   12 ++++++++++++
 3 files changed, 65 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-12-27 10:39:27 UTC (rev 203042)
+++ PKGBUILD	2016-12-27 10:50:24 UTC (rev 203043)
@@ -3,15 +3,21 @@
 
 pkgname=arduino-builder
 pkgver=1.3.23
-pkgrel=1
+pkgrel=2
 pkgdesc="A command line tool for compiling Arduino sketches"
 arch=('i686' 'x86_64')
 url="https://github.com/arduino/arduino-builder"
 license=('GPL')
+depends=('arduino-ctags')
 makedepends=('go' 'git' 'unzip')
+optdepends=('arduino-avr-core: AVR core with upstream avr-gcc and avrdude')
 options=(!strip)
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/arduino/arduino-builder/archive/${pkgver}.tar.gz")
-sha512sums=('e9b5dd06c7c2149aa715b1de5385c4c919c9f8857d350b051a62a3f36ab41af19e0d5d7367956206d03b273dc8ff75d6297828c12c88295edd546d6af99b62d6')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/arduino/${pkgname}/archive/${pkgver}.tar.gz"
+		"platform.txt"
+		"platform.keys.rewrite.txt")
+sha512sums=('e9b5dd06c7c2149aa715b1de5385c4c919c9f8857d350b051a62a3f36ab41af19e0d5d7367956206d03b273dc8ff75d6297828c12c88295edd546d6af99b62d6'
+            'a311271ee4aa86b93678875b0a0121ab075fd5b56422fc7e1b6beb6626b554482e474cd6bb16d40a44bacd6e4808de5a873892c1ab6c71ae51f70757289f7364'
+            '913b183eb5828fbebe565c259cd199e7c97d56af8e13d0b516fe825716feecdba8cd298b97bd24efac2612eae8c4f30c35f9b82d7499a6ae6256e1ee48510470')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
@@ -34,6 +40,8 @@
 
 	# Install main tool
 	install -Dm755 "arduino-builder" "${pkgdir}/usr/bin/arduino-builder"
+	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"
 
 	# Add documentation
 	install -Dm644 -t "${pkgdir}/usr/share/doc/${pkgname}" README.md

Added: platform.keys.rewrite.txt
===================================================================
--- platform.keys.rewrite.txt	                        (rev 0)
+++ platform.keys.rewrite.txt	2016-12-27 10:50:24 UTC (rev 203043)
@@ -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-27 10:50:24 UTC (rev 203043)
@@ -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