[arch-commits] Commit in arduino/trunk (3 files)
NicoHood
nicohood at archlinux.org
Tue Dec 27 10:51:23 UTC 2016
Date: Tuesday, December 27, 2016 @ 10:51:23
Author: nicohood
Revision: 203045
upgpkg: arduino 1:1.8.0-2
Modified:
arduino/trunk/PKGBUILD
Deleted:
arduino/trunk/platform.keys.rewrite.txt
arduino/trunk/platform.txt
---------------------------+
PKGBUILD | 20 +++++++-------------
platform.keys.rewrite.txt | 42 ------------------------------------------
platform.txt | 12 ------------
3 files changed, 7 insertions(+), 67 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-12-27 10:50:51 UTC (rev 203044)
+++ PKGBUILD 2016-12-27 10:51:23 UTC (rev 203045)
@@ -10,13 +10,13 @@
pkgname=arduino
pkgver=1.8.0
-pkgrel=1
+pkgrel=2
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' 'arduino-ctags')
+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'
@@ -28,17 +28,13 @@
"https://downloads.arduino.cc/libastylej-2.05.1-3.zip"
"https://downloads.arduino.cc/liblistSerials/liblistSerials-1.4.0.zip"
"arduino.sh"
- "build.patch"
- "platform.txt"
- "platform.keys.rewrite.txt")
+ "build.patch")
sha512sums=('25edea8cb188155ead2e2e9364067e445cf9d160d2fb7caea3c25adeb2e5e13072de8e7b1a45dfbd40c3346356decfad9de1d2e67838c532bd5ef8550678033d'
'fb2c5f77ea047c060e67705886d106379ac4a297f3a7d1f7d6d0b2410c4592f09cece4578aeeaed867c03a2efe5fe8d124ccc36c4189ee5c875cd16473a6faab'
'7f82d64e34ef2d85a6b037caeecfa338b72f8edfc57a9903af3ab89b1d42cf7dfd9a6170abe8131ae3e6506850d82ed5092c3b08983a16d9c80319cd24c14555'
'd78270ee9007fc8427b7f962aced6c14fd4772deca1bbf4ad47c3c74d9addb74e67184e80516af4613cf8d7270bc50d4019437d9ad84274d6fc26b68c4a00db1'
'd97e73a6764232c5fbcdbd46d98f1dfde1d95d8256f578fb05480694423842ec864c49d572a325c7d00b026619d84dc114f1e3e0d2f8219b94871dce1718f05a'
- '9963e964fe2206ce11a2981d3655ff73aa79e8a9dcbc5b03ee4fa84fd036b0d4b28af6ddd6c8bd0cdf8564c42209b738838141da9b185eeb47067ddb78afd9b7'
- 'a311271ee4aa86b93678875b0a0121ab075fd5b56422fc7e1b6beb6626b554482e474cd6bb16d40a44bacd6e4808de5a873892c1ab6c71ae51f70757289f7364'
- '913b183eb5828fbebe565c259cd199e7c97d56af8e13d0b516fe825716feecdba8cd298b97bd24efac2612eae8c4f30c35f9b82d7499a6ae6256e1ee48510470')
+ '9963e964fe2206ce11a2981d3655ff73aa79e8a9dcbc5b03ee4fa84fd036b0d4b28af6ddd6c8bd0cdf8564c42209b738838141da9b185eeb47067ddb78afd9b7')
prepare()
{
@@ -73,17 +69,15 @@
# Create wrapper for java8 + buider and documentation symlink
install -Dm755 "${srcdir}/arduino.sh" "${pkgdir}/usr/bin/arduino"
- # Link arduino-builder, ctags, libastylej, libserialport and docs
- # TODO ctags, astyle libserialport do not work yet
+ # 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 + ctags
+ # Arduino-builder
ln -s /usr/bin/arduino-builder "${pkgdir}/usr/share/arduino/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"
#rm "${pkgdir}/usr/share/arduino/lib/libastylej.so"
#ln -s /usr/lib/libastyle-2.05.1.so "${pkgdir}/usr/share/arduino/lib/libastylej.so"
Deleted: platform.keys.rewrite.txt
===================================================================
--- platform.keys.rewrite.txt 2016-12-27 10:50:51 UTC (rev 203044)
+++ platform.keys.rewrite.txt 2016-12-27 10:51:23 UTC (rev 203045)
@@ -1,42 +0,0 @@
-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
Deleted: platform.txt
===================================================================
--- platform.txt 2016-12-27 10:50:51 UTC (rev 203044)
+++ platform.txt 2016-12-27 10:51:23 UTC (rev 203045)
@@ -1,12 +0,0 @@
-# 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