Skip to content

Commit

Permalink
Disable jfx builds on x64 for testing
Browse files Browse the repository at this point in the history
  • Loading branch information
benty-amzn committed Feb 22, 2024
1 parent 04a806d commit 2aadfbe
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions installers/linux/universal/tar/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*/
configurations {
javafx
//javafx
}

dependencies {
javafx project(path: ':javafx', configuration: 'archives')
//javafx project(path: ':javafx', configuration: 'archives')
compile project(path: ':openjdksrc', configuration: 'archives')
}

Expand All @@ -48,7 +48,7 @@ task copySource(type: Exec) {
"${project.rootDir}/", buildRoot
}

task createJavafxOverlay(type: Copy) {
/*task createJavafxOverlay(type: Copy) {
dependsOn project.configurations.javafx
from tarTree(project.configurations.javafx.singleFile)
into "$buildDir/javafx"
Expand All @@ -57,7 +57,7 @@ task createJavafxOverlay(type: Copy) {
it.path = it.path.replace('rt/', 'jre/')
}
}
}
}*/

task configureBuild(type: Exec) {
dependsOn project.configurations.compile
Expand Down Expand Up @@ -94,9 +94,9 @@ task copyBuildResults() {
description 'Copy the JDK image and puts the results in build/.'
dependsOn executeBuild
dependsOn importAmazonCacerts
if (project.correttoArch == 'x64') {
/*if (project.correttoArch == 'x64') {
dependsOn createJavafxOverlay
}
}*/

doLast {
def destination = "${buildDir}/${project.correttoJdkArchiveName}"
Expand All @@ -115,12 +115,12 @@ task copyBuildResults() {
commandLine 'cp', '-Rf', '--parents', 'bin', 'include', 'jre', 'lib', 'man/man1', 'src.zip', destination
}

if (project.correttoArch == 'x64') {
/*if (project.correttoArch == 'x64') {
exec {
workingDir createJavafxOverlay.destinationDir
commandLine 'cp', '-Rf', '--parents', 'bin', 'jre', 'lib', 'man/man1', 'javafx-src.zip', destination
}
}
}*/
}
}

Expand Down

0 comments on commit 2aadfbe

Please sign in to comment.