summaryrefslogtreecommitdiffstats
path: root/tools/make_windows_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_windows_package.sh
parent3bdbd4dc484945bfaa305d1df489a7805998139a (diff)
Fix protoc-gen-nanopb in linux package
Diffstat (limited to 'tools/make_windows_package.sh')
-rw-r--r--tools/make_windows_package.sh6
1 files changed, 3 insertions, 3 deletions
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/