Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Changed to ZuluFX JRE. Removed Runtime plugin as it's not longer used
- Loading branch information
Showing
11 changed files
with
99 additions
and
271 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,43 +1,21 @@ | ||
| String.metaClass.encodeURL = { | ||
| java.net.URLEncoder.encode(delegate, "UTF-8") | ||
| } | ||
|
|
||
| String.metaClass.decodeURL = { | ||
| java.net.URLDecoder.decode(delegate, "UTF-8") | ||
| } | ||
|
|
||
| ext.jdkSource = 'https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download' | ||
| ext.jdkVersion = '11.0.6_10' | ||
| ext.jdkTag = jdkVersion.replace('_', '+').encodeURL() | ||
| ext.jdkFolder = "jdk-${jdkVersion.replace('_', '+')}" | ||
|
|
||
| ext.jmodsVersion = '11.0.2' | ||
| ext.jmodsSource = "https://gluonhq.com/download/javafx-${jmodsVersion.replace('.', '-')}-jmods" | ||
| ext.jreSource = 'https://cdn.azul.com/zulu/bin/' | ||
| ext.zuluVersion = '11.35.15' | ||
| ext.jreVersion = '11.0.5' | ||
| ext.jreFolder = "${buildDir}/jre" | ||
|
|
||
| ext.downloadLocation = new File(project.repositories.mavenLocal().url).getAbsolutePath(); | ||
|
|
||
| apply from: "${rootDir}/gradle/jre/linux.gradle" | ||
| apply from: "${rootDir}/gradle/jre/macos.gradle" | ||
| apply from: "${rootDir}/gradle/jre/windows.gradle" | ||
|
|
||
| runtime { | ||
| options = ['--compress', '2', '--no-header-files', '--no-man-pages'] | ||
| modules = jreModules | ||
| jreDir = file("${buildDir}/jre") | ||
|
|
||
| targetPlatform('linux-x64', "${project.ext.downloadLocation}/jre/linux-x64/${project.ext.jdkFolder}") | ||
| targetPlatform('windows-x64', "${project.ext.downloadLocation}/jre/windows-x64/${project.ext.jdkFolder}") | ||
| targetPlatform('windows-x86', "${project.ext.downloadLocation}/jre/windows-x86/${project.ext.jdkFolder}") | ||
| targetPlatform('macos', "${project.ext.downloadLocation}/jre/macos/${project.ext.jdkFolder}/Contents/Home") | ||
| } | ||
|
|
||
| task clearJREFolder(type: Delete) { | ||
| delete fileTree("${project.ext.downloadLocation}/jre") { | ||
| include '*.zip', '*.tar.gz' | ||
| } | ||
| } | ||
|
|
||
| task('downloadAndExtractJDKs', group: 'custom jre') { | ||
| dependsOn addJmodsToLinux64JDK, addJmodsToWindows64JDK, addJmodsToWindows86JDK, addJmodsToMacosJDK | ||
| task('downloadAndExtractJREs', group: 'custom jre') { | ||
| dependsOn downloadAndExtractLinuxJRE, downloadAndExtractWindowsJRE, downloadAndExtractMacosJRE | ||
| finalizedBy clearJREFolder | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,24 @@ | ||
| def jdkSource = project.ext.jdkSource | ||
| def jdkTag = project.ext.jdkTag | ||
| def jdkVersion = project.ext.jdkVersion | ||
| def jdkFolder = project.ext.jdkFolder | ||
| def downloadLocation = project.ext.downloadLocation | ||
| def jmodsSource = project.ext.jmodsSource | ||
| def jmodsVersion = project.ext.jmodsVersion | ||
|
|
||
| task downloadLinux64JDK(type: Download, group: 'custom jre') { | ||
| src "${jdkSource}/jdk-${jdkTag}/OpenJDK11U-jdk_x64_linux_hotspot_${jdkVersion}.tar.gz" | ||
| dest new File("${downloadLocation}/jre", 'linux-x64.tar.gz') | ||
| overwrite false | ||
| } | ||
| def jreSource = project.ext.jreSource | ||
| def zuluVersion = project.ext.zuluVersion | ||
| def jreVersion = project.ext.jreVersion | ||
| def jreFolder = project.ext.jreFolder | ||
|
|
||
| def filename = "zulu${zuluVersion}-ca-fx-jre${jreVersion}-linux_x64" | ||
|
|
||
| task downloadLinuxJmods(type: Download, group: 'custom jre') { | ||
| src "${jmodsSource}-linux" | ||
| dest new File("${downloadLocation}/jre", 'linux-jmods.zip') | ||
| task downloadLinuxJRE(type: Download, group: 'custom jre') { | ||
| src "${jreSource}/${filename}.tar.gz" | ||
| dest new File("${downloadLocation}/jre", 'linux.tar.gz') | ||
| overwrite false | ||
| } | ||
|
|
||
| task downloadAndExtractLinux64JDK(dependsOn: downloadLinux64JDK, type: Copy, group: 'custom jre') { | ||
| from tarTree(downloadLinux64JDK.dest) | ||
| task downloadAndExtractLinuxJRE(dependsOn: downloadLinuxJRE, type: Copy, group: 'custom jre') { | ||
| from tarTree(downloadLinuxJRE.dest) | ||
| into "${downloadLocation}/jre/linux-x64" | ||
| } | ||
|
|
||
| task downloadAndExtractLinuxJmods(dependsOn: downloadLinuxJmods, type: Copy, group: 'custom jre') { | ||
| from zipTree(downloadLinuxJmods.dest) | ||
| into "${downloadLocation}/jre/linux-jmods" | ||
| } | ||
|
|
||
| task addJmodsToLinux64JDK(dependsOn: [downloadAndExtractLinuxJmods, downloadAndExtractLinux64JDK], type: Copy, group: 'custom jre') { | ||
| from "${downloadAndExtractLinuxJmods.destinationDir}/javafx-jmods-${jmodsVersion}" | ||
| into "${downloadAndExtractLinux64JDK.destinationDir}/${jdkFolder}/jmods" | ||
| task copyLinuxJRE(type: Copy, group: 'custom jre') { | ||
| from "${downloadAndExtractLinuxJRE.destinationDir}/${filename}" | ||
| into "${jreFolder}/linux-x64" | ||
| } |
Oops, something went wrong.