Do not make protos in gotools dir

The compile_protos.sh script tries to compile all protos in the fabric directory. Once the gotools dir is initialized, it contains some proto files which will fail to compile with compile_protos.sh. This change excludes the gotools directory from proto compilation. Change-Id: I8e61cedfaea3a8cbff856579d95e70d726196543 Signed-off-by: Jason Yellick <[email protected]>
DevinYang · Nov 9, 2016 · 145dfd3 · 145dfd3
1 parent 845b30e
commit 145dfd3
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/scripts/compile_protos.sh b/scripts/compile_protos.sh
@@ -11,10 +11,11 @@ PROTO_ROOT_FILES="$(find . -name ".protoroot" -exec readlink -f {} \;)"
 PROTO_ROOT_DIRS="$(dirname $PROTO_ROOT_FILES)"
 
 
-# Find all proto files to be compiled, excluding any which are in a proto root or in the vendor folder
+# Find all proto files to be compiled, excluding any which are in a proto root or in the vendor folder, as well as the gotools dir
 ROOTLESS_PROTO_FILES="$(find $PWD \
                              $(for dir in $PROTO_ROOT_DIRS ; do echo "-path $dir -prune -o " ; done) \
                              -path $PWD/vendor -prune -o \
+                             -path $PWD/gotools -prune -o \
                              -name "*.proto" -exec readlink -f {} \;)"
 ROOTLESS_PROTO_DIRS="$(dirname $ROOTLESS_PROTO_FILES | sort | uniq)"