X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=tools%2Fmake_windows_package.sh;h=72de6f3394a40af16df6c214de643767dcb6563d;hb=c201f368c592508e8f2289c3f0f19e681db153a3;hp=d8999a9780b61e1facb29ea7faa4a2458daf094e;hpb=1d42f72f409b4a464b28d2c706f4d0fd213a8541;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 d8999a97..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,12 +26,20 @@ 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/
-
-# Remove temp file
-rm $DEST/generator/protoc-gen-nanopb.py
+cat > $DEST/generator-bin/Microsoft.VC90.CRT.manifest <<EOF
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+    <noInheritable></noInheritable>
+    <assemblyIdentity type="win32" name="Microsoft.VC90.CRT" version="9.0.21022.8" processorArchitecture="x86" publicKeyToken="1fc8b3b9a1e18e3b"></assemblyIdentity>
+    <file name="msvcr90.dll" hashalg="SHA1" hash="e0dcdcbfcb452747da530fae6b000d47c8674671"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>KSaO8M0iCtPF6YEr79P1dZsnomY=</dsig:DigestValue></asmv2:hash></file> <file name="msvcp90.dll" hashalg="SHA1" hash="81efe890e4ef2615c0bb4dda7b94bea177c86ebd"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>ojDmTgpYMFRKJYkPcM6ckpYkWUU=</dsig:DigestValue></asmv2:hash></file> <file name="msvcm90.dll" hashalg="SHA1" hash="5470081b336abd7b82c6387567a661a729483b04"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>tVogb8kezDre2mXShlIqpp8ErIg=</dsig:DigestValue></asmv2:hash></file>
+</assembly>
+EOF
 
 # Package the protoc compiler
 cp `which protoc.exe` $DEST/generator-bin/