X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=tools%2Fmake_linux_package.sh;h=332c281b015285c2bb24ddbaf44a6192c061d4e1;hb=7c00b90910d4e14e23e027eb951e6f2a8dcfae29;hp=0c8e826b74e4481f4123068fe858bad4e4b6c19a;hpb=8be8b7e41a27b0feb12b75fed42bee34258f1e35;p=apps%2Fagl-service-can-low-level.git

diff --git a/tools/make_linux_package.sh b/tools/make_linux_package.sh
index 0c8e826b..332c281b 100755
--- a/tools/make_linux_package.sh
+++ b/tools/make_linux_package.sh
@@ -6,7 +6,7 @@
 set -e
 set -x
 
-VERSION=`git describe --always`
+VERSION=`git describe --always`-linux-x86
 DEST=dist/$VERSION
 
 rm -rf $DEST
@@ -18,24 +18,29 @@ 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))
+SCRIPTDIR=\$(dirname "\$0")
 export LD_LIBRARY_PATH=\$SCRIPTDIR
 export PATH=\$SCRIPTDIR:\$PATH
-exec \$SCRIPTDIR/protoc.bin "\$@"
+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 )