Updated to new build system

2 files changed, 38 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9c8ac1b982fe..97203a3a868d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = arm-frc-linux-gnueabi-wpilib-git
 	pkgdesc = The WPI FIRST Robotics Competition C/C++ library for the arm-frc-linux-gnueabi toolchain
-	pkgver = 1713.bc7ab176
+	pkgver = 1827.57ba5891
 	pkgrel = 1
-	url = https://usfirst.collab.net/sf/projects/wpilib/
+	url = https://github.com/wpilibsuite/allwpilib
 	arch = i686
 	arch = x86_64
 	license = custom=FRC-BSD
@@ -11,7 +11,6 @@ pkgbase = arm-frc-linux-gnueabi-wpilib-git
 	makedepends = doxygen
 	makedepends = unzip
 	depends = arm-frc-linux-gnueabi-gcc
-	depends = gazebo
 	provides = arm-frc-linux-gnueabi-wpilib
 	conflicts = arm-frc-linux-gnueabi-wpilib
 	options = !strip
diff --git a/PKGBUILD b/PKGBUILD
index 746eb29600de..1b841299d8ef 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,16 @@
 # Maintainer: Tyler Veness <calcmogul at gmail dot com>
 
-pkgname=arm-frc-linux-gnueabi-wpilib-git
-pkgver=1713.bc7ab176
+_target="arm-frc-linux-gnueabi"
+pkgname=${_target}-wpilib-git
+pkgver=1827.57ba5891
 pkgrel=1
 pkgdesc="The WPI FIRST Robotics Competition C/C++ library for the arm-frc-linux-gnueabi toolchain"
 arch=(i686 x86_64)
-conflicts=('arm-frc-linux-gnueabi-wpilib')
-provides=('arm-frc-linux-gnueabi-wpilib')
-url="https://usfirst.collab.net/sf/projects/wpilib/"
+conflicts=("${_target}-wpilib")
+provides=("${_target}-wpilib")
+url="https://github.com/wpilibsuite/allwpilib"
 license=('custom=FRC-BSD')
-depends=('arm-frc-linux-gnueabi-gcc' 'gazebo')
+depends=("${_target}-gcc")
 makedepends=('git' 'java-environment=8' 'doxygen' 'unzip')
 options=('!strip' 'libtool' 'staticlibs' '!emptydirs')
 source=("git+git://github.com/wpilibsuite/allwpilib")
@@ -22,36 +23,40 @@ pkgver() {
 
 build() {
   cd "$srcdir/allwpilib"
-  ./gradlew build -PmakeSim
-  ./gradlew wpilibcZip
-  ./gradlew doxygenZip
+  ./gradlew build
 }
 
 package() {
   cd "$srcdir/allwpilib"
 
-  mkdir -p $pkgdir/usr/lib
+  mkdir -p $pkgdir/usr/${_target}/include
+  mkdir -p $pkgdir/usr/${_target}/lib
   mkdir -p $pkgdir/usr/include
+  mkdir -p $pkgdir/usr/lib
 
-  # Simulation libs
-  cp build/install/simulation/lib/* $pkgdir/usr/lib
-  cp build/install/simulation/plugins/* $pkgdir/usr/lib
-  cp build/simulation/gz_msgs/libgz_msgs.so $pkgdir/usr/lib
-
-  # Simulation includes
-  cp -r wpilibc/shared/include/* wpilibc/sim/include/* $pkgdir/usr/include
-  mkdir -p $pkgdir/usr/include/simulation/gz_msgs
-  cp -r build/simulation/gz_msgs/generated/simulation/gz_msgs/*.h $pkgdir/usr/include/simulation/gz_msgs
-
-  # HAL includes
-  cp -r hal/include/* $pkgdir/usr/include
-
-  # Documentation
-  cd "$srcdir/allwpilib/wpilibc/build"
-  mkdir -p $pkgdir/usr/arm-frc-linux-gnueabi/share/doc/wpilib
-  yes A | unzip -d $pkgdir/usr/arm-frc-linux-gnueabi/share/doc/wpilib distributions/wpilibc.zip
-
-  yes A | unzip -d $pkgdir/usr/arm-frc-linux-gnueabi wpilibc.zip
-
-  install -Dm644 ../../license.txt $pkgdir/usr/share/licenses/arm-frc-linux-gnueabi-wpilib/LICENSE
+  # 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/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/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
+
+  find $pkgdir -type f -name license.txt -exec rm {} \;
+
+  install -Dm644 license.txt $pkgdir/usr/share/licenses/${_target}-wpilib/LICENSE
 }