Add JDK & JRE to site packages

This commit is contained in:
Sibo Van Gool 2023-11-21 13:20:46 +01:00
parent 9359cbc8ee
commit 868fd13a2c

View File

@ -34,7 +34,6 @@ architectures:
- build-on: [armhf] - build-on: [armhf]
- build-on: [ppc64el] - build-on: [ppc64el]
- build-on: [s390x] - build-on: [s390x]
- build-on: [i386]
apps: apps:
openrocket: openrocket:
@ -48,7 +47,7 @@ apps:
- dot-java-user-prefs-openrocket - dot-java-user-prefs-openrocket
- dot-openrocket - dot-openrocket
environment: environment:
JAVA_HOME: "$SNAP/usr/lib/jvm/java-17-openjdk-amd64" JAVA_HOME: "$SNAP/usr/lib/jvm/java-17-openjdk-$CRAFT_TARGET_ARCH"
parts: parts:
openrocket: openrocket:
@ -81,11 +80,10 @@ parts:
VERSION=$(cat core/resources/build.properties | awk -F'=' '/build\.version/ { print $2 }') VERSION=$(cat core/resources/build.properties | awk -F'=' '/build\.version/ { print $2 }')
craftctl set version="$VERSION" craftctl set version="$VERSION"
override-build: | override-build: |
export JAVA_HOME=$SNAP/usr/lib/jvm/java-17-openjdk-amd64
export PATH=$JAVA_HOME/bin:$PATH
craftctl default craftctl default
mv swing/build/jar/OpenRocket.jar $CRAFT_PART_INSTALL/OpenRocket.jar mv swing/build/jar/OpenRocket.jar $CRAFT_PART_INSTALL/OpenRocket.jar
stage-packages: stage-packages:
- openjdk-17-jdk
- openjdk-17-jre - openjdk-17-jre
- ca-certificates - ca-certificates
- ca-certificates-java - ca-certificates-java