change to PbDefinitions for clearer naming

This commit is contained in:
foglet15
2024-02-25 14:22:15 -05:00
parent 10c2e753f5
commit df8ea85873
32 changed files with 46 additions and 46 deletions

View File

@@ -7,18 +7,18 @@
./nanopb-0.4.7/generator-bin/protoc -I=protobufs --python_out ./ ./protobufs/meshtastic/*.proto
# workaround for import bug in protoc https://github.com/protocolbuffers/protobuf/issues/1491#issuecomment-690618628
mv ./meshtastic/*_pb2.py ./meshtastic/pbDefinitions
mv ./meshtastic/*_pb2.py ./meshtastic/PbDefinitions
if [[ $OSTYPE == 'darwin'* ]]; then
sed -i '' -E 's/^(import.*_pb2)/from . \1/' meshtastic/pbDefinitions/*.py
sed -i '' -E 's/^(import.*_pb2)/from . \1/' meshtastic/PbDefinitions/*.py
# automate the current workaround (may be related to Meshtastic-protobufs issue #27 https://github.com/meshtastic/protobufs/issues/27)
sed -i '' -E "s/^None = 0/globals()['None'] = 0/" meshtastic/pbDefinitions/mesh_pb2.py
# change from meshtastic to meshtastic.pbDefinitions
sed -i -E 's/^from meshtastic(.*_pb2.*)/from meshtastic.pbDefinitions\1/' meshtastic/pbDefinitions/*.py
sed -i '' -E "s/^None = 0/globals()['None'] = 0/" meshtastic/PbDefinitions/mesh_pb2.py
# change from meshtastic to meshtastic.PbDefinitions
sed -i -E 's/^from meshtastic(.*_pb2.*)/from meshtastic.PbDefinitions\1/' meshtastic/PbDefinitions/*.py
else
sed -i -e 's/^import.*_pb2/from . \0/' meshtastic/pbDefinitions/*.py
sed -i -e 's/^import.*_pb2/from . \0/' meshtastic/PbDefinitions/*.py
# automate the current workaround (may be related to Meshtastic-protobufs issue #27 https://github.com/meshtastic/protobufs/issues/27)
sed -i -e "s/^None = 0/globals()['None'] = 0/" meshtastic/pbDefinitions/mesh_pb2.py
# change from meshtastic to meshtastic.pbDefinitions
sed -i -E 's/^from meshtastic(.*_pb2.*)/from meshtastic.pbDefinitions\1/' meshtastic/pbDefinitions/*.py
sed -i -e "s/^None = 0/globals()['None'] = 0/" meshtastic/PbDefinitions/mesh_pb2.py
# change from meshtastic to meshtastic.PbDefinitions
sed -i -E 's/^from meshtastic(.*_pb2.*)/from meshtastic.PbDefinitions\1/' meshtastic/PbDefinitions/*.py
fi