hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjustments to snap stuff

Browse Source 
Drop gcc as a build-dependency as LP#1883392 was fixed and delivered.
Additionally, change personal-files interfaces to be more explicit which
should allow for the snap store assertions which will possibly allow the
auto-connecting of the interfaces upon install for the OpenRocket app.

Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
This commit is contained in:
Billy Olsen 2020-07-26 10:06:10 -07:00
parent 0f2edc0024
commit 82fea89bf0
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
snap/local/launcher
View File

@ -8,11 +8,11 @@ export XDG_CURRENT_DESKTOP=GNOME
JAVA_OPTS="-Dsun.java2d.xrender=true -Dprism.useFontConfig=false -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel -Dswing.crossplatformlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel -Djava.io.tmpdir=$SNAP_USER_COMMON" JAVA_OPTS="-Dsun.java2d.xrender=true -Dprism.useFontConfig=false -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel -Dswing.crossplatformlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel -Djava.io.tmpdir=$SNAP_USER_COMMON"
if ! snapctl is-connected preferences; then if ! snapctl is-connected dot-java-user-prefs; then
JAVA_OPTS="$JAVA_OPTS -Djava.util.prefs.userRoot=$SNAP_USER_COMMON/" JAVA_OPTS="$JAVA_OPTS -Djava.util.prefs.userRoot=$SNAP_USER_COMMON/"
fi fi
if ! snapctl is-connected openrocket-db; then if ! snapctl is-connected dot-openrocket-db; then
JAVA_OPTS="$JAVA_OPTS -Duser.home=$SNAP_USER_COMMON/" JAVA_OPTS="$JAVA_OPTS -Duser.home=$SNAP_USER_COMMON/"
fi fi

15
snap/snapcraft.yaml
View File

@ -21,13 +21,13 @@ grade: stable
confinement: strict confinement: strict
plugs: plugs:
preferences: dot-java-user-prefs:
interface: personal-files interface: personal-files
read: read:
- $HOME/.java - $HOME/.java/.userPrefs/OpenRocket
write: write:
- $HOME/.java - $HOME/.java/.userPrefs/OpenRocket
openrocket-db: dot-openrocket-db:
interface: personal-files interface: personal-files
read: read:
- $HOME/.openrocket - $HOME/.openrocket
@ -44,8 +44,8 @@ apps:
- network - network
- cups-control - cups-control
- opengl - opengl
- preferences - dot-java-user-prefs
- openrocket-db - dot-openrocket-db
environment: environment:
JAVA_HOME: "$SNAP/usr/lib/jvm/java-11-openjdk-amd64" JAVA_HOME: "$SNAP/usr/lib/jvm/java-11-openjdk-amd64"
@ -75,9 +75,6 @@ parts:
override-build: | override-build: |
snapcraftctl build snapcraftctl build
mv swing/build/jar/OpenRocket.jar $SNAPCRAFT_PART_INSTALL/OpenRocket.jar mv swing/build/jar/OpenRocket.jar $SNAPCRAFT_PART_INSTALL/OpenRocket.jar
build-packages:
# Add gcc as a build package due to bug https://bugs.launchpad.net/snapcraft/+bug/1883392
- gcc
stage-packages: stage-packages:
- openjdk-11-jre - openjdk-11-jre
- ca-certificates - ca-certificates