3.0.0-1: major version update

2 files changed, 29 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 36e740ff3bac..bf005ae5181f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = bear
 	pkgdesc = tool to generate compilation database for clang tooling
-	pkgver = 2.4.4
+	pkgver = 3.0.0
 	pkgrel = 1
 	url = https://github.com/rizsotto/Bear
 	arch = i686
@@ -8,12 +8,16 @@ pkgbase = bear
 	license = GPL3
 	makedepends = cmake
 	makedepends = ninja
-	depends = python>=2.7
+	depends = python
+	depends = grpc
+	depends = fmt
+	depends = spdlog
+	depends = nlohmann-json
 	provides = bear
 	conflicts = bear
-	options = !ccache
-	source = Bear-2.4.4.tar.gz::https://github.com/rizsotto/Bear/archive/2.4.4.tar.gz
-	sha256sums = 5e95c9fe24714bcb98b858f0f0437aff76ad96b1d998940c0684c3a9d3920e82
+	options = !buildflags
+	source = Bear-3.0.0.tar.gz::https://github.com/rizsotto/Bear/archive/3.0.0.tar.gz
+	sha256sums = 7b68aad69e887d945ad20f8e9f3a8c33cf2d59cc80da7e52d931d8c685fe2f79
 
 pkgname = bear
 
diff --git a/PKGBUILD b/PKGBUILD
index 60201fe2a17a..fcc6b8238db4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,39 @@
-# Maintainer: Yiyao Yu <yuydevel at protonmail org>
+# Maintainer: Yiyao Yu <yuydevel at protonmail dot com>
 # Contributor: Moritz Lipp <mlq@pwmt.org>
 
 pkgname=bear
 _pkgname=Bear
-pkgver=2.4.4
+pkgver=3.0.0
 pkgrel=1
 pkgdesc="tool to generate compilation database for clang tooling"
 arch=('i686' 'x86_64')
 url="https://github.com/rizsotto/Bear"
 license=('GPL3')
 makedepends=('cmake' 'ninja')
-depends=('python>=2.7')
-options=('!ccache')
+depends=('python' 'grpc' 'fmt' 'spdlog' 'nlohmann-json')
+# Needed for cmake to build correctly
+options=('!buildflags')
 conflicts=('bear')
 provides=('bear')
 source=($_pkgname-$pkgver.tar.gz::https://github.com/rizsotto/$_pkgname/archive/$pkgver.tar.gz)
-sha256sums=('5e95c9fe24714bcb98b858f0f0437aff76ad96b1d998940c0684c3a9d3920e82')
-
-prepare() {
-	cd "$srcdir/$_pkgname-$pkgver"
-	mkdir -p build
-}
+sha256sums=('7b68aad69e887d945ad20f8e9f3a8c33cf2d59cc80da7e52d931d8c685fe2f79')
 
 build() {
-	cd "$srcdir/$_pkgname-$pkgver/build"
-	cmake \
-		-GNinja \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc \
-		-DCMAKE_BUILD_TYPE=plain \
-		-DCMAKE_INSTALL_LIBDIR=lib \
-		..
-	cmake --build . -- -v
-}
-
-check() {
-	cd "$srcdir/$_pkgname-$pkgver/build"
-	cmake --build . -- -v check
+    cd "$srcdir/$_pkgname-$pkgver"
+    cmake -DCMAKE_INSTALL_PREFIX=/usr \
+          -DENABLE_UNIT_TESTS=OFF \
+          -DENABLE_FUNC_TESTS=OFF \
+          .
+    make all
 }
 
 package() {
-	cd "$srcdir/$_pkgname-$pkgver/build"
-	DESTDIR="$pkgdir" cmake --build . -- -v install
+    cd "$srcdir/$_pkgname-$pkgver"
+    DESTDIR="$pkgdir" make install
+
+    # No idea why this is generated in the pkgbuild since it behaves normally
+    # outside of PKGBUILD. Dirty hack until I have time to fix this and
+    # the !buildflags issue
+    rm -r "$pkgdir/${srcdir:1}"
+    find "$pkgdir" -empty -type d -delete
 }