summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiuyang liu2019-09-27 17:08:55 +0000
committerJiuyang liu2019-09-27 17:16:20 +0000
commit542bc952d55b02b8f51a58962ccd091f2ecee54e (patch)
tree5ed59cc94f1961886c6ea761b5085f7d4dffabb6
parent7355229a99825ce641cd9a868e57bd1f7291c703 (diff)
downloadaur-542bc952d55b02b8f51a58962ccd091f2ecee54e.tar.gz
update with clean install method
use mill as build system
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD19
-rw-r--r--diagrammer.sh3
3 files changed, 10 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index efc4394b3cff..00d88b5e5df3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,17 @@
pkgbase = diagrammer-git
pkgdesc = Provides dot visualizations of chisel/firrtl circuites
- pkgver = r80.aa501ef
+ pkgver = r81.18bae5b
pkgrel = 1
url = https://github.com/freechipsproject/diagrammer/
arch = any
license = BSD
- makedepends = sbt
+ makedepends = mill
makedepends = git
depends = java-environment
provides = diagrammer
conflicts = diagrammer
source = git+https://github.com/sequencer/diagrammer#branch=mill_fix
- source = diagrammer.sh
md5sums = SKIP
- md5sums = 73a883d13e66eae2255be88ae6eeab3f
pkgname = diagrammer-git
diff --git a/PKGBUILD b/PKGBUILD
index eb440703484c..541595ae64c9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_pkgname=diagrammer
_sbtver=2.12.7
pkgname=diagrammer-git
-pkgver=r80.aa501ef
+pkgver=r81.18bae5b
pkgrel=1
pkgdesc='Provides dot visualizations of chisel/firrtl circuites'
arch=('any')
@@ -12,11 +12,9 @@ license=('BSD')
provides=('diagrammer')
conflicts=('diagrammer')
depends=('java-environment')
-makedepends=('sbt' 'git')
-source=('git+https://github.com/sequencer/diagrammer#branch=mill_fix'
- 'diagrammer.sh')
-md5sums=('SKIP'
- '73a883d13e66eae2255be88ae6eeab3f')
+makedepends=('mill' 'git')
+source=('git+https://github.com/sequencer/diagrammer#branch=mill_fix')
+md5sums=('SKIP')
pkgver() {
cd $srcdir/$_pkgname
@@ -26,13 +24,12 @@ pkgver() {
build(){
cd $srcdir/$_pkgname
- mill "$_pkgname[$_sbtver].assembly"
+ mill "$_pkgname.assembly"
}
package() {
- install -d "$pkgdir"/usr/share/licenses/"$_pkgname"
- install -d "$pkgdir"/usr/bin
- install -Dm755 $srcdir/$_pkgname.sh $pkgdir/usr/bin/$_pkgname
- install -Dm755 $srcdir/$_pkgname/out/$_pkgname/$_sbtver/assembly/dest/out.jar $pkgdir/usr/share/scala/$_pkgname/$_pkgname.jar
+ install -d $pkgdir/usr/share/licenses/$_pkgname
+ install -d $pkgdir/usr/bin
+ install -Dm755 $srcdir/$_pkgname/out/$_pkgname/$_sbtver/assembly/dest/out.jar $pkgdir/usr/bin/$_pkgname
install -Dm644 $srcdir/$_pkgname/LICENSE.txt $pkgdir/usr/share/licenses/$_pkgname/LICENSE.txt
}
diff --git a/diagrammer.sh b/diagrammer.sh
deleted file mode 100644
index ea212704b167..000000000000
--- a/diagrammer.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-java -cp /usr/share/scala/diagrammer/diagrammer.jar dotvisualizer.FirrtlDiagrammer ${@:1}