From 4bb308c80c6e7fc1588e60d93ea7ffd11144c8c8 Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Mon, 2 Mar 2020 09:56:21 -0800 Subject: [PATCH] Pull protobufs from submodule instead of a symbolic link Fix #2 --- .gitmodules | 3 +++ bin/regen-protos.sh | 2 +- mesh.options | 1 - mesh.proto | 1 - proto | 1 + 5 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 .gitmodules delete mode 120000 mesh.options delete mode 120000 mesh.proto create mode 160000 proto diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..ddc929e14 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "proto"] + path = proto + url = https://github.com/meshtastic/Meshtastic-protobufs.git diff --git a/bin/regen-protos.sh b/bin/regen-protos.sh index cfe49afb8..af98aee9a 100755 --- 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 diff --git a/mesh.options b/mesh.options deleted file mode 120000 index 5b81babd5..000000000 --- a/mesh.options +++ /dev/null @@ -1 +0,0 @@ -../MeshUtil/app/src/main/proto/mesh.options \ No newline at end of file diff --git a/mesh.proto b/mesh.proto deleted file mode 120000 index 4dafbaa02..000000000 --- a/mesh.proto +++ /dev/null @@ -1 +0,0 @@ -../MeshUtil/app/src/main/proto/mesh.proto \ No newline at end of file diff --git a/proto b/proto new file mode 160000 index 000000000..c4ee1448e --- /dev/null +++ b/proto @@ -0,0 +1 @@ +Subproject commit c4ee1448ea99058fe45c6738e547197e4a4c1887