diff --git a/car_srv/kotlinSrv/build.gradle b/car_srv/kotlinSrv/build.gradle index 77fa93bf0e0..09d89ee6245 100644 --- a/car_srv/kotlinSrv/build.gradle +++ b/car_srv/kotlinSrv/build.gradle @@ -3,7 +3,6 @@ version '1.0' buildscript { ext.kotlin_version = '1.0.3' - ext.kotlinHome = "${System.env.HOME}/Library/Application Support/IdeaIC14/Kotlin" repositories { mavenCentral() @@ -23,14 +22,17 @@ sourceSets { main.kotlin.srcDirs += 'src' } -task copyKotlinJs(type: Copy) { +task copySecondaryFiles(type: Copy) { from "${projectDir}/helpers/kotlin.js" into "${projectDir}/build/js/lib" + + from "${projectDir}/helpers/package.json" + into "${projectDir}/build/js" } -build.dependsOn copyKotlinJs +build.dependsOn copySecondaryFiles -compileKotlin2Js.kotlinOptions.outputFile = "${projectDir}/build/js/app.js" +compileKotlin2Js.kotlinOptions.outputFile = "${projectDir}/build/js/main.js" compileKotlin2Js.kotlinOptions.outputPrefix = "${projectDir}/helpers/prefix.js" dependencies { diff --git a/car_srv/kotlinSrv/helpers/package.json b/car_srv/kotlinSrv/helpers/package.json new file mode 100644 index 00000000000..f0ed83361da --- /dev/null +++ b/car_srv/kotlinSrv/helpers/package.json @@ -0,0 +1,17 @@ +{ + "name": "stflashserver", + "version": "1.0.0", + "description": "", + "main": "main.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1", + "start": "node main.js" + }, + "author": "maxim", + "license": "ISC", + "devDependencies": { + "udev": "^0.3.0", + "commander": "^2.9.0", + "protobufjs": "^5.0.1" + } +}