mirrors/ipscan
2
0
Fork 0
mirror of https://github.com/angryip/ipscan.git synced 2025-10-26 11:18:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

use jlink for macOS builds

Browse Source
This commit is contained in:
Anton Keks 2022-11-26 15:55:05 +02:00
parent bc0ee11b93
commit 62edc06eb1
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build.gradle
View File

@ -224,7 +224,9 @@ def macLauncher(def platform) {
ant.fileset(dir: "ext/mac-bundle")
}
ant.copy(file: "${dist}/${project.name}-${platform}-${version}.jar", todir: "${dist}/${name}.app/Contents/MacOS")
def target = "${dist}/${name}.app/Contents/MacOS"
ant.copy(file: "${dist}/${project.name}-${platform}-${version}.jar", todir: target)
jlink(target, "jre")
ant.replace(file: "${dist}/${name}.app/Contents/Info.plist") {
ant.replacefilter(token: "APPNAME", value: name)
@ -272,11 +274,11 @@ packageTask('macArm64') {
macLauncher("macArm64")
}
def jlink(String installerDir, String jrePath) {
def jreDir = new File(installerDir, jrePath)
def jlink(String target, String jrePath, String extraOpts = "") {
def jreDir = new File(target, jrePath)
if (!jreDir.exists()) {
jreDir.getParentFile().mkdirs()
exec("jlink --output $jrePath --vm=client --compress=2 --no-header-files --no-man-pages --strip-debug --add-modules " + javaModules.join(","), installerDir)
exec("jlink --output $jrePath $extraOpts --compress=2 --no-header-files --no-man-pages --strip-debug --add-modules " + javaModules.join(","), target)
ant.delete(dir: new File(jreDir, "legal"))
}
}
@ -292,7 +294,7 @@ task 'win-installer'(dependsOn: 'win64') {
ant.replacefilter(token: "VERSION_MINOR", value: "8")
ant.replacefilter(token: "VERSION", value: version)
}
jlink(installerDir, "AppFiles/jre")
jlink(installerDir, "AppFiles/jre", "--vm=client")
ant.copy(file: "resources/images/icon.ico", todir: "${installerDir}/AppFiles")
ant.copy(file: "LICENSE", tofile: "${installerDir}/AppFiles/license.txt")
ant.copy(file: "build/libs/${project.name}-win64-${version}.exe", tofile:"${installerDir}/AppFiles/ipscan.exe")

3
ext/mac-bundle/Angry IP Scanner.app/Contents/MacOS/ipscan
View File

@ -1,4 +1,3 @@
#!/bin/sh
BASEDIR=`dirname "$0"`
which java || osascript -e 'display notification "You need Java/OpenJDK 11 installed" with title "Angry IP Scanner"'
exec java --add-opens java.base/java.net=ALL-UNNAMED -XstartOnFirstThread -jar "$BASEDIR"/ipscan*.jar
exec "$BASEDIR/jre/bin/java" --add-opens java.base/java.net=ALL-UNNAMED -XstartOnFirstThread -jar "$BASEDIR"/ipscan*.jar