Fix protoc-gen-nanopb in linux package

[apps/agl-service-can-low-level.git] / tools / make_linux_package.sh

diff --git a/tools/make_linux_package.sh b/tools/make_linux_package.sh
index 0c8e826..fef0254 100755 (executable)
--- a/tools/make_linux_package.sh
+++ b/tools/make_linux_package.sh
@@ -18,12 +18,20 @@ git archive HEAD | tar x -C $DEST
 # Rebuild the Python .proto files
 make -BC $DEST/generator/proto
 
+# Make the nanopb generator available as a protoc plugin
+cp $DEST/generator/nanopb_generator.py $DEST/generator/protoc-gen-nanopb.py
+
 # Package the Python libraries
-( cd $DEST/generator; bbfreeze nanopb_generator.py )
+( cd $DEST/generator; bbfreeze nanopb_generator.py protoc-gen-nanopb.py )
 mv $DEST/generator/dist $DEST/generator-bin
 
+# 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[^ ]*')
+cp $LIBPROTOC $DEST/generator-bin/
 cat > $DEST/generator-bin/protoc << EOF
 #!/bin/bash
 SCRIPTDIR=\$(dirname \$(readlink -f \$0))
@@ -33,9 +41,6 @@ exec \$SCRIPTDIR/protoc.bin "\$@"
 EOF
 chmod +x $DEST/generator-bin/protoc
 
-# Make the nanopb generator available as a protoc plugin
-ln -s nanopb-generator $DEST/generator-bin/protoc-gen-nanopb
-
 # Tar it all up
 ( cd dist; tar -czf $VERSION.tar.gz $VERSION )