ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-05-29 13:44:25 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Comment which specific OpenJDK bug we are working around. (#1231)

Browse Source 
Use runtime configuration for the application's classpath.
Fix whitespace issues in build.gradle.
This commit is contained in:
Chris Rankin 2017-08-15 15:07:28 +01:00 committed by GitHub
parent 9149900938
commit ce0f931716
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/demobench/build.gradle
View File

@ -8,7 +8,7 @@ buildscript {
ext.pkg_source = "$buildDir/packagesrc" ext.pkg_source = "$buildDir/packagesrc"
ext.pkg_outDir = "$buildDir/javapackage" ext.pkg_outDir = "$buildDir/javapackage"
ext.dist_source = "$pkg_source/demobench-$version" ext.dist_source = "$pkg_source/demobench-$version"
ext.pkg_version = "$version".indexOf('-') >= 0 ? "$version".substring(0, "$version".indexOf('-')) : version ext.pkg_version = version.indexOf('-') >= 0 ? version.substring(0, version.indexOf('-')) : version
ext.pkg_macosxKeyUserName = 'R3CEV' ext.pkg_macosxKeyUserName = 'R3CEV'
repositories { repositories {
@ -25,8 +25,8 @@ evaluationDependsOn(':tools:explorer:capsule')
mainClassName = 'net.corda.demobench.DemoBench' mainClassName = 'net.corda.demobench.DemoBench'
applicationDefaultJvmArgs = [ applicationDefaultJvmArgs = [
'-Djava.util.logging.config.class=net.corda.demobench.config.LoggingConfig', '-Djava.util.logging.config.class=net.corda.demobench.config.LoggingConfig',
'-Dorg.jboss.logging.provider=slf4j' '-Dorg.jboss.logging.provider=slf4j'
] ]
repositories { repositories {
@ -78,7 +78,7 @@ jar {
manifest { manifest {
attributes( attributes(
'Main-Class': mainClassName, 'Main-Class': mainClassName,
'Class-Path': configurations.compile.collect { it.getName() }.join(' ') 'Class-Path': configurations.runtime.collect { it.getName() }.join(' ')
) )
} }
} }
@ -165,13 +165,14 @@ task javapackage(dependsOn: distZip) {
} }
ant.taskdef( ant.taskdef(
resource: 'com/sun/javafx/tools/ant/antlib.xml', resource: 'com/sun/javafx/tools/ant/antlib.xml',
classpath: "$pkg_source:$java_home/../lib/ant-javafx.jar" classpath: "$pkg_source:$java_home/../lib/ant-javafx.jar"
) )
ant.deploy(nativeBundles: packageType, outdir: pkg_outDir, outfile: 'DemoBench', verbose: 'true') { ant.deploy(nativeBundles: packageType, outdir: pkg_outDir, outfile: 'DemoBench', verbose: 'true') {
application(name: 'Corda DemoBench', version: pkg_version, mainClass: mainClassName) application(name: 'Corda DemoBench', version: pkg_version, mainClass: mainClassName)
info(title: 'Corda DemoBench', vendor: 'R3', description: 'A sales and educational tool for demonstrating Corda.') info(title: 'Corda DemoBench', vendor: 'R3', description: 'A sales and educational tool for demonstrating Corda.')
//noinspection GroovyAssignabilityCheck
resources { resources {
fileset(dir: "$dist_source/lib", type: 'jar') { fileset(dir: "$dist_source/lib", type: 'jar') {
include(name: '*.jar') include(name: '*.jar')
@ -199,7 +200,9 @@ task javapackage(dependsOn: distZip) {
bundleArgument(arg: 'mac.signing-key-user-name', value: pkg_macosxKeyUserName) bundleArgument(arg: 'mac.signing-key-user-name', value: pkg_macosxKeyUserName)
platform { platform {
//noinspection GroovyAssignabilityCheck
property(name: 'java.util.logging.config.class', value: 'net.corda.demobench.config.LoggingConfig') property(name: 'java.util.logging.config.class', value: 'net.corda.demobench.config.LoggingConfig')
//noinspection GroovyAssignabilityCheck
property(name: 'org.jboss.logging.provider', value: 'slf4j') property(name: 'org.jboss.logging.provider', value: 'slf4j')
} }

6
tools/demobench/package/bugfixes/apply.bat
View File

@ -19,6 +19,12 @@ if not exist %1 (
exit /b 1 exit /b 1
) )
rem Bugfixes:
rem =========
rem
rem sun.swing.JLightweightFrame:473
rem https://bugs.openjdk.java.net/browse/JDK-8185890
if exist "%BUILDDIR%" rmdir /s /q "%BUILDDIR%" if exist "%BUILDDIR%" rmdir /s /q "%BUILDDIR%"
mkdir "%BUILDDIR%" mkdir "%BUILDDIR%"

3
tools/demobench/package/bugfixes/apply.sh
View File

@ -20,8 +20,7 @@ fi
# ========= # =========
# #
# sun.swing.JLightweightFrame:473 # sun.swing.JLightweightFrame:473
# https://github.com/JetBrains/jdk8u_jdk/issues/6 # https://bugs.openjdk.java.net/browse/JDK-8185890
# https://github.com/JetBrains/jdk8u/issues/8
rm -rf $BUILDDIR && mkdir $BUILDDIR rm -rf $BUILDDIR && mkdir $BUILDDIR
if (javac -O -d $BUILDDIR $(find $SOURCEDIR -name "*.java")); then if (javac -O -d $BUILDDIR $(find $SOURCEDIR -name "*.java")); then