This is an automated email from the ASF dual-hosted git repository.

lkishalmi pushed a commit to branch snapcraft-core18
in repository https://gitbox.apache.org/repos/asf/netbeans.git

commit cf0ebbdefde57655d217aeb0b33f70af97c59a6f
Author: Laszlo Kishalmi <[email protected]>
AuthorDate: Mon Jun 7 11:18:07 2021 -0700

    Moved Snapcraft package to core18
---
 .../packaging/netbeans-dev_snap/snap/gui/frame512.png   | Bin 0 -> 20905 bytes
 nbbuild/packaging/netbeans-dev_snap/snap/snapcraft.yaml |  11 +++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/nbbuild/packaging/netbeans-dev_snap/snap/gui/frame512.png 
b/nbbuild/packaging/netbeans-dev_snap/snap/gui/frame512.png
new file mode 100644
index 0000000..2550364
Binary files /dev/null and 
b/nbbuild/packaging/netbeans-dev_snap/snap/gui/frame512.png differ
diff --git a/nbbuild/packaging/netbeans-dev_snap/snap/snapcraft.yaml 
b/nbbuild/packaging/netbeans-dev_snap/snap/snapcraft.yaml
index 51aad31..13ba521 100644
--- a/nbbuild/packaging/netbeans-dev_snap/snap/snapcraft.yaml
+++ b/nbbuild/packaging/netbeans-dev_snap/snap/snapcraft.yaml
@@ -35,9 +35,10 @@ description: |
   
   It requires Java 8 or later Java Development Kit installed.
 
-icon: ../../../platform/core.startup/src/org/netbeans/core/startup/frame512.png
+icon: snap/gui/frame512.png
 confinement: classic
 grade: devel
+base: core18
 architectures: [ amd64 ]
 adopt-info: netbeans-version
 
@@ -55,7 +56,8 @@ parts:
       - unzip
       - openjdk-11-jdk-headless
     plugin: ant
-    source: ../../../
+    source: https://github.com/apache/netbeans.git
+    source-branch: master
     filesets:
         netbeans: [ netbeans/*, -netbeans/*.built ]
     override-build: |
@@ -63,12 +65,13 @@ parts:
         ant -quiet -Djavac.compilerargs=-nowarn 
-Dbuild.compiler.deprecation=false -Dbuildnumber=$(date +%Y%m%d) 
-Dmetabuild.jsonurl=https://raw.githubusercontent.com/apache/netbeans-jenkins-lib/master/meta/netbeansrelease.json
         mv nbbuild/netbeans $SNAPCRAFT_PART_INSTALL/netbeans
         # Make the default cache and data directory relative to Snap user 
directory
-        sed -i 's/${HOME}\/.netbeans/${SNAP_USER_DATA}\/data/' 
$SNAPCRAFT_PART_INSTALL/netbeans/bin/netbeans
-        sed -i 's/${HOME}\/.cache\/netbeans/${SNAP_USER_DATA}\/cache/' 
$SNAPCRAFT_PART_INSTALL/netbeans/bin/netbeans
+        sed -i 's/${HOME}\/.netbeans/${SNAP_USER_DATA}/' 
$SNAPCRAFT_PART_INSTALL/netbeans/bin/netbeans
+        sed -i 
's/${HOME}\/.cache\/netbeans/${SNAP_USER_COMMON}\/${SNAP_REVISION}/' 
$SNAPCRAFT_PART_INSTALL/netbeans/bin/netbeans
         sed -i 's/"${DEFAULT_USERDIR_ROOT}\/.*"/"${DEFAULT_USERDIR_ROOT}"/g' 
$SNAPCRAFT_PART_INSTALL/netbeans/etc/netbeans.conf
         sed -i 's/"${DEFAULT_CACHEDIR_ROOT}\/.*"/"${DEFAULT_CACHEDIR_ROOT}"/g' 
$SNAPCRAFT_PART_INSTALL/netbeans/etc/netbeans.conf        
         sed -i 
's/-J-Dapple.laf.useScreenMenuBar=true/-J-Dplugin.manager.install.global=false/'
 $SNAPCRAFT_PART_INSTALL/netbeans/etc/netbeans.conf
         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
 

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists

Reply via email to