From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Sat, 1 Aug 2015 12:20:10 +0000 (+0200)
Subject: compile_protobuf.sh does not need local installation of protoc
X-Git-Tag: 5.2-RC1~875
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=846f71127fdf498c69090157f748517c5eb22888;p=sonarqube.git

compile_protobuf.sh does not need local installation of protoc
---

diff --git a/compile_protobuf.sh b/compile_protobuf.sh
index 38429335487..e4bd4d96326 100755
--- a/compile_protobuf.sh
+++ b/compile_protobuf.sh
@@ -1,7 +1,12 @@
 #!/bin/bash
 
 # Compiles all the Protocol Buffers files (*.proto) to Java source code.
-# IMPORTANT - protobuf 2.6.1 must be installed. Other versions are not supported.
+# Local installation of protobuf compiler is NOT needed.
+
+# Available versions listed at http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.github.os72%22%20AND%20a%3A%22protoc-jar%22
+PROTOBUF_VERSION="2.6.1.4"
+
+mvn org.apache.maven.plugins:maven-dependency-plugin::copy -Dartifact=com.github.os72:protoc-jar:$PROTOBUF_VERSION -DoutputDirectory=target
 
 # Usage: compile_protobuf <module> <type: main or test>
 function compile_protobuf {
@@ -13,7 +18,7 @@ function compile_protobuf {
     echo "Compiling [$INPUT] to [$OUTPUT]..."
     rm -rf $OUTPUT
     mkdir -p $OUTPUT
-    protoc --proto_path=$INPUT --java_out=$OUTPUT $INPUT/*.proto
+    java -jar target/protoc-jar-$PROTOBUF_VERSION.jar --proto_path=$INPUT --java_out=$OUTPUT $INPUT/*.proto
   fi
 }