From 5c96c91ada5687474939b1aaf96131d48ef84f42 Mon Sep 17 00:00:00 2001 From: idk Date: Sun, 23 Oct 2022 21:04:15 -0400 Subject: [PATCH] add icons to jpackages Former-commit-id: 11ce176ed5abfd69ee8a28daba7b429d555cc702 Former-commit-id: 04a837eb9232486ca590ae40cfb7e3599ac0c524 --- OSX.md | 9 +++++++-- debian.sh | 1 + fedora-docker.sh | 1 + osx-dmg.sh | 1 + windows-exe.sh | 1 + windows-portable.sh | 1 + windows.sh | 1 + 7 files changed, 13 insertions(+), 2 deletions(-) diff --git a/OSX.md b/OSX.md index fecd122..c71c60c 100644 --- a/OSX.md +++ b/OSX.md @@ -8,10 +8,15 @@ packages. You can use the `.jar` file with any Java greater than Java 8. Building a `jpackage` --------------------- -In order to build a `jpackage`, install at least Java 17. +In order to build a `jpackage`, install at least Java 17. To set up Java +17 and configure it to be the Java used by the system for the rest of the +session, use these commands: ```sh brew install openjdk@17 sudo ln -sfn /usr/local/opt/openjdk/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk.jdk export JAVA_HOME=`/usr/libexec/java_home -v 17` -``` \ No newline at end of file +``` + +Once you're finished, run `./osx-dmg.sh` in the repository root to produce a +`.dmg` package. \ No newline at end of file diff --git a/debian.sh b/debian.sh index ce6f5e0..7dde21d 100755 --- a/debian.sh +++ b/debian.sh @@ -10,6 +10,7 @@ jpackage --verbose \ --linux-shortcut \ --license-file LICENSE.md \ --name i2pbrowser \ + --icon src/icon.png \ --app-version "$GITHUB_TAG" \ --input src/build \ --main-jar i2pfirefox.jar \ diff --git a/fedora-docker.sh b/fedora-docker.sh index 4ed1c18..5b64cf5 100755 --- a/fedora-docker.sh +++ b/fedora-docker.sh @@ -22,6 +22,7 @@ jpackage --verbose \ --license-file LICENSE.md \ --name i2pbrowser \ --app-version "$GITHUB_TAG" \ + --icon src/icon.png \ --input src/build \ --main-jar i2pfirefox.jar \ --main-class net.i2p.i2pfirefox.I2PBrowser diff --git a/osx-dmg.sh b/osx-dmg.sh index a002b0d..2aee46c 100755 --- a/osx-dmg.sh +++ b/osx-dmg.sh @@ -5,6 +5,7 @@ jpackage \ --type dmg \ --name i2pbrowser \ --app-version "$GITHUB_TAG" \ + --icon src/icon.png \ --input src/build \ --main-jar i2pfirefox.jar \ --main-class net.i2p.i2pfirefox.I2PBrowser diff --git a/windows-exe.sh b/windows-exe.sh index 4065bd8..eb98033 100755 --- a/windows-exe.sh +++ b/windows-exe.sh @@ -11,6 +11,7 @@ jpackage \ --win-shortcut-prompt \ --win-per-user-install \ --license-file LICENSE.md \ + --icon src/icon.png \ --name i2pbrowser \ --app-version "$GITHUB_TAG" \ --input src/build \ diff --git a/windows-portable.sh b/windows-portable.sh index e953cf2..fbb0995 100755 --- a/windows-portable.sh +++ b/windows-portable.sh @@ -11,6 +11,7 @@ jpackage \ --input src/build \ --main-jar i2pfirefox.jar \ --resource-dir tmp \ + --icon src/icon.png \ --main-class net.i2p.i2pfirefox.I2PBrowser rm -rf tmp cp -v LICENSE.md i2pbrowser-portable/LICENSE.md diff --git a/windows.sh b/windows.sh index 7da8bc1..382a076 100755 --- a/windows.sh +++ b/windows.sh @@ -11,6 +11,7 @@ jpackage \ --win-shortcut-prompt \ --win-per-user-install \ --license-file LICENSE.md \ + --icon src/icon.png \ --name i2pbrowser \ --app-version "$GITHUB_TAG" \ --input src/build \