Rename the codegen binary from java_plugin to protoc-gen-grpc-java

zhangkun83 · zhangkun83 · commit 90706dc48ff1 · 2015-04-09T15:24:46.000-07:00
diff --git a/build.gradle b/build.gradle
@@ -66,7 +66,8 @@ subprojects {
         if (Os.isFamily(Os.FAMILY_WINDOWS)) {
           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 {
diff --git a/compiler/build.gradle b/compiler/build.gradle
@@ -15,7 +15,9 @@ buildscript {
 }
 
 executables {
-  java_plugin {}
+  java_plugin {
+    baseName "$protocPluginBaseName"
+  }
 }
 
 dependencies {
diff --git a/compiler/src/test/run_nano_test.sh b/compiler/src/test/run_nano_test.sh
@@ -12,7 +12,7 @@ OUTPUT_FILE="$TEST_TMP_DIR/TestServiceGrpc.src.jar"
 GRPC_FILE="$TEST_TMP_DIR/io/grpc/testing/integration/TestServiceGrpc.java"
 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" && \
   unzip -o -d "$TEST_TMP_DIR" "$OUTPUT_FILE" && \
   diff "$GRPC_FILE" "$GOLDEN_FILE" && \

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,8 @@ subprojects {`
`66`	`66`	`if (Os.isFamily(Os.FAMILY_WINDOWS)) {`
`67`	`67`	`splitRootDir = splitRootDir.getPath().split(":", 2)[1]`
`68`	`68`	`}`
`69`		`- javaPluginPath = "$splitRootDir/compiler/build/binaries/java_pluginExecutable/java_plugin$exeSuffix"`
	`69`	`+ protocPluginBaseName = 'protoc-gen-grpc-java'`
	`70`	`+ javaPluginPath = "$splitRootDir/compiler/build/binaries/java_pluginExecutable/$protocPluginBaseName$exeSuffix"`
`70`	`71`	`}`
`71`	`72`
`72`	`73`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,9 @@ buildscript {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`executables {`
`18`		`- java_plugin {}`
	`18`	`+ java_plugin {`
	`19`	`+ baseName "$protocPluginBaseName"`
	`20`	`+ }`
`19`	`21`	`}`
`20`	`22`
`21`	`23`	`dependencies {`