diff options
| author |   Petteri Aimonen <jpa@git.mail.kapsi.fi> | 2013-11-17 22:37:48 +0200 |
|---|---|---|
| committer | Petteri Aimonen <jpa@git.mail.kapsi.fi> | 2013-12-29 20:26:58 +0200 |
| commit | 440a53f85965f35cd7bc401ef7e3fb9c4dfd1390 (patch) | |
| tree | ce41f4958dcf551a8d1f42a887d7283654af80ae /tools | |
| parent | 3bdbd4dc484945bfaa305d1df489a7805998139a (diff) | |
Fix protoc-gen-nanopb in linux package
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/make_linux_package.sh | 11 | ||||
| -rw-r--r-- | tools/make_windows_package.sh | 6 |
2 files changed, 10 insertions, 7 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 ) diff --git a/tools/make_windows_package.sh b/tools/make_windows_package.sh index 375649fa..fe83bc44 100644 --- a/tools/make_windows_package.sh +++ b/tools/make_windows_package.sh @@ -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 ) mv $DEST/generator/dist $DEST/generator-bin +# Remove temp file +rm $DEST/generator/protoc-gen-nanopb.py + # The python interpreter requires MSVCR90.dll. # 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/ @@ -38,9 +41,6 @@ cat > $DEST/generator-bin/Microsoft.VC90.CRT.manifest <<EOF </assembly> EOF -# Remove temp file -rm $DEST/generator/protoc-gen-nanopb.py - # Package the protoc compiler cp `which protoc.exe` $DEST/generator-bin/ cp `which MSVCR100.DLL` $DEST/generator-bin/ |