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.git
The following commit(s) were added to refs/heads/master by this push: new 80bd73e [NETBEANS-2729] Make netbeans and netbeans-dev snap descriptor coexists. (#1329) 80bd73e is described below commit 80bd73e8771dd267916720a60f029ec8f85fbf1f Author: Laszlo Kishalmi <laszlo.kisha...@gmail.com> AuthorDate: Fri Jul 26 11:26:10 2019 -0700 [NETBEANS-2729] Make netbeans and netbeans-dev snap descriptor coexists. (#1329) * [NETBEANS-2729] Let's development and release snap descriptors co-exists --- .gitignore | 8 ++++---- .../snap/gui/netbeans.desktop | 0 .../{ => netbeans-dev_snap}/snap/snapcraft.yaml | 6 +++--- .../{ => netbeans_snap}/snap/gui/netbeans.desktop | 4 ++-- .../{ => netbeans_snap}/snap/snapcraft.yaml | 20 ++++++-------------- 5 files changed, 15 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index e403c51..73fa5b6 100644 --- a/.gitignore +++ b/.gitignore @@ -77,10 +77,10 @@ # Snapcraft Generated files # ####################### -/nbbuild/packaging/snap/.snapcraft/ -/nbbuild/packaging/parts/ -/nbbuild/packaging/prime/ -/nbbuild/packaging/stage/ +/nbbuild/packaging/*/snap/.snapcraft/ +/nbbuild/packaging/*/parts/ +/nbbuild/packaging/*/prime/ +/nbbuild/packaging/*/stage/ *.snap # Backup files diff --git a/nbbuild/packaging/snap/gui/netbeans.desktop b/nbbuild/packaging/netbeans-dev_snap/snap/gui/netbeans.desktop similarity index 100% copy from nbbuild/packaging/snap/gui/netbeans.desktop copy to nbbuild/packaging/netbeans-dev_snap/snap/gui/netbeans.desktop diff --git a/nbbuild/packaging/snap/snapcraft.yaml b/nbbuild/packaging/netbeans-dev_snap/snap/snapcraft.yaml similarity index 92% copy from nbbuild/packaging/snap/snapcraft.yaml copy to nbbuild/packaging/netbeans-dev_snap/snap/snapcraft.yaml index 5907760..42448c2 100644 --- a/nbbuild/packaging/snap/snapcraft.yaml +++ b/nbbuild/packaging/netbeans-dev_snap/snap/snapcraft.yaml @@ -35,7 +35,7 @@ description: | It requires Java 8 or later Java Development Kit installed. -icon: ../../platform/core.startup/src/org/netbeans/core/startup/frame512.png +icon: ../../../platform/core.startup/src/org/netbeans/core/startup/frame512.png confinement: classic grade: devel architectures: [ amd64 ] @@ -55,7 +55,7 @@ parts: - unzip - openjdk-8-jdk-headless plugin: ant - source: ../../ + source: ../../../ filesets: netbeans: [ netbeans/*, -netbeans/*.built ] override-build: | @@ -65,7 +65,7 @@ parts: # Make the default cache and data directory relative to Snap user directory sed -i 's/${HOME}\/.netbeans/${SNAP_USER_COMMON}\/data/' $SNAPCRAFT_PART_INSTALL/netbeans/bin/netbeans sed -i 's/${HOME}\/.cache\/netbeans/${SNAP_USER_COMMON}\/cache/' $SNAPCRAFT_PART_INSTALL/netbeans/bin/netbeans - sed -i 's/-J-Dapple.laf.useScreenMenuBar=true/-J-Dplugin.manager.install.global=false/' $SNAPCRAFT_PART_INSTALL/netbeans/etc/netbeans.conf + sed -i 's/-J-Dapple.laf.useScreenMenuBar=true/-J-Dplugin.manager.install.global=false -J-Dawt.useSystemAAFontSettings=on/' $SNAPCRAFT_PART_INSTALL/netbeans/etc/netbeans.conf stage: - $netbeans diff --git a/nbbuild/packaging/snap/gui/netbeans.desktop b/nbbuild/packaging/netbeans_snap/snap/gui/netbeans.desktop similarity index 93% rename from nbbuild/packaging/snap/gui/netbeans.desktop rename to nbbuild/packaging/netbeans_snap/snap/gui/netbeans.desktop index ad720d3..3fc953f 100644 --- a/nbbuild/packaging/snap/gui/netbeans.desktop +++ b/nbbuild/packaging/netbeans_snap/snap/gui/netbeans.desktop @@ -17,9 +17,9 @@ [Desktop Entry] Type=Application Encoding=UTF-8 -Name=Apache NetBeans (development) +Name=Apache NetBeans Comment=Apache NetBeans, The Smarter Way to Code -Exec=netbeans-dev.netbeans %F +Exec=netbeans %F Categories=Development;IDE Icon=${SNAP}/meta/gui/icon.png Terminal=false diff --git a/nbbuild/packaging/snap/snapcraft.yaml b/nbbuild/packaging/netbeans_snap/snap/snapcraft.yaml similarity index 78% rename from nbbuild/packaging/snap/snapcraft.yaml rename to nbbuild/packaging/netbeans_snap/snap/snapcraft.yaml index 5907760..52328d2 100644 --- a/nbbuild/packaging/snap/snapcraft.yaml +++ b/nbbuild/packaging/netbeans_snap/snap/snapcraft.yaml @@ -14,18 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -name: netbeans-dev +name: netbeans -summary: Apache NetBeans IDE (Development Build) +summary: Apache NetBeans IDE description: | - Disclaimer: - This is an in Development Build of Apache NetBeans IDE , this is for sole - testing purposes and shall be not considered as a release. - - This package is refreshed weekly automatically from the NetBeans master - repository. Take it as it is, there are no additional testing is being - made on these builds. - Apache NetBeans IDE lets you quickly and easily develop Java desktop, enterprise, and web applications, as well as HTML5 applications with HTML, JavaScript, and CSS. The IDE also provides a great set of tools for @@ -35,7 +27,7 @@ description: | It requires Java 8 or later Java Development Kit installed. -icon: ../../platform/core.startup/src/org/netbeans/core/startup/frame512.png +icon: ../../../platform/core.startup/src/org/netbeans/core/startup/frame512.png confinement: classic grade: devel architectures: [ amd64 ] @@ -47,7 +39,7 @@ parts: source: . override-pull: | snapcraftctl pull - snapcraftctl set-version "$(date +%Y%m%d)" + snapcraftctl set-version "${VERSION}" build: build-attributes: [ no-patchelf ] @@ -55,7 +47,7 @@ parts: - unzip - openjdk-8-jdk-headless plugin: ant - source: ../../ + source: ../../../ filesets: netbeans: [ netbeans/*, -netbeans/*.built ] override-build: | @@ -65,7 +57,7 @@ parts: # Make the default cache and data directory relative to Snap user directory sed -i 's/${HOME}\/.netbeans/${SNAP_USER_COMMON}\/data/' $SNAPCRAFT_PART_INSTALL/netbeans/bin/netbeans sed -i 's/${HOME}\/.cache\/netbeans/${SNAP_USER_COMMON}\/cache/' $SNAPCRAFT_PART_INSTALL/netbeans/bin/netbeans - sed -i 's/-J-Dapple.laf.useScreenMenuBar=true/-J-Dplugin.manager.install.global=false/' $SNAPCRAFT_PART_INSTALL/netbeans/etc/netbeans.conf + sed -i 's/-J-Dapple.laf.useScreenMenuBar=true/-J-Dplugin.manager.install.global=false -J-Dawt.useSystemAAFontSettings=on/' $SNAPCRAFT_PART_INSTALL/netbeans/etc/netbeans.conf stage: - $netbeans --------------------------------------------------------------------- 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