mirror of https://github.com/grpc/grpc-java.git
Rename the codegen binary from java_plugin to protoc-gen-grpc-java
This commit is contained in:
parent
e8afa3ca23
commit
90706dc48f
|
@ -66,7 +66,8 @@ subprojects {
|
||||||
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
|
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
|
||||||
splitRootDir = splitRootDir.getPath().split(":", 2)[1]
|
splitRootDir = splitRootDir.getPath().split(":", 2)[1]
|
||||||
}
|
}
|
||||||
javaPluginPath = "$splitRootDir/compiler/build/binaries/java_pluginExecutable/java_plugin$exeSuffix"
|
protocPluginBaseName = 'protoc-gen-grpc-java'
|
||||||
|
javaPluginPath = "$splitRootDir/compiler/build/binaries/java_pluginExecutable/$protocPluginBaseName$exeSuffix"
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|
|
@ -15,7 +15,9 @@ buildscript {
|
||||||
}
|
}
|
||||||
|
|
||||||
executables {
|
executables {
|
||||||
java_plugin {}
|
java_plugin {
|
||||||
|
baseName "$protocPluginBaseName"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|
|
@ -12,7 +12,7 @@ OUTPUT_FILE="$TEST_TMP_DIR/TestServiceGrpc.src.jar"
|
||||||
GRPC_FILE="$TEST_TMP_DIR/io/grpc/testing/integration/TestServiceGrpc.java"
|
GRPC_FILE="$TEST_TMP_DIR/io/grpc/testing/integration/TestServiceGrpc.java"
|
||||||
GOLDEN_FILE="golden/TestServiceNano.java.txt"
|
GOLDEN_FILE="golden/TestServiceNano.java.txt"
|
||||||
|
|
||||||
protoc --plugin=protoc-gen-java_rpc=../../build/binaries/java_pluginExecutable/java_plugin \
|
protoc --plugin=protoc-gen-java_rpc=../../build/binaries/java_pluginExecutable/protoc-gen-grpc-java \
|
||||||
--java_rpc_out=nano=true:"$OUTPUT_FILE" "$INPUT_FILE" && \
|
--java_rpc_out=nano=true:"$OUTPUT_FILE" "$INPUT_FILE" && \
|
||||||
unzip -o -d "$TEST_TMP_DIR" "$OUTPUT_FILE" && \
|
unzip -o -d "$TEST_TMP_DIR" "$OUTPUT_FILE" && \
|
||||||
diff "$GRPC_FILE" "$GOLDEN_FILE" && \
|
diff "$GRPC_FILE" "$GOLDEN_FILE" && \
|
||||||
|
|
Loading…
Reference in New Issue