rik/nanopb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix protoc-gen-nanopb in linux package

Browse Source
This commit is contained in:
Petteri Aimonen
2013-11-17 22:37:48 +02:00
parent 3bdbd4dc48
commit 440a53f859
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/make_linux_package.sh
View File

@@ -18,10 +18,16 @@ git archive HEAD | tar x -C $DEST
# Rebuild the Python .proto files # Rebuild the Python .proto files
make -BC $DEST/generator/proto 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 # Package the protoc compiler
cp `which protoc` $DEST/generator-bin/protoc.bin cp `which protoc` $DEST/generator-bin/protoc.bin
LIBPROTOC=$(ldd `which protoc` | grep -o '/.*libprotoc[^ ]*') LIBPROTOC=$(ldd `which protoc` | grep -o '/.*libprotoc[^ ]*')
@@ -35,9 +41,6 @@ exec \$SCRIPTDIR/protoc.bin "\$@"
EOF EOF
chmod +x $DEST/generator-bin/protoc 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 # Tar it all up
( cd dist; tar -czf $VERSION.tar.gz $VERSION ) ( cd dist; tar -czf $VERSION.tar.gz $VERSION )

6
tools/make_windows_package.sh
View File

@@ -26,6 +26,9 @@ cp $DEST/generator/nanopb_generator.py $DEST/generator/protoc-gen-nanopb.py
( cd $DEST/generator; bbfreeze nanopb_generator.py protoc-gen-nanopb.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
# The python interpreter requires MSVCR90.dll. # The python interpreter requires MSVCR90.dll.
# FIXME: Find a way around hardcoding this path # FIXME: Find a way around hardcoding this path
cp /c/windows/winsxs/x86_microsoft.vc90.crt_1fc8b3b9a1e18e3b_9.0.30729.4974_none_50940634bcb759cb/MSVCR90.DLL $DEST/generator-bin/ cp /c/windows/winsxs/x86_microsoft.vc90.crt_1fc8b3b9a1e18e3b_9.0.30729.4974_none_50940634bcb759cb/MSVCR90.DLL $DEST/generator-bin/
@@ -38,9 +41,6 @@ cat > $DEST/generator-bin/Microsoft.VC90.CRT.manifest <<EOF
</assembly> </assembly>
EOF EOF
# Remove temp file
rm $DEST/generator/protoc-gen-nanopb.py
# Package the protoc compiler # Package the protoc compiler
cp `which protoc.exe` $DEST/generator-bin/ cp `which protoc.exe` $DEST/generator-bin/
cp `which MSVCR100.DLL` $DEST/generator-bin/ cp `which MSVCR100.DLL` $DEST/generator-bin/