From 90706dc48ff18c4cf5abe1e6388f93c35d17cf0b Mon Sep 17 00:00:00 2001
From: Kun Zhang <zhangkun@google.com>
Date: Thu, 9 Apr 2015 13:11:31 -0700
Subject: [PATCH] Rename the codegen binary from java_plugin to
 protoc-gen-grpc-java

---
 build.gradle                       | 3 ++-
 compiler/build.gradle              | 4 +++-
 compiler/src/test/run_nano_test.sh | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 82558b3004..d5e3b0d855 100644
--- 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
index 151728f6b7..6c7710d647 100644
--- 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
index 329f442173..181c8e9e2a 100755
--- 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" && \