Skip to content

Move pb2 Files to Own Folder #490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Mar 8, 2024
Merged

Move pb2 Files to Own Folder #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9a4feec
move pb2 to own folder, regen script writes to new folder, update imp…
rc14193 Feb 25, 2024
1c9af1f
modify dir path
rc14193 Feb 25, 2024
8271997
fix sed commands and dir path
rc14193 Feb 25, 2024
17ab557
change back to previous path
rc14193 Feb 25, 2024
9fbde7b
change regen to unmodified
rc14193 Feb 25, 2024
b7e23ab
use mv command instead, run regen test
rc14193 Feb 25, 2024
1a87780
use the move command instead
rc14193 Feb 25, 2024
769c99e
reset regen bash again
rc14193 Feb 25, 2024
10c2e75
fix tests imports, add sed for fixing pb2 imports
rc14193 Feb 25, 2024
df8ea85
change to PbDefinitions for clearer naming
rc14193 Feb 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions bin/regen-protobufs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +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

if [[ $OSTYPE == 'darwin'* ]]; then
sed -i '' -E 's/^(import.*_pb2)/from . \1/' meshtastic/*.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/mesh_pb2.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/*.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/mesh_pb2.py
fi
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
Empty file added meshtastic/PbDefinitions/__init__.py
View file
Open in desktop
Empty file.
40 changes: 40 additions & 0 deletions meshtastic/PbDefinitions/admin_pb2.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions meshtastic/apponly_pb2.py → meshtastic/PbDefinitions/apponly_pb2.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 40 additions & 0 deletions meshtastic/PbDefinitions/atak_pb2.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions meshtastic/cannedmessages_pb2.py → ...astic/PbDefinitions/cannedmessages_pb2.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 34 additions & 0 deletions meshtastic/PbDefinitions/channel_pb2.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions meshtastic/clientonly_pb2.py → meshtastic/PbDefinitions/clientonly_pb2.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading