Updates gradle build to use version-specific root folder names for OS-specific image products. (#657)

This commit is contained in:
Denny Sheirer
2020-02-16 11:50:20 +00:00
committed by GitHub
parent 9af7a184ad
commit 53b44f44e3

View File

@@ -123,41 +123,47 @@ def jdk_osx_x86_64 = '/media/denny/WD250GB/java/bellsoft/osx-x64/jdk-13.0.1.jdk'
def jdk_windows_x86_64 = '/media/denny/WD250GB/java/bellsoft/windows-x64/jdk-13.0.1' def jdk_windows_x86_64 = '/media/denny/WD250GB/java/bellsoft/windows-x64/jdk-13.0.1'
def jdk_windows_x86_32 = '/media/denny/WD250GB/java/bellsoft/windows-x86/jdk-13.0.1' def jdk_windows_x86_32 = '/media/denny/WD250GB/java/bellsoft/windows-x86/jdk-13.0.1'
def directory_linux_x86_64 = new File(jdk_linux_x86_64) def file_jdk_linux_x86_64 = new File(jdk_linux_x86_64)
def directory_linux_x86_32 = new File(jdk_linux_x86_32) def file_jdk_linux_x86_32 = new File(jdk_linux_x86_32)
def directory_osx_x86_64 = new File(jdk_osx_x86_64) def file_jdk_osx_x86_64 = new File(jdk_osx_x86_64)
def directory_windows_x86_64 = new File(jdk_windows_x86_64) def file_jdk_windows_x86_64 = new File(jdk_windows_x86_64)
def directory_windows_x86_32 = new File(jdk_windows_x86_32) def file_jdk_windows_x86_32 = new File(jdk_windows_x86_32)
def hasTargetJdk = file_jdk_linux_x86_32.exists() ||
file_jdk_linux_x86_64.exists() ||
file_jdk_osx_x86_64.exists() ||
file_jdk_windows_x86_32.exists() ||
file_jdk_windows_x86_64.exists()
runtime { runtime {
if(directory_linux_x86_64.exists()) if(file_jdk_linux_x86_64.exists())
{ {
targetPlatform('linux-x86_64', jdk_linux_x86_64) targetPlatform('linux-x86_64-v' + version, jdk_linux_x86_64)
} }
if(directory_linux_x86_32.exists()) if(file_jdk_linux_x86_32.exists())
{ {
targetPlatform('linux-x86_32', jdk_linux_x86_32) targetPlatform('linux-x86_32-v' + version, jdk_linux_x86_32)
} }
if(directory_osx_x86_64.exists()) if(file_jdk_osx_x86_64.exists())
{ {
targetPlatform('osx-x86_64', jdk_osx_x86_64) targetPlatform('osx-x86_64-v' + version, jdk_osx_x86_64)
} }
if(directory_windows_x86_64.exists()) if(file_jdk_windows_x86_64.exists())
{ {
targetPlatform('windows-x86_64', jdk_windows_x86_64) targetPlatform('windows-x86_64-v' + version, jdk_windows_x86_64)
} }
if(directory_windows_x86_32.exists()) if(file_jdk_windows_x86_32.exists())
{ {
targetPlatform('windows-x86_32', jdk_windows_x86_32) targetPlatform('windows-x86_32-v' + version, jdk_windows_x86_32)
} }
options = ['--strip-debug', '--compress', '2', '--no-header-files', '--no-man-pages'] options = ['--strip-debug', '--compress', '2', '--no-header-files', '--no-man-pages']
modules = ['java.desktop', 'java.naming', 'jdk.unsupported', 'jdk.unsupported.desktop', 'java.net.http'] modules = ['java.desktop', 'java.naming', 'jdk.unsupported', 'jdk.unsupported.desktop', 'java.net.http']
imageZip = file("$buildDir/image/sdr-trunk-" + version + ".zip") imageZip = hasTargetJdk ? file("$buildDir/image/sdr-trunk.zip") : file("$buildDir/image/sdr-trunk-" + version + ".zip")
} }
/** /**
@@ -165,40 +171,39 @@ runtime {
*/ */
tasks.runtime.doFirst { tasks.runtime.doFirst {
if(!directory_linux_x86_64.exists()) if(!file_jdk_linux_x86_64.exists())
{ {
println("Skipping OS Image - Linux x86 64-bit JDK was not found at " + jdk_linux_x86_64) println("Skipping OS Image - Linux x86 64-bit JDK was not found at " + jdk_linux_x86_64)
} }
if(!directory_linux_x86_32.exists()) if(!file_jdk_linux_x86_32.exists())
{ {
println("Skipping OS Image - Linux x86 32-bit JDK was not found at " + jdk_linux_x86_32) println("Skipping OS Image - Linux x86 32-bit JDK was not found at " + jdk_linux_x86_32)
} }
if(!directory_osx_x86_64.exists()) if(!file_jdk_osx_x86_64.exists())
{ {
println("Skipping OS Image - OSX x86 64-bit JDK was not found at " + jdk_osx_x86_64); println("Skipping OS Image - OSX x86 64-bit JDK was not found at " + jdk_osx_x86_64);
} }
if(!directory_windows_x86_64.exists()) if(!file_jdk_windows_x86_64.exists())
{ {
println("Skipping OS Image - Windows x86 64-bit JDK was not found at " + jdk_windows_x86_64) println("Skipping OS Image - Windows x86 64-bit JDK was not found at " + jdk_windows_x86_64)
} }
if(!directory_windows_x86_32.exists()) if(!file_jdk_windows_x86_32.exists())
{ {
println("Skipping OS Image - Windows x86 32-bit JDK was not found at " + jdk_windows_x86_32) println("Skipping OS Image - Windows x86 32-bit JDK was not found at " + jdk_windows_x86_32)
} }
} }
/** /**
* Since we have to list each of the platform-specific JavaFX libraries as dependencies, * Remove unused JavaFX OS-specific libraries from each platform target directory
* remove them from each build image
*/ */
tasks.runtime.doLast { tasks.runtime.doLast {
delete(fileTree('build/image/sdr-trunk-linux-x86_64/lib').include { it.name ==~ /javafx.*-(win|mac)\.jar/ }) delete(fileTree('build/image/sdr-trunk-linux-x86_64-v' + version + '/lib').include { it.name ==~ /javafx.*-(win|mac)\.jar/ })
delete(fileTree('build/image/sdr-trunk-linux-x86_32/lib').include { it.name ==~ /javafx.*-(win|mac)\.jar/ }) delete(fileTree('build/image/sdr-trunk-linux-x86_32-v' + version + '/lib').include { it.name ==~ /javafx.*-(win|mac)\.jar/ })
delete(fileTree('build/image/sdr-trunk-osx-x86_64/lib').include { it.name ==~ /javafx.*-(win|linux)\.jar/ }) delete(fileTree('build/image/sdr-trunk-osx-x86_64-v' + version + '/lib').include { it.name ==~ /javafx.*-(win|linux)\.jar/ })
delete(fileTree('build/image/sdr-trunk-windows-x86_64/lib').include { it.name ==~ /javafx.*-(linux|mac)\.jar/ }) delete(fileTree('build/image/sdr-trunk-windows-x86_64-v' + version + '/lib').include { it.name ==~ /javafx.*-(linux|mac)\.jar/ })
delete(fileTree('build/image/sdr-trunk-windows-x86_32/lib').include { it.name ==~ /javafx.*-(linux|mac)\.jar/ }) delete(fileTree('build/image/sdr-trunk-windows-x86_32-v' + version + '/lib').include { it.name ==~ /javafx.*-(linux|mac)\.jar/ })
} }