summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2020-04-27 11:52:15 -0400
committerJoe George <joe@zeroc.com>2020-04-27 11:56:34 -0400
commita7d6ea4fc0fbe51574dcdf8a22e7ebefb3bdda0c (patch)
tree6a28e8f24080a50b6af7e9c7e7005e40af860e02 /java
parentBug in optional test for tagged sequences - Close #803 (diff)
downloadice-a7d6ea4fc0fbe51574dcdf8a22e7ebefb3bdda0c.tar.bz2
ice-a7d6ea4fc0fbe51574dcdf8a22e7ebefb3bdda0c.tar.xz
ice-a7d6ea4fc0fbe51574dcdf8a22e7ebefb3bdda0c.zip
Remove IceGrid GUI macOS app bundling (#593)
AppBundler fails to launch apps with Java > 12. We'll instead manually package the app using Java 14's new jpackage separately outside of Gradle.
Diffstat (limited to 'java')
-rw-r--r--java/src/IceGridGUI/proguard-jar.gradle48
1 files changed, 2 insertions, 46 deletions
diff --git a/java/src/IceGridGUI/proguard-jar.gradle b/java/src/IceGridGUI/proguard-jar.gradle
index b22d3188d39..6abf68ca2c9 100644
--- a/java/src/IceGridGUI/proguard-jar.gradle
+++ b/java/src/IceGridGUI/proguard-jar.gradle
@@ -12,14 +12,6 @@ buildscript {
}
}
-configurations {
- bundleapp
-}
-
-dependencies {
- bundleapp 'com.panayotis:appbundler:1.1.0'
-}
-
if(JavaVersion.current() == JavaVersion.VERSION_1_8) {
['rt.jar',
'jsse.jar',
@@ -66,43 +58,7 @@ task copyJars(type: Copy, dependsOn: proguardJar) {
from new File("${libDir}/${jarName}")
into "${DESTDIR}${jarDir}"
}
-task install(dependsOn: copyJars)
-
-if(System.properties['os.name'] == "Mac OS X") {
- def appName = "IceGrid GUI"
- task bundleapp(dependsOn: proguardJar) {
- doLast {
- ant.taskdef(name: 'bundleapp',
- classname: 'com.oracle.appbundler.AppBundlerTask',
- classpath: configurations.bundleapp.asPath)
-
- ant.bundleapp(outputdirectory: "${libDir}",
- name: appName,
- displayname: appName,
- identifier: "com.zeroc.IceGridGUI",
- icon: "${projectDir}/src/main/resources/icons/icegrid.icns",
- shortversion: "${project.version}",
- applicationCategory: "public.app-category.utilities",
- mainclassname: "com.zeroc.IceGridGUI/Main",
- copyright: "Copyright © ZeroC, Inc. All rights reserved.") {
- classpath(file: "${libDir}/${jarName}") {}
- option(value: "-Dapple.laf.useScreenMenuBar=true") {}
- option(value: "-Dcom.apple.macos.use-file-dialog-packages=true") {}
- option(value: "-Dcom.apple.macos.useScreenMenuBar=true") {}
- option(value: "-Xdock:name=IceGrid GUI") {}
- option(value: "-Dcom.apple.mrj.application.apple.menu.about.name=${appName}") {}
- }
- }
- }
- assemble.dependsOn(bundleapp)
- task copyBundle(type: Copy, dependsOn: bundleapp) {
- from "${libDir}/${appName}.app"
- into "${DESTDIR}/${prefix}/${appName}.app"
- }
+task install(dependsOn: copyJars)
- install.dependsOn(copyBundle)
-}
-else {
- assemble.dependsOn(proguardJar)
-}
+assemble.dependsOn(proguardJar)