upgpkg: arm-frc-linux-gnueabi-wpilib 2018.1.1

2 files changed, 31 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b8fe4fa0b92e..fabb2844ce5e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,21 @@
 pkgbase = arm-frc-linux-gnueabi-wpilib
 	pkgdesc = The WPI FIRST Robotics Competition C/C++ library for the arm-frc-linux-gnueabi toolchain
-	pkgver = 2017.3.1
-	pkgrel = 4
-	url = https://usfirst.collab.net/sf/projects/wpilib/
+	pkgver = 2018.1.1
+	pkgrel = 1
+	url = https://github.com/wpilibsuite/allwpilib
 	arch = i686
 	arch = x86_64
 	groups = frc-toolchain
 	license = custom=FRC-BSD
 	makedepends = git
 	makedepends = java-environment=8
-	makedepends = doxygen
 	makedepends = unzip
 	depends = arm-frc-linux-gnueabi-gcc
 	options = !strip
 	options = libtool
 	options = staticlibs
 	options = !emptydirs
-	source = git+git://github.com/wpilibsuite/allwpilib#tag=v2017.3.1
+	source = git+git://github.com/wpilibsuite/allwpilib#tag=v2018.1.1
 	sha512sums = SKIP
 
 pkgname = arm-frc-linux-gnueabi-wpilib
diff --git a/PKGBUILD b/PKGBUILD
index 54bf42327a89..d42ec944fc7a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,23 @@
 # Maintainer: Tyler Veness <calcmogul at gmail dot com>
 
-_target=arm-frc-linux-gnueabi
+_target="arm-frc-linux-gnueabi"
 pkgname=${_target}-wpilib
-pkgver=2017.3.1
-pkgrel=4
+pkgver=2018.1.1
+pkgrel=1
 pkgdesc="The WPI FIRST Robotics Competition C/C++ library for the arm-frc-linux-gnueabi toolchain"
 arch=(i686 x86_64)
-url="https://usfirst.collab.net/sf/projects/wpilib/"
+url="https://github.com/wpilibsuite/allwpilib"
 license=('custom=FRC-BSD')
 groups=('frc-toolchain')
 depends=("${_target}-gcc")
-makedepends=('git' 'java-environment=8' 'doxygen' 'unzip')
+makedepends=('git' 'java-environment=8' 'unzip')
 options=('!strip' 'libtool' 'staticlibs' '!emptydirs')
-source=("git+git://github.com/wpilibsuite/allwpilib#tag=v2017.3.1")
+source=("git+git://github.com/wpilibsuite/allwpilib#tag=v2018.1.1")
 sha512sums=('SKIP')
 
 build() {
   cd "$srcdir/allwpilib"
   ./gradlew build
-  ./gradlew wpilibcZip
-  ./gradlew doxygenZip
 }
 
 package() {
@@ -27,27 +25,33 @@ package() {
 
   mkdir -p $pkgdir/usr/${_target}/include
   mkdir -p $pkgdir/usr/${_target}/lib
+  mkdir -p $pkgdir/usr/include
+  mkdir -p $pkgdir/usr/lib
+
+  # ni-libraries
+  pushd ni-libraries/build/outputs > /dev/null
+  yes A | unzip -u -q nilibraries-classifier-headers.zip -d $pkgdir/usr/${_target}/include
+  yes A | unzip -u -q -j nilibraries-classifier-linuxathena.zip -d $pkgdir/usr/${_target}/lib
+  popd > /dev/null
 
   # HAL
-  pushd hal/build > /dev/null
-  unzip -u -q athena-runtime.zip include/* -d $pkgdir/usr/${_target}
-  unzip -u -q athena-runtime.zip lib/* -d $pkgdir/usr/${_target}
-  unzip -u -q hal.zip lib/* -d $pkgdir/usr/${_target}
+  pushd hal/build/outputs > /dev/null
+  unzip -u -q hal-headers.zip -d $pkgdir/usr/${_target}/include
+  unzip -u -q hal-headers.zip -d $pkgdir/usr/include
+  unzip -u -q -j zipcpphalAthena-classifier-linuxathena.zip -d $pkgdir/usr/${_target}/lib
+  unzip -u -q -j zipcpphalSim-classifier-linuxx86-64.zip -d $pkgdir/usr/lib
   popd > /dev/null
 
   # wpilibc
-  pushd wpilibc/build > /dev/null
-  unzip -u -q wpilibc.zip -d $pkgdir/usr/arm-frc-linux-gnueabi
-
-  mkdir -p $pkgdir/usr/${_target}/share/doc/wpilib
-  unzip -u -q distributions/wpilibc.zip -d $pkgdir/usr/${_target}/share/doc/wpilib
+  pushd wpilibc/build/outputs > /dev/null
+  unzip -u -q wpilibc-headers.zip -d $pkgdir/usr/${_target}/include
+  unzip -u -q wpilibc-headers.zip -d $pkgdir/usr/include
+  unzip -u -q -j zipcppwpilibc-classifier-linuxathena.zip -d $pkgdir/usr/${_target}/lib
+  unzip -u -q -j zipcppwpilibc-classifier-linuxx86-64.zip -d $pkgdir/usr/lib
   popd > /dev/null
+  cp wpilibc/build/libwpi.so $pkgdir/usr/${_target}/lib
 
-  # dependencies
-  pushd build/dependencies > /dev/null
-  cp -r cscore/include/* $pkgdir/usr/${_target}/include
-  cp -r cscore/lib/* $pkgdir/usr/${_target}/lib
-  popd > /dev/null
+  find $pkgdir -type f -name LICENSE.txt -exec rm {} \;
 
-  install -Dm644 license.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  install -Dm644 LICENSE.txt $pkgdir/usr/share/licenses/${_target}-wpilib/LICENSE
 }