Merge pull request #58 from googleprivate/bug/cpp-gen

Header insert on gRPC code gen touched too many files
googleforgames · Jan 12, 2018 · f7e9783 · f7e9783
2 parents 8a2d08b + 78549ff
commit f7e9783
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/build/boilerplate.go.txt b/build/boilerplate.go.txt
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc. All Rights Reserved.
+// Copyright 2018 Google Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/build/build-image/gen-grpc-cpp.sh b/build/build-image/gen-grpc-cpp.sh
@@ -18,7 +18,7 @@ cd /go/src/github.com/agonio/agon
 protoc -I . --grpc_out=./sdks/cpp --plugin=protoc-gen-grpc=`which grpc_cpp_plugin` sdk.proto
 protoc -I . --cpp_out=./sdks/cpp sdk.proto
 mkdir /tmp/cpp
-ls ./sdks/cpp | xargs -I@ bash -c "cat ./build/boilerplate.go.txt ./sdks/cpp/@ >> /tmp/cpp/@"
+find ./sdks/cpp/ -type f \( -name '*.pb.cc' -or -name '*.pb.h' \) -printf "%f\n" | xargs -I@ bash -c "cat ./build/boilerplate.go.txt ./sdks/cpp/@ >> /tmp/cpp/@"
 # already has a header, so we'll remove it
 rm /tmp/cpp/sdk.grpc.pb.h
 mv /tmp/cpp/* ./sdks/cpp/