From f99d7432279b9d75e155d4d1240f32833e80108f Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 29 Jan 2012 19:25:16 -0500 Subject: mv frc-{bin,libre}/smartdashboard-client --- frc-libre/smartdashboard-client/PKGBUILD | 50 ++++++++++++++++++++++ frc-libre/smartdashboard-client/SRCBUILD | 31 ++++++++++++++ frc-libre/smartdashboard-client/smartdashboard.sh | 9 ++++ frc-libre/smartdashboard/PKGBUILD | 14 ------ frc-notworking/smartdashboard-client/PKGBUILD | 30 ------------- .../smartdashboard-client/smartdashboard.sh | 9 ---- 6 files changed, 90 insertions(+), 53 deletions(-) create mode 100644 frc-libre/smartdashboard-client/PKGBUILD create mode 100644 frc-libre/smartdashboard-client/SRCBUILD create mode 100644 frc-libre/smartdashboard-client/smartdashboard.sh delete mode 100644 frc-notworking/smartdashboard-client/PKGBUILD delete mode 100644 frc-notworking/smartdashboard-client/smartdashboard.sh diff --git a/frc-libre/smartdashboard-client/PKGBUILD b/frc-libre/smartdashboard-client/PKGBUILD new file mode 100644 index 0000000..5f7d699 --- /dev/null +++ b/frc-libre/smartdashboard-client/PKGBUILD @@ -0,0 +1,50 @@ +# Maintainer: Luke Shumaker + +pkgname=smartdashboard-client +pkgver=2012 +pkgrel=1 +pkgdesc='This is the platform independent SmartDashboard jar file.' +arch=any +url="http://firstforge.wpi.edu/sf/projects/smartdashboard" +license=unknown +groups=(frc) +depends=(java-runtime jcommon jfreechart wpilibj-networktable-client junit) +source=( + "https://gitorious.org/absfrc/sources/blobs/raw/master/$pkgname-$pkgver-$pkgrel-any.src.tar.xz" + smartdashboard.sh +) + +build() { + cd "$srcdir" + cp -r "smartdashboard$pkgver" "smartdashboard$pkgver-build" + cd "smartdashboard$pkgver-build" + + ln -s /usr/share/java/wpilibj/NetworkTable_Client.jar lib + ln -s /usr/share/java/jcommon.jar lib + ln -s /usr/share/java/jfreechart.jar lib + ln -s /usr/share/java/junit.jar lib + ant jar +} + +package() { + install -d "$pkgdir/usr/share/smartdashboard/lib" + install -d "$pkgdir/usr/share/smartdashboard/extensions/lib" + + cd "$srcdir" + cp -r "smartdashboard$pkgver" "$pkgdir/usr/share/smartdashboard/src" + install -m755 -D smartdashboard.sh "$pkgdir/usr/bin/smartdashboard" + + cd "smartdashboard$pkgver-build" + install -d "$pkgdir/usr/share/smartdashboard" + install -m644 build/jar/SmartDashboard.jar "$pkgdir/usr/share/smartdashboard" + + + cd "$pkgdir/usr/share/smartdashboard/lib" + ln -s /usr/share/java/wpilibj/NetworkTable_Client.jar . + ln -s /usr/share/java/jcommon.jar . + ln -s /usr/share/java/jfreechart.jar . + ln -s /usr/share/java/junit.jar . +} + +md5sums=('8f69a9db66c5d73042e3dedf54228c5d' + 'a278b2e86bd4d732e86ac9e084f5ec4d') diff --git a/frc-libre/smartdashboard-client/SRCBUILD b/frc-libre/smartdashboard-client/SRCBUILD new file mode 100644 index 0000000..09e6dc0 --- /dev/null +++ b/frc-libre/smartdashboard-client/SRCBUILD @@ -0,0 +1,31 @@ +# Maintainer: Luke Shumaker + +pkgname=smartdashboard-client +pkgver=2012 +pkgrel=1 +pkgdesc='This is the platform independent SmartDashboard jar file.' +arch=any +url="http://firstforge.wpi.edu/sf/projects/smartdashboard" +license=unknown +groups=(frc) +source=( + 'SmartDashboard2012-src-netbeans.zip::http://firstforge.wpi.edu/sf/frs/do/downloadFile/projects.smartdashboard/frs.smartdashboard_client_0_5a1.smartdashboard_client_2012/frs1360?dl=1' +) + +build() { + cd "$srcdir/smartdashboard2012" + msg "Removing bogus directories..." + rm -rfv CopyLibs junit junit_4 + msg "Removing sample save files..." + rm -v customSave *.log lol.xml lol2.xml + msg "Removing precompiled binaries..." + rm -rfv lib/* +} + +package() { + PKGEXT=${SRCEXT} + PKGDEST=${SRCDEST} + cp -a "${srcdir}/smartdashboard2012" "${pkgdir}/" +} + +md5sums=('174b02a7e6b4e5bd6301a1afb88c5be6') diff --git a/frc-libre/smartdashboard-client/smartdashboard.sh b/frc-libre/smartdashboard-client/smartdashboard.sh new file mode 100644 index 0000000..4378584 --- /dev/null +++ b/frc-libre/smartdashboard-client/smartdashboard.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +cd /usr/share/smartdashboard + +if [ "`whoami`" == Driver ]; then + java -jar SmartDashboard.jar competition +else + java -jar SmartDashboard.jar +fi diff --git a/frc-libre/smartdashboard/PKGBUILD b/frc-libre/smartdashboard/PKGBUILD index b5356b5..eeca199 100644 --- a/frc-libre/smartdashboard/PKGBUILD +++ b/frc-libre/smartdashboard/PKGBUILD @@ -11,18 +11,4 @@ groups=(frc) depends=( smartdashboard-client smartdashboard-extension-wpicameraextension - wpilibj-networktable-client - - junit - jcommon - jfreechart ) - -package() { - install -d "$pkgdir/usr/share/smartdashboard/lib" - cd "$pkgdir/usr/share/smartdashboard/lib" - ln -s /usr/share/wpilibj/NetworkTable_Client.jar . - ln -s /usr/share/java/jcommon.jar . - ln -s /usr/share/java/jfreechart.jar . - ln -s /usr/share/java/junit.jar . -} diff --git a/frc-notworking/smartdashboard-client/PKGBUILD b/frc-notworking/smartdashboard-client/PKGBUILD deleted file mode 100644 index 28d5b71..0000000 --- a/frc-notworking/smartdashboard-client/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# Maintainer: Luke Shumaker - -pkgname=smartdashboard-client -pkgver=2012 -pkgrel=1 -pkgdesc='This is the platform independent SmartDashboard jar file.' -arch=any -url="http://firstforge.wpi.edu/sf/projects/smartdashboard" -license=unknown -groups=(frc) -depends=(java-runtime) -source=( - 'SmartDashboard2012-src-netbeans.zip::http://firstforge.wpi.edu/sf/frs/do/downloadFile/projects.smartdashboard/frs.smartdashboard_client_0_5a1.smartdashboard_client_2012/frs1360?dl=1' - smartdashboard.sh -) - -build() { - cd "$srcdir/smartdashboard2012" - ant -} - -package() { - cd "$srcdir" - - install -m644 -D SmartDashboard2012.jar "$pkgdir/usr/share/smartdashboard/SmartDashboard.jar" - install -m755 -D smartdashboard.sh "$pkgdir/usr/bin/smartdashboard" -} - -md5sums=('174b02a7e6b4e5bd6301a1afb88c5be6' - 'a278b2e86bd4d732e86ac9e084f5ec4d') diff --git a/frc-notworking/smartdashboard-client/smartdashboard.sh b/frc-notworking/smartdashboard-client/smartdashboard.sh deleted file mode 100644 index 4378584..0000000 --- a/frc-notworking/smartdashboard-client/smartdashboard.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -cd /usr/share/smartdashboard - -if [ "`whoami`" == Driver ]; then - java -jar SmartDashboard.jar competition -else - java -jar SmartDashboard.jar -fi -- cgit v1.2.3-2-g168b