Added simulation

2 files changed, 26 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 74ac1b5bf945..7dc3e73a416d 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 = 1461.e8e0527
+	pkgver = 1520.62a980d
 	pkgrel = 1
 	url = https://usfirst.collab.net/sf/projects/wpilib/
 	arch = i686
@@ -11,6 +11,7 @@ pkgbase = arm-frc-linux-gnueabi-wpilib-git
 	makedepends = java-environment=8
 	makedepends = doxygen
 	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 d2b3f6c3e910..3cccd267e6db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Tyler Veness <calcmogul at gmail dot com>
 
 pkgname=arm-frc-linux-gnueabi-wpilib-git
-pkgver=1461.e8e0527
+pkgver=1520.62a980d
 pkgrel=1
 pkgdesc="The WPI FIRST Robotics Competition C/C++ library for the arm-frc-linux-gnueabi toolchain"
 arch=(i686 x86_64)
@@ -10,7 +10,7 @@ provides=('arm-frc-linux-gnueabi-wpilib')
 url="https://usfirst.collab.net/sf/projects/wpilib/"
 license=('custom=FRC-BSD')
 groups=('frc-2016')
-depends=('arm-frc-linux-gnueabi-gcc')
+depends=('arm-frc-linux-gnueabi-gcc' 'gazebo')
 makedepends=('git' 'java-environment=8' 'doxygen')
 options=('!strip' 'libtool' 'staticlibs' '!emptydirs')
 source=("git+git://github.com/wpilibsuite/allwpilib")
@@ -23,17 +23,37 @@ pkgver() {
 
 build() {
   cd "$srcdir/allwpilib"
+  ./gradlew build -PmakeSim
   ./gradlew wpilibcZip
   ./gradlew doxygenZip
 }
 
 package() {
+  cd "$srcdir/allwpilib"
+
+  mkdir -p $pkgdir/usr/lib
+  mkdir -p $pkgdir/usr/include
+
+  # 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
-  yes A | unzip -d $pkgdir/usr/arm-frc-linux-gnueabi/share/doc/wpilib distributions/wpilibc.zip
 
-  install -Dm644 ../../license.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  install -Dm644 ../../license.txt $pkgdir/usr/share/licenses/arm-frc-linux-gnueabi-wpilib/LICENSE
 }
 # vim:set ts=2 sw=2 et: