ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-24 07:06:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixed broken NodeRunner on MacOS

Browse Source
This commit is contained in:
Shams Asari 2017-04-10 13:45:40 +01:00
parent 1a88ca4bee
commit b1e3a2b4e5
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -26,7 +26,7 @@ buildscript {
ext.quickcheck_version = '0.7' ext.quickcheck_version = '0.7'
ext.okhttp_version = '3.5.0' ext.okhttp_version = '3.5.0'
ext.netty_version = '4.1.5.Final' ext.netty_version = '4.1.5.Final'
ext.typesafe_config_version = '1.3.1' ext.typesafe_config_version = constants.getProperty("typesafeConfigVersion")
ext.fileupload_version = '1.3.2' ext.fileupload_version = '1.3.2'
ext.junit_version = '4.12' ext.junit_version = '4.12'
ext.mockito_version = '1.10.19' ext.mockito_version = '1.10.19'

3
constants.properties
View File

@ -1,3 +1,4 @@
gradlePluginsVersion=0.10.5 gradlePluginsVersion=0.11.0
kotlinVersion=1.1.1 kotlinVersion=1.1.1
guavaVersion=21.0 guavaVersion=21.0
typesafeConfigVersion=1.3.1

4
gradle-plugins/cordformation/build.gradle
View File

@ -4,6 +4,7 @@ buildscript {
file("$projectDir/../../constants.properties").withInputStream { constants.load(it) } file("$projectDir/../../constants.properties").withInputStream { constants.load(it) }
ext.kotlin_version = constants.getProperty("kotlinVersion") ext.kotlin_version = constants.getProperty("kotlinVersion")
ext.typesafe_config_version = constants.getProperty("typesafeConfigVersion")
repositories { repositories {
mavenCentral() mavenCentral()
@ -45,8 +46,7 @@ dependencies {
noderunner "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" noderunner "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
// TypeSafe Config: for simple and human friendly config files. // TypeSafe Config: for simple and human friendly config files.
// TODO: Add a common versions file between Corda and gradle plugins to de-duplicate this version number compile "com.typesafe:config:$typesafe_config_version"
compile "com.typesafe:config:1.3.1"
} }
task createNodeRunner(type: Jar, dependsOn: [classes]) { task createNodeRunner(type: Jar, dependsOn: [classes]) {

4
gradle-plugins/cordformation/src/noderunner/kotlin/net/corda/plugins/NodeRunner.kt
View File

@ -28,7 +28,7 @@ val debugPortAlloc: IncrementalPortAllocator = IncrementalPortAllocator()
fun main(args: Array<String>) { fun main(args: Array<String>) {
val startedProcesses = mutableListOf<Process>() val startedProcesses = mutableListOf<Process>()
val headless = (GraphicsEnvironment.isHeadless() || (!args.isEmpty() && (args[0] == HEADLESS_FLAG))) val headless = GraphicsEnvironment.isHeadless() || (args.isNotEmpty() && args[0] == HEADLESS_FLAG)
val workingDir = Paths.get(System.getProperty("user.dir")).toFile() val workingDir = Paths.get(System.getProperty("user.dir")).toFile()
val javaArgs = args.filter { it != HEADLESS_FLAG } val javaArgs = args.filter { it != HEADLESS_FLAG }
println("Starting nodes in $workingDir") println("Starting nodes in $workingDir")
@ -69,7 +69,7 @@ private fun isWebserver(maybeWebserverDir: File) = maybeWebserverDir.isDirectory
private fun hasWebserverPort(nodeConfDir: File) = Files.readAllLines(File(nodeConfDir, nodeConfName).toPath()).joinToString { it }.contains("webAddress") private fun hasWebserverPort(nodeConfDir: File) = Files.readAllLines(File(nodeConfDir, nodeConfName).toPath()).joinToString { it }.contains("webAddress")
private fun getDebugPortArg(debugPort: Int?) = if (debugPort != null) { private fun getDebugPortArg(debugPort: Int?) = if (debugPort != null) {
listOf("""-Dcapsule.jvm.args="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=$debugPort"""") listOf("-Dcapsule.jvm.args=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=$debugPort")
} else { } else {
emptyList() emptyList()
} }