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

[NicoHood]

    Date: Wednesday, October 3, 2018 @ 13:00:35
  Author: nicohood
Revision: 389210

upgpkg: arduino-builder 1.4.1-1

Modified:
  arduino-builder/trunk/PKGBUILD

----------+
 PKGBUILD |   48 +++++++++++++++++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-03 12:52:14 UTC (rev 389209)
+++ PKGBUILD	2018-10-03 13:00:35 UTC (rev 389210)
@@ -2,8 +2,8 @@
 # PGP ID: 97312D5EB9D7AE7D0BD4307351DAE9B7C1AE9161
 
 pkgname=arduino-builder
-pkgver=1.3.25
-pkgrel=3
+pkgver=1.4.1
+pkgrel=1
 pkgdesc="A command line tool for compiling Arduino sketches"
 arch=('x86_64')
 url="https://github.com/arduino/arduino-builder"
@@ -11,18 +11,32 @@
 depends=('arduino-ctags')
 makedepends=('go-pie' '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/${pkgname}/archive/${pkgver}.tar.gz")
-sha512sums=('3740530800f8a3cfe1fe20a91579e6b632b76c2c4ace68c7b178a2d234032d5887abee3d0360c3039f2fec912a0d5cabe948bf930a7d9ea23221625456ad5357')
+source=("${pkgname}-${pkgver}.tar.xz::https://github.com/arduino/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.xz"
+		"${pkgname}-${pkgver}.tar.xz.asc::https://github.com/arduino/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.xz.asc")
+sha512sums=('add5007dd91170a9a65fb3ec88edc9642f3e6037b1598583d726dd2cb41db6ccda64a96f370fe0bce38fe3685f1d274cddb34787cb86a476f29cc28a1e24ce90'
+            'SKIP')
+validpgpkeys=('326567C1C6B288DF32CB061A95FA6F43E21188C4') # Arduino Packages <support at arduino.cc>
 
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	export GOPATH="${srcdir}/${pkgname}-${pkgver}"
-	go get -fix github.com/go-errors/errors
-	go get -fix github.com/stretchr/testify
-	go get -fix github.com/jstemmer/go-junit-report
-	go build arduino.cc/arduino-builder
+	# TODO Symlink will fail in test https://github.com/golang/go/issues/15507
+	mkdir -p "${srcdir}/build/src/github.com/arduino/arduino-builder"
+	#ln -sf "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/build/src/github.com/arduino/arduino-builder"
+	cp -a "${srcdir}/${pkgname}-${pkgver}/." "${srcdir}/build/src/github.com/arduino/arduino-builder"
+	export GOPATH="${srcdir}/build"
+	cd "${srcdir}/build"
 
+	go get github.com/go-errors/errors
+	go get github.com/stretchr/testify
+	go get github.com/jstemmer/go-junit-report
+	go get -u github.com/arduino/go-properties-map
+	go get -u github.com/arduino/go-timeutils
+	go get google.golang.org/grpc
+	go get github.com/golang/protobuf/proto
+	go get golang.org/x/net/context
+	go get github.com/fsnotify/fsnotify
+	#go get github.com/arduino/arduino-builder
+	go build github.com/arduino/arduino-builder/arduino-builder
+
 	# TODO Fix ctags test environment at build time
 	# https://github.com/arduino/arduino-builder/issues/202
 }
@@ -30,24 +44,24 @@
 check() {
 	# Test will download ~1GB of testfiles
 	echo "Running check() for the first time might take a while as it downloads ~1GB of testfiles. Skip with --nocheck"
-	export GOPATH="${srcdir}/${pkgname}-${pkgver}"
-	go test -timeout 60m arduino.cc/...
+	export GOPATH="${srcdir}/build"
+	go test -timeout 60m github.com/arduino/arduino-builder/...
 }
 
 package() {
 	# Fix platform.txt for arch arduino-ctags
-	cd "${srcdir}/${pkgname}-${pkgver}/src/arduino.cc/builder/hardware/"
+	cd "${srcdir}/build/src/github.com/arduino/arduino-builder/hardware"
 	sed -i 's#^tools.ctags.path=.*#tools.ctags.path=/usr/bin#' platform.txt
 	sed -i 's#^tools.ctags.cmd.path=.*#tools.ctags.cmd.path={path}/arduino-ctags#' platform.txt
 
-	cd "${srcdir}/${pkgname}-${pkgver}"
+	cd "${srcdir}/build"
 
 	# Install main tool
 	install -Dm755 "arduino-builder" "${pkgdir}/usr/bin/arduino-builder"
 
 	# Install platform.txt files
-	install -Dm644 -t "${pkgdir}/usr/share/arduino/hardware/" "${srcdir}/${pkgname}-${pkgver}"/src/arduino.cc/builder/hardware/*
+	install -Dm644 -t "${pkgdir}/usr/share/arduino/hardware/" "${srcdir}"/build/src/github.com/arduino/arduino-builder/hardware/*
 
 	# Add documentation
-	install -Dm644 -t "${pkgdir}/usr/share/doc/${pkgname}" README.md
+	install -Dm644 -t "${pkgdir}/usr/share/doc/${pkgname}" "${srcdir}/${pkgname}-${pkgver}/README.md"
 }