diff --git a/car_srv/kotlinSrv/build.gradle b/car_srv/kotlinSrv/build.gradle index 09d89ee6245..74e1b4ff13a 100644 --- a/car_srv/kotlinSrv/build.gradle +++ b/car_srv/kotlinSrv/build.gradle @@ -22,15 +22,24 @@ sourceSets { main.kotlin.srcDirs += 'src' } -task copySecondaryFiles(type: Copy) { +task copyKotlinLib(type: Copy) { from "${projectDir}/helpers/kotlin.js" - into "${projectDir}/build/js/lib" - from "${projectDir}/helpers/package.json" + into "${projectDir}/build/js" } -build.dependsOn copySecondaryFiles +task copyProtoFiles(type: Copy) { + + from "${projectDir}/../../proto/carkot.proto" + from "${projectDir}/../../proto/server_car/" + + into "${projectDir}/build/js/proto" +} + + +build.dependsOn copyKotlinLib +build.dependsOn copyProtoFiles compileKotlin2Js.kotlinOptions.outputFile = "${projectDir}/build/js/main.js" compileKotlin2Js.kotlinOptions.outputPrefix = "${projectDir}/helpers/prefix.js" diff --git a/car_srv/kotlinSrv/helpers/prefix.js b/car_srv/kotlinSrv/helpers/prefix.js index cf644ec53d9..9dbae55426b 100644 --- a/car_srv/kotlinSrv/helpers/prefix.js +++ b/car_srv/kotlinSrv/helpers/prefix.js @@ -1,3 +1,3 @@ -var PATH_TO_KOTLIN_JS_DIR = "./lib/"; +var PATH_TO_KOTLIN_JS_DIR = "./"; var Kotlin = require(PATH_TO_KOTLIN_JS_DIR + "kotlin");