commit 90706dc48ff18c4cf5abe1e6388f93c35d17cf0b
author Kun Zhang <zhangkun@google.com> Thu Apr 09 13:11:31 2015 -0700
committer Kun Zhang <zhangkun@google.com> Thu Apr 09 15:24:46 2015 -0700
tree e8f0bc36a5219a3a26b41bf9d45af47fa55769cc
parent e8afa3ca23b927de83128f9afc027a5908c8cbc3

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

build.gradle

diff --git a/build.gradle b/build.gradle
index 82558b3..d5e3b0d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -66,7 +66,8 @@
         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 {

compiler/build.gradle

diff --git a/compiler/build.gradle b/compiler/build.gradle
index 151728f..6c7710d 100644
--- a/compiler/build.gradle
+++ b/compiler/build.gradle
@@ -15,7 +15,9 @@
 }
 
 executables {
-  java_plugin {}
+  java_plugin {
+    baseName "$protocPluginBaseName"
+  }
 }
 
 dependencies {

compiler/src/test/run_nano_test.sh

diff --git a/compiler/src/test/run_nano_test.sh b/compiler/src/test/run_nano_test.sh
index 329f442..181c8e9 100755
--- a/compiler/src/test/run_nano_test.sh
+++ b/compiler/src/test/run_nano_test.sh
@@ -12,7 +12,7 @@
 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" && \