From a230fadd0ded1bbc292776ba89007e38e4048ffb Mon Sep 17 00:00:00 2001 From: Eugene Batalov Date: Mon, 8 Aug 2016 16:55:28 +0300 Subject: [PATCH] TODOs for Maxim --- car_srv/kotlinSrv/deploy.sh | 1 + car_srv/kotlinSrv/run.sh | 3 ++- server/build.gradle | 15 +++++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/car_srv/kotlinSrv/deploy.sh b/car_srv/kotlinSrv/deploy.sh index acebce4f9ef..1ec34b5a13e 100755 --- a/car_srv/kotlinSrv/deploy.sh +++ b/car_srv/kotlinSrv/deploy.sh @@ -1,5 +1,6 @@ #!/usr/bin/expect +# XXX this script works super slow on eugene's machine set host "" set userName "pi" diff --git a/car_srv/kotlinSrv/run.sh b/car_srv/kotlinSrv/run.sh index 083b59d4b6c..e034474f354 100755 --- a/car_srv/kotlinSrv/run.sh +++ b/car_srv/kotlinSrv/run.sh @@ -1,4 +1,5 @@ #!/bin/bash +# TODO main server ip address should be read from configuration file that is +# not overwritten during deploy. cd build/js node main.js - diff --git a/server/build.gradle b/server/build.gradle index c4c3d3f17b4..764aa3fe097 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -22,9 +22,24 @@ repositories { } task compileProto(type: Exec) { + /* + * XXX Kotlin proto compiler calling convention will change soon. + * It would provide fixed path to protoc in its project directory. + */ executable "./compileProto.sh" } task buildProtoLib(type: Copy) { + /* + * XXX Will need to rework. + * New Kotlin protobuf compiler will have build.sh script that + * generates jar file with Kotlin protobuf runtime classes + * and .proto => .kt compiler executable. + * Also you copy this files into src of your server and even + * commit copied files into git repository. + * This is not acceptable. This files shouldn't be part of + * your src in any way. + * Also Kotlin protoc generated files shouldn't be part of your src too. + */ //just copy lib src to project def pathToProtoKotSrc = "../proto/compiler/src/" from pathToProtoKotSrc + "CodedInputStream.kt", pathToProtoKotSrc + "CodedOutputStream.kt",