diff options
author | Christopher Ferris <cferris@google.com> | 2018-07-27 13:25:00 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-07-27 13:25:00 -0700 |
commit | 8863e422936e9dcd96ef75db8e7d735884b16787 (patch) | |
tree | c28e65883c2587f3f19a80e40020ad89ba49dabd /tools/make_linux_package.sh | |
parent | 85687fde93fe54eccfd3b20bac9ca7883ffb612a (diff) | |
parent | 731c7139ab46dd0c22bcbda506069e5454e9b2c2 (diff) | |
download | nanopb-c-8863e422936e9dcd96ef75db8e7d735884b16787.tar.gz |
Revert "Upgrade nanopb to 0.3.9.1" am: 72d4ea3f96
am: 731c7139ab
Change-Id: I90a1a47afc2a7bb17ef2f35c8a33963cc169174a
Diffstat (limited to 'tools/make_linux_package.sh')
-rwxr-xr-x | tools/make_linux_package.sh | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/tools/make_linux_package.sh b/tools/make_linux_package.sh index 0bcba7d..332c281 100755 --- a/tools/make_linux_package.sh +++ b/tools/make_linux_package.sh @@ -3,8 +3,6 @@ # Run this script in the top nanopb directory to create a binary package # for Linux users. -# Requires: protobuf, python-protobuf, pyinstaller - set -e set -x @@ -20,21 +18,20 @@ git archive HEAD | tar x -C $DEST # Rebuild the Python .proto files make -BC $DEST/generator/proto -# Package the Python libraries -( cd $DEST/generator; pyinstaller nanopb_generator.py ) -mv $DEST/generator/dist/nanopb_generator $DEST/generator-bin +# Make the nanopb generator available as a protoc plugin +cp $DEST/generator/nanopb_generator.py $DEST/generator/protoc-gen-nanopb.py -# Remove temp files -rm -rf $DEST/generator/dist $DEST/generator/build $DEST/generator/nanopb_generator.spec +# Package the Python libraries +( cd $DEST/generator; bbfreeze nanopb_generator.py protoc-gen-nanopb.py ) +mv $DEST/generator/dist $DEST/generator-bin -# Make the nanopb generator available as a protoc plugin -cp $DEST/generator-bin/nanopb_generator $DEST/generator-bin/protoc-gen-nanopb +# Remove temp file +rm $DEST/generator/protoc-gen-nanopb.py # Package the protoc compiler cp `which protoc` $DEST/generator-bin/protoc.bin LIBPROTOC=$(ldd `which protoc` | grep -o '/.*libprotoc[^ ]*') -LIBPROTOBUF=$(ldd `which protoc` | grep -o '/.*libprotobuf[^ ]*') -cp $LIBPROTOC $LIBPROTOBUF $DEST/generator-bin/ +cp $LIBPROTOC $DEST/generator-bin/ cat > $DEST/generator-bin/protoc << EOF #!/bin/bash SCRIPTDIR=\$(dirname "\$0") @@ -44,9 +41,6 @@ exec "\$SCRIPTDIR/protoc.bin" "\$@" EOF chmod +x $DEST/generator-bin/protoc -# Remove debugging symbols to reduce size of package -( cd $DEST/generator-bin; strip *.so *.so.* ) - # Tar it all up ( cd dist; tar -czf $VERSION.tar.gz $VERSION ) |