Updating Makefile to give instructions to download protoc

dedis · Jun 26, 2023 · 805682a · 805682a
1 parent 42c3b44
commit 805682a
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 3 deletions.
diff --git a/external/Makefile b/external/Makefile
@@ -15,9 +15,14 @@ do-js: check_protoc
 
 
 check_protoc:
-	@which protoc || (echo "Install protoc version 3.17.3. On Mac, run \"brew install [email protected]\"" && exit 1)
-	@pv=`protoc --version`; \
+	which protoc || $(MAKE) protoc_instructions
+	pv=`protoc --version`; \
 	if [ "$$pv" != "libprotoc 3.17.3" ]; then \
 		echo "Protoc version $$pv is not supported."; \
-		exit 1; \
+		$(MAKE) protoc_instructions; \
 	fi
+
+protoc_instructions:
+	echo "Please download version 3.17.3 from here:"
+	echo "https://github.com/protocolbuffers/protobuf/releases/tag/v3.17.3"
+	exit 1
diff --git a/external/java/src/main/java/ch/epfl/dedis/lib/proto/Evoting.java b/external/java/src/main/java/ch/epfl/dedis/lib/proto/Evoting.java
diff --git a/external/proto/evoting.proto b/external/proto/evoting.proto