modernize for go and npm

3 files changed, 30 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 87165e13190b..6384031cec1d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = dcrdata
 	pkgdesc = Decred block explorer
-	pkgver = 1.3.0
+	pkgver = 6.1.0.beta
 	pkgrel = 1
-	url = https://explorer.dcrdata.org
+	url = https://dcrdata.decred.org
 	arch = aarch64
 	arch = armv6h
 	arch = armv7h
@@ -10,13 +10,13 @@ pkgbase = dcrdata
 	arch = x86_64
 	groups = decred
 	license = ISC
-	makedepends = dep
 	makedepends = git
 	makedepends = go
+	makedepends = nodejs
+	makedepends = npm
 	options = !strip
 	options = !emptydirs
-	source = dcrdata-1.3.0.tar.gz::https://codeload.github.com/decred/dcrdata/tar.gz/v1.3.0
-	sha256sums = d94b2f199b58c616a6bc31397a20ad61d8da87faa1dc63ac5017d88b131288e0
+	source = dcrdata-6.1.0.beta.tar.gz::https://codeload.github.com/decred/dcrdata/tar.gz/release-v6.1.0-beta
+	sha256sums = afc773bb582a3d0b2b4a26414e13cd3305dd5518c9d7d1d1b2ca2555bba7b45f
 
 pkgname = dcrdata
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..8ebfacab0c9f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+*
+!.SRCINFO
+!PKGBUILD
diff --git a/PKGBUILD b/PKGBUILD
index 51e0731f2b21..3767511648d9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,50 +1,48 @@
 # Maintainer: Andy Weidenbaum <archbaum@gmail.com>
 
 pkgname=dcrdata
-pkgver=1.3.0
+pkgver=6.1.0.beta
 pkgrel=1
 pkgdesc="Decred block explorer"
 arch=('aarch64' 'armv6h' 'armv7h' 'i686' 'x86_64')
-makedepends=('dep' 'git' 'go')
+makedepends=('git' 'go' 'nodejs' 'npm')
 groups=('decred')
-url="https://explorer.dcrdata.org"
+url="https://dcrdata.decred.org"
 license=('ISC')
 options=('!strip' '!emptydirs')
-source=($pkgname-$pkgver.tar.gz::https://codeload.github.com/decred/$pkgname/tar.gz/v$pkgver)
-sha256sums=('d94b2f199b58c616a6bc31397a20ad61d8da87faa1dc63ac5017d88b131288e0')
+source=($pkgname-$pkgver.tar.gz::https://codeload.github.com/decred/$pkgname/tar.gz/release-v6.1.0-beta)
+sha256sums=('afc773bb582a3d0b2b4a26414e13cd3305dd5518c9d7d1d1b2ca2555bba7b45f')
 
 prepare() {
-  export GOPATH="$srcdir"
-  mkdir -p "$GOPATH/src/github.com/decred"
-  cp -dpr --no-preserve=ownership "$srcdir/$pkgname-$pkgver" \
-    "$GOPATH/src/github.com/decred/dcrdata"
+  rm -rf "$srcdir/fresh"
+  cp -dpr --no-preserve=ownership "$srcdir/$pkgname-release-v6.1.0-beta" \
+    "$srcdir/fresh"
 }
 
 build() {
-  export GOPATH="$srcdir"
-
   msg2 'Building dcrdata and dependencies...'
-  cd "$GOPATH/src/github.com/decred/dcrdata"
-  dep ensure -v
-  go install . ./cmd/...
+  export GO111MODULE=on
+  cd "$srcdir/fresh/cmd/dcrdata"
+  go build -trimpath -v -ldflags "-s -w"  .
+  npm clean-install
+  npm run build
 }
 
 package() {
   msg2 'Installing license...'
-  install -Dm 644 "$srcdir/src/github.com/decred/dcrdata/LICENSE" \
+  install -Dm 644 "$srcdir/fresh/LICENSE" \
           -t "$pkgdir/usr/share/licenses/dcrdata"
 
   msg2 'Installing docs...'
-  for _doc in CODE_OF_CONDUCT \
-              CONTRIBUTING.md \
-              README.md \
-              sample-dcrdata.conf \
-              sample-nginx.conf \
-              sample-rate_limiting.html; do
-    install -Dm 644 "$srcdir/src/github.com/decred/dcrdata/$_doc" \
+  for _doc in README.md \
+              cmd/dcrdata/sample-dcrdata.conf \
+              cmd/dcrdata/sample-nginx.conf \
+              cmd/dcrdata/sample-rate_limiting.html; do
+    install -Dm 644 "$srcdir/fresh/$_doc" \
             -t "$pkgdir/usr/share/doc/dcrdata"
   done
 
   msg2 'Installing...'
-  install -Dm 755 "$srcdir/bin"/* -t "$pkgdir/usr/bin"
+  install -Dm 755 "$srcdir/fresh/cmd/dcrdata/dcrdata" -t "$pkgdir/usr/bin"
+  cp -R "$srcdir/fresh/cmd/dcrdata/views" "$srcdir/fresh/cmd/dcrdata/public" "$pkgdir/usr/bin"
 }