This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-tools.git
commit 2f37acb09b9eb718303e7e5c937e51fd7c9bd835
Author: Laszlo Kishalmi <laszlo.kisha...@gmail.com>
AuthorDate: Fri Mar 1 23:05:20 2024 -0800
Upgraded to Ubuntu Core 22, and Snapcraft 8, kept only arm64
---
snap-packages/from-zip/build.xml | 4 ++--
snap-packages/from-zip/snapcraft-template.yaml | 16 ++++++++++------
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/snap-packages/from-zip/build.xml b/snap-packages/from-zip/build.xml
index cb28801..16093e8 100644
--- a/snap-packages/from-zip/build.xml
+++ b/snap-packages/from-zip/build.xml
@@ -125,14 +125,14 @@
<target name="snap-dev" depends="prepare-dev" unless="${has.dev.snap}">
<exec executable="snapcraft" dir="${dev.dir}">
- <arg value="snap"/>
+ <arg value="pack"/>
<arg value="--use-lxd"/>
</exec>
</target>
<target name="snap-rel" depends="prepare-rel" unless="${has.rel.snap}">
<exec executable="snapcraft" dir="${rel.dir}">
- <arg value="snap"/>
+ <arg value="pack"/>
<arg value="--use-lxd"/>
</exec>
</target>
diff --git a/snap-packages/from-zip/snapcraft-template.yaml
b/snap-packages/from-zip/snapcraft-template.yaml
index 560dfd4..8a27cc7 100644
--- a/snap-packages/from-zip/snapcraft-template.yaml
+++ b/snap-packages/from-zip/snapcraft-template.yaml
@@ -25,13 +25,17 @@ description: |@SNAP_DISCLAIMER@
It is free and open source and has a large community of users and developers
around the world.
- It requires Java 8 or later Java Development Kit installed.
+ It requires Java 11 or later Java Development Kit installed.
icon: snap/gui/frame512.png
confinement: classic
grade: @SNAP_GRADE@
-base: core20
-architectures: [ amd64, arm64, armhf, i386 ]
+base: core22
+architectures:
+ - build-on: [ amd64 ]
+ build-for: [ amd64 ]
+ - build-on: [ amd64 ]
+ build-for: [ arm64 ]
compression: lzo
assumes:
- command-chain
@@ -44,8 +48,6 @@ parts:
build-attributes: [ no-patchelf ]
plugin: dump
source: @SNAP_SOURCE@
- filesets:
- netbeans: [ netbeans/*, -netbeans/*.built ]
override-build: |
mv netbeans $SNAPCRAFT_PART_INSTALL/netbeans
# Make the default cache and data directory relative to Snap user
directory
@@ -57,7 +59,9 @@ parts:
chmod a+r $SNAPCRAFT_PART_INSTALL/netbeans/etc/netbeans.conf
find $SNAPCRAFT_PART_INSTALL/netbeans -type f -name *.sh -exec chmod
a+rx {} \;
stage:
- - $netbeans
+ - netbeans/*
+ - -netbeans/*.built
+ - -netbeans/extra
launchers:
source: snap/local/launchers
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
