Updated to unified repo layout

2 files changed, 13 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 944d48b6381f..364506eb64fc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = arm-frc-linux-gnueabi-wpilib-git
 	pkgdesc = The WPI FIRST Robotics Competition C/C++ library for the arm-frc-linux-gnueabi toolchain
-	pkgver = 2010.55b6764d
+	pkgver = 3016.1d6eb629a
 	pkgrel = 1
 	url = https://github.com/wpilibsuite/allwpilib
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 5345572d9ce0..ee594217e664 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _target="arm-frc-linux-gnueabi"
 pkgname=${_target}-wpilib-git
-pkgver=2010.55b6764d
+pkgver=3016.1d6eb629a
 pkgrel=1
 pkgdesc="The WPI FIRST Robotics Competition C/C++ library for the arm-frc-linux-gnueabi toolchain"
 arch=(i686 x86_64)
@@ -36,26 +36,26 @@ package() {
 
   # 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
+  yes A | unzip -u -q _GROUP_edu_wpi_first_ni-libraries_ID_ni-libraries_CLS-headers.zip -d $pkgdir/usr/${_target}/include
+  yes A | unzip -u -q -j _GROUP_edu_wpi_first_ni-libraries_ID_ni-libraries_CLS-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
+  unzip -u -q _GROUP_edu_wpi_first_hal_ID_hal-cpp_CLS-headers.zip -d $pkgdir/usr/${_target}/include
+  unzip -u -q _GROUP_edu_wpi_first_hal_ID_hal-cpp_CLS-headers.zip -d $pkgdir/usr/include
+  unzip -u -q -j _M__GROUP_edu_wpi_first_hal_ID_hal-cpp_CLS-linuxathena.zip -d $pkgdir/usr/${_target}/lib
+  unzip -u -q -j _M__GROUP_edu_wpi_first_hal_ID_hal-cpp_CLS-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
+  unzip -u -q _GROUP_edu_wpi_first_wpilibc_ID_wpilibc_CLS-headers.zip -d $pkgdir/usr/${_target}/include
+  unzip -u -q _GROUP_edu_wpi_first_wpilibc_ID_wpilibc_CLS-headers.zip -d $pkgdir/usr/include
+  unzip -u -q -j _GROUP_edu_wpi_first_wpilibc_ID_wpilibc-linkscripts_CLS-linuxathena.zip -d $pkgdir/usr/${_target}/lib
+  unzip -u -q -j _M__GROUP_edu_wpi_first_wpilibc_ID_wpilibc_CLS-linuxathena.zip -d $pkgdir/usr/${_target}/lib
+  unzip -u -q -j _M__GROUP_edu_wpi_first_wpilibc_ID_wpilibc_CLS-linuxx86-64.zip -d $pkgdir/usr/lib
   popd > /dev/null
-  cp wpilibc/build/libwpi.so $pkgdir/usr/${_target}/lib
 
   find $pkgdir -type f -name LICENSE.txt -exec rm {} \;