Pull protobufs from submodule instead of a symbolic link Fix #2

2025-12-19 17:22:59 +00:00 · 2020-03-02 09:56:21 -08:00
parent 12a68026e7
commit 4bb308c80c
5 changed files with 5 additions and 3 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,3 @@
 [submodule "proto"]
 	path = proto
 	url = https://github.com/meshtastic/Meshtastic-protobufs.git
--- a/bin/regen-protos.sh
+++ b/bin/regen-protos.sh
@@ -1 +1 @@
-/home/kevinh/packages/nanopb-0.4.1-linux-x86/generator-bin/protoc --nanopb_out=-v:src -I=../MeshUtil/app/src/main/proto mesh.proto
+/home/kevinh/packages/nanopb-0.4.1-linux-x86/generator-bin/protoc --nanopb_out=-v:src -I=proto mesh.proto
--- a/mesh.options
+++ b/mesh.options
@@ -1 +0,0 @@
 ../MeshUtil/app/src/main/proto/mesh.options
--- a/mesh.proto
+++ b/mesh.proto
@@ -1 +0,0 @@
 ../MeshUtil/app/src/main/proto/mesh.proto
--- a/1
+++ b/1
`@@ -1 +1 @@`
	`/home/kevinh/packages/nanopb-0.4.1-linux-x86/generator-bin/protoc --nanopb_out=-v:src -I=../MeshUtil/app/src/main/proto mesh.proto`	`/home/kevinh/packages/nanopb-0.4.1-linux-x86/generator-bin/protoc --nanopb_out=-v:src -I=proto mesh.proto`
		`@@ -1 +0,0 @@`
			`../MeshUtil/app/src/main/proto/mesh.options`