summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Baxmann2019-11-14 19:42:21 +0100
committerKevin Baxmann2019-11-14 19:42:21 +0100
commit97352f9a4fa21454160e11a4e89bb48f51e5ebc8 (patch)
treee17cd0876f523c3f110f546c78cac4fed6254f3d
parentc6c6ef67d03e239c665004267bb133f8d3829d2b (diff)
downloadaur-97352f9a4fa21454160e11a4e89bb48f51e5ebc8.tar.gz
Show incompatible jdk during build warning and remove makedep
-rw-r--r--.SRCINFO3
-rw-r--r--.gitignore3
-rw-r--r--PKGBUILD19
3 files changed, 21 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f1444e380980..beef49a5c0b1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
pkgbase = micronaut
pkgdesc = Application Framework
pkgver = 1.2.6
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/micronaut-projects/micronaut-core
arch = x86_64
license = Apache
depends = java-environment>=8
- makedepends = java-environment<11
source = https://github.com/micronaut-projects/micronaut-core/archive/v1.2.6.tar.gz
sha512sums = 385376e592b8bd3d31ec2df2023ba219c01b80cbb1e6d098a40d8dceba671bb9ba70d2dbfc3223f33b54fecbe4bfe3f3ca0293d8a7d427eae131983f18fa44c9
diff --git a/.gitignore b/.gitignore
index 9243f1d9a63f..d6640dd76b9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
/src
/*.tar.gz
+/*.tar.xz
+/.gradle
+/pkg
diff --git a/PKGBUILD b/PKGBUILD
index ed6169849b47..d470da3de75a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,17 +4,32 @@
pkgname=micronaut
pkgver=1.2.6
-pkgrel=1
+pkgrel=2
pkgdesc="Application Framework"
arch=('x86_64')
url="https://github.com/micronaut-projects/micronaut-core"
license=(Apache)
depends=('java-environment>=8')
-makedepends=('java-environment<11')
source=(https://github.com/micronaut-projects/micronaut-core/archive/v${pkgver}.tar.gz)
sha512sums=('385376e592b8bd3d31ec2df2023ba219c01b80cbb1e6d098a40d8dceba671bb9ba70d2dbfc3223f33b54fecbe4bfe3f3ca0293d8a7d427eae131983f18fa44c9')
build() {
+
+ function build_failed {
+ if [ "$?" != "0" ]; then
+ tput bold
+ echo
+ echo "Building may have failed due to an incompatible JDK."
+ echo "Please set JAVA_HOME to a JDK compatible with gradle 4.6."
+ echo "(e.g. install 'jdk8-openjdk' and run 'archlinux-java set java-8-openjdk')"
+ echo "After building the package you may set it back to a newer version"
+ echo
+ tput sgr0
+ fi
+ }
+
+ trap build_failed EXIT
+
cd "$srcdir/micronaut-core-$pkgver"
./gradlew cli:fatJar
}