ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-03-14 00:06:45 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
IgorNitto 2018-02-13 12:18:29 +00:00 committed by Stefano Franz
parent 18cc1bbb0c
commit d85b17c042
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
launcher/src/main/kotlin/net/corda/launcher/Settings.kt
View File

@ -23,9 +23,9 @@ object Settings {
load(FileInputStream(CORDA_RUNTIME_SETTINGS))
}
LIBPATH = Paths.get(settings.getProperty("libpath") ?: ".")
CLASSPATH = parseClasspath(settings)
PLUGINS = parsePlugins(settings)
LIBPATH = Paths.get(settings.getProperty("libpath") ?: ".")
}
private fun parseClasspath(config: Properties): List<URL> {

8
node/dist/build.gradle vendored
View File

@ -66,7 +66,7 @@ task buildLauncher(type: Exec, dependsOn: [copyLauncherLibs]) {
"-BjvmOptions=-javaagent:../../lib/quasar-core-${quasar_version}-jdk8.jar=${project(':node:capsule').quasarExcludeExpression}",
'-BuserJvmOptions=-Xmx=4g',
'-BuserJvmOptions=-XX\\:=+UseG1GC',
"-BjvmProperties=java.system.class.loader=${project(':launcher').loaderClassName}'}"
"-BjvmProperties=java.system.class.loader=${project(':launcher').loaderClassName}"
]
ext {
@ -96,7 +96,7 @@ task buildLauncher(type: Exec, dependsOn: [copyLauncherLibs]) {
'-name', 'launcher',
"-BmainJar=${project(':launcher').jar.archiveName}",
"-Bclasspath=${launcherClasspath.join(":")}",
'-appclass', '${project(\':launcher\').launcherClassName}',
'-appclass', "${project(':launcher').launcherClassName}",
'-srcdir', "$launcherLib"
] + srcfiles + extraArgs
}
@ -110,7 +110,7 @@ task buildLauncher(type: Exec, dependsOn: [copyLauncherLibs]) {
nodeClasspath.add(file.getName())
})
nodeClasspath.add(project(':node').jar.getName())
nodeClasspath.add(project(':node').jar.archivePath.getName())
new File("${launcherBinDir}/runtime.properties").text = [
"libpath=${libRelPath}",
@ -132,7 +132,7 @@ task buildNode(type: Copy, dependsOn: [buildLauncher, project(':docs').tasks['ma
into("lib")
}
from(project(':node').jar) {
from(project(':node').jar.archivePath) {
into("lib")
}