Code Review
/
apps
/
agl-service-can-low-level.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Build fix for previous commit
[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
..
aea1c56
100755
(executable)
--- a/
tools/make_linux_package.sh
+++ b/
tools/make_linux_package.sh
@@
-6,7
+6,7
@@
set -e
set -x
set -e
set -x
-VERSION=`git describe --always`
+VERSION=`git describe --always`
-linux-x86
DEST=dist/$VERSION
rm -rf $DEST
DEST=dist/$VERSION
rm -rf $DEST
@@
-18,23
+18,32
@@
git archive HEAD | tar x -C $DEST
# Rebuild the Python .proto files
make -BC $DEST/generator/proto
# 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
# 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
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
# 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/
cat > $DEST/generator-bin/protoc << EOF
#!/bin/bash
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
export LD_LIBRARY_PATH=\$SCRIPTDIR
export PATH=\$SCRIPTDIR:\$PATH
-exec
\$SCRIPTDIR/protoc.bin
"\$@"
+exec
"\$SCRIPTDIR/protoc.bin"
"\$@"
EOF
chmod +x $DEST/generator-bin/protoc
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
+#
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 )
# Tar it all up
( cd dist; tar -czf $VERSION.tar.gz $VERSION )