|
|
@@ -1,5 +1,9 @@
|
|
|
# tag:tool-specific tag:proto
|
|
|
PROTOC=${tool:"contrib/tools/protoc"}
|
|
|
+JAVA_PROTOC=${tool:"contrib/tools/protoc"}
|
|
|
+when ($NEW_JAVA_PROTOC == "yes") {
|
|
|
+ JAVA_PROTOC=${tool:"build/platform/java/protoc"}
|
|
|
+}
|
|
|
PROTOC_STYLEGUIDE_OUT=--cpp_styleguide_out=$ARCADIA_BUILD_ROOT/$PROTO_NAMESPACE
|
|
|
PROTOC_PLUGIN_STYLEGUIDE=--plugin=protoc-gen-cpp_styleguide=${tool:"contrib/tools/protoc/plugins/cpp_styleguide"}
|
|
|
PROTOBUF_PATH=${ARCADIA_ROOT}/contrib/libs/protobuf/src
|
|
|
@@ -462,7 +466,7 @@ otherwise {
|
|
|
KOTLIN_PROTO_FLAGS=
|
|
|
# tag:proto tag:java-specific
|
|
|
macro _JAVA_PROTO_CMD(File) {
|
|
|
- .CMD=${cwd;rootdir;input:File} $YMAKE_PYTHON ${input:"build/scripts/tared_protoc.py"} --tar-output ${output;norel;nopath;noext;suf=.jsrc:File} --protoc-out-dir $ARCADIA_BUILD_ROOT/java_out $PROTOC -I=./$PROTO_NAMESPACE ${pre=-I=:_PROTO__INCLUDE} -I=$ARCADIA_ROOT --java_out=${_JAVA_PROTO_LITE_ARG}$ARCADIA_BUILD_ROOT/java_out ${KOTLIN_PROTO_FLAGS} $_PROTOC_FLAGS ${input;rootrel:File} ${kv;hide:"p PB"} ${kv;hide:"pc yellow"} $JAVA_PROTO_ARGS ${hide:PROTO_FAKEID}
|
|
|
+ .CMD=${cwd;rootdir;input:File} $YMAKE_PYTHON ${input:"build/scripts/tared_protoc.py"} --tar-output ${output;norel;nopath;noext;suf=.jsrc:File} --protoc-out-dir $ARCADIA_BUILD_ROOT/java_out $JAVA_PROTOC -I=./$PROTO_NAMESPACE ${pre=-I=:_PROTO__INCLUDE} -I=$ARCADIA_ROOT --java_out=${_JAVA_PROTO_LITE_ARG}$ARCADIA_BUILD_ROOT/java_out ${KOTLIN_PROTO_FLAGS} $_PROTOC_FLAGS ${input;rootrel:File} ${kv;hide:"p PB"} ${kv;hide:"pc yellow"} $JAVA_PROTO_ARGS ${hide:PROTO_FAKEID}
|
|
|
.SEM=proto_files ${input;rootrel:File} ${hide;output:File.jsrc}
|
|
|
}
|
|
|
|
pg