aboutsummaryrefslogtreecommitdiffstats
path: root/tools/make_linux_package.sh
diff options
context:
space:
mode:
authorPetteri Aimonen <jpa@git.mail.kapsi.fi>2013-11-17 22:37:48 +0200
committerPetteri Aimonen <jpa@git.mail.kapsi.fi>2013-12-29 20:26:58 +0200
commit440a53f85965f35cd7bc401ef7e3fb9c4dfd1390 (patch)
treece41f4958dcf551a8d1f42a887d7283654af80ae /tools/make_linux_package.sh
parent3bdbd4dc484945bfaa305d1df489a7805998139a (diff)
Fix protoc-gen-nanopb in linux package
Diffstat (limited to 'tools/make_linux_package.sh')
-rwxr-xr-xtools/make_linux_package.sh11
1 files changed, 7 insertions, 4 deletions
diff --git a/tools/make_linux_package.sh b/tools/make_linux_package.sh
index c48a8074..fef0254b 100755
--- a/tools/make_linux_package.sh
+++ b/tools/make_linux_package.sh
@@ -18,10 +18,16 @@ 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[^ ]*')
@@ -35,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 )