bazel-git finally works!

4 files changed, 42 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b3b44d6a58b7..14f65e9e0b40 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,28 @@
-# Generated by mksrcinfo v8
-# Mon Mar 21 12:03:22 UTC 2016
 pkgbase = bazel-git
 	pkgdesc = Correct, reproducible, and fast builds for everyone
-	pkgver = r4663.9bc5c34
+	pkgver = r24483.5e1847c23e
 	pkgrel = 1
 	url = http://bazel.io/
-	install = bazel.install
 	arch = i686
 	arch = x86_64
+	arch = armv6h
+	arch = armv7h
+	arch = aarch64
 	license = Apache
 	makedepends = git
 	makedepends = protobuf
-	depends = java-environment=8
+	makedepends = python
+	makedepends = bazel-bootstrap
+	depends = java-environment=11
 	depends = libarchive
 	depends = zip
 	depends = unzip
 	provides = bazel
+	options = !distcc
 	options = !strip
+	options = !ccache
 	source = bazel-git::git+https://github.com/google/bazel.git
-	md5sums = SKIP
+	sha512sums = SKIP
 
 pkgname = bazel-git
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..049e6c1d34bd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+/src
+/pkg
+/bazel-git
+*.xz
+*.tar.*
+*.pkg.*
+*.zip
+*.zip.sig
diff --git a/PKGBUILD b/PKGBUILD
index e93e26c0d983..75486d6b59d3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,42 @@
-# Maintainer: Adria Arrufat (archdria) <adria.arrufat+AUR@protonmail.ch>
-# Contributor: Simon Legner <Simon.Legner@gmail.com>
+# Maintainer: Kenneth Endfinger <kaendfinger@gmail.com>
 pkgname=bazel-git
-pkgver=r4663.9bc5c34
+pkgver=r24483.5e1847c23e
 pkgrel=1
 pkgdesc="Correct, reproducible, and fast builds for everyone"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
 url="http://bazel.io/"
 license=('Apache')
-depends=('java-environment=8' 'libarchive' 'zip' 'unzip')
+depends=('java-environment=11' 'libarchive' 'zip' 'unzip')
+makedepends=('git' 'protobuf' 'python' 'bazel-bootstrap')
+options=('!distcc' '!strip' '!ccache')
 provides=('bazel')
-makedepends=('git' 'protobuf')
-install=bazel.install
-options=('!strip')
-source=("$pkgname::git+https://github.com/google/bazel.git")
-md5sums=('SKIP')
+source=("${pkgname}::git+https://github.com/google/bazel.git")
+sha512sums=('SKIP')
 
 pkgver() {
-  cd "$pkgname"
+  cd "${pkgname}"
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 build() {
-  cd "$pkgname"
-  ./compile.sh
-  ./output/bazel build scripts:bazel-complete.bash
+  cd "${srcdir}/${pkgname}"
+
+  /opt/bazel-bootstrap/bin/bazel build //src:bazel --sandbox_writable_path "${HOME}/.ccache"
+  /opt/bazel-bootstrap/bin/bazel shutdown
+  ./bazel-bin/src/bazel build scripts:bazel-complete.bash
+  cd bazel-bin/src
+  ./bazel shutdown
 }
 
 package() {
-  install -Dm755 "$srcdir/$pkgname/output/bazel" "$pkgdir/usr/bin/bazel"
-  install -Dm755 "$srcdir/$pkgname/bazel-bin/scripts/bazel-complete.bash" "$pkgdir/etc/bash_completion.d/bazel-complete.bash"
-  mkdir -p "$pkgdir/opt/bazel/base_workspace"
+  cd "${srcdir}/${pkgname}"
+
+  install -Dm755 scripts/packages/bazel.sh "${pkgdir}/usr/bin/bazel"
+  install -Dm755 bazel-bin/src/bazel "${pkgdir}/usr/bin/bazel-real"
+  install -Dm644 bazel-bin/scripts/bazel-complete.bash "${pkgdir}/usr/share/bash-completion/completions/bazel"
+  install -Dm644 scripts/zsh_completion/_bazel "${pkgdir}/usr/share/zsh/site-functions/_bazel"
+  mkdir -p "${pkgdir}/opt/bazel"
   for d in examples third_party tools; do
-    cp -r "$srcdir/$pkgname/$d" "$pkgdir/opt/bazel/"
-    cd "$pkgdir/opt/bazel/base_workspace"
-    ln -s "/opt/bazel/$d" ./
+    cp -r "${d}" "${pkgdir}/opt/bazel/"
   done
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/bazel.install b/bazel.install
deleted file mode 100644
index ad0bc7367d6b..000000000000
--- a/bazel.install
+++ /dev/null
@@ -1,4 +0,0 @@
-post_install() {
-  echo '>>> To start a new project, type:'
-  echo '>>> $ cp -R /opt/bazel/base_workspace my_new_workspace'
-}