From b5eac4ab9a7b63d90533e48531a025a99d45595f Mon Sep 17 00:00:00 2001
From: Dan Gudmundsson <dgud@users.sourceforge.net>
Date: Fri, 12 Nov 2010 16:21:13 +0100
Subject: Fix manifest files

It seems windows have updated manifest files in VS2010 which
caused the erlang programs to contain duplicate requestedExecutionLevel
entries, which is not allowed.

This patch removes the microsoft entry, before adding our own which
is known to work with XP and Vista.
---
 erts/etc/win32/cygwin_tools/vc/ld.sh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'erts/etc/win32/cygwin_tools')

diff --git a/erts/etc/win32/cygwin_tools/vc/ld.sh b/erts/etc/win32/cygwin_tools/vc/ld.sh
index b04935ed9b..060777f4fb 100755
--- a/erts/etc/win32/cygwin_tools/vc/ld.sh
+++ b/erts/etc/win32/cygwin_tools/vc/ld.sh
@@ -168,6 +168,7 @@ RES=$?
 CMANIFEST=`cygpath $MANIFEST`
 if [ "$RES" = "0" -a -f "$CMANIFEST" ]; then
     # Add stuff to manifest to turn off "virtualization"
+    sed -n -i '1h;1!H;${;g;s,<trustInfo.*</trustInfo>.,,g;p;}' $CMANIFEST
     sed -i "s/<\/assembly>/ <ms_asmv2:trustInfo xmlns:ms_asmv2=\"urn:schemas-microsoft-com:asm.v2\">\n  <ms_asmv2:security>\n   <ms_asmv2:requestedPrivileges>\n    <ms_asmv2:requestedExecutionLevel level=\"AsInvoker\" uiAccess=\"false\"\/>\n   <\/ms_asmv2:requestedPrivileges>\n  <\/ms_asmv2:security>\n <\/ms_asmv2:trustInfo>\n<\/assembly>/" $CMANIFEST
 
     eval mt.exe -nologo -manifest "$MANIFEST" -outputresource:"$OUTPUTRES" >>/tmp/link.exe.${p}.1 2>>/tmp/link.exe.${p}.2
-- 
cgit v1.2.3