X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=tools%2Fmake_windows_package.sh;h=72de6f3394a40af16df6c214de643767dcb6563d;hb=011a30af9c015b1edd67420d9ca947e9fb499e73;hp=375649fa888745af175f6e216a611e9981f23f56;hpb=94422ad456a659b2d78cc4956b937e3d1f98a187;p=apps%2Fagl-service-can-low-level.git diff --git a/tools/make_windows_package.sh b/tools/make_windows_package.sh old mode 100644 new mode 100755 index 375649fa..72de6f33 --- a/tools/make_windows_package.sh +++ b/tools/make_windows_package.sh @@ -7,7 +7,7 @@ set -e set -x -VERSION=`git describe --always` +VERSION=`git describe --always`-windows-x86 DEST=dist/$VERSION rm -rf $DEST @@ -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 -# 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/