From 9b265043d77afd93e95e23e5edda6ccc1085cef0 Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Wed, 21 Jul 2010 17:30:08 +0200
Subject: Turn off windows "virtualiztion"

---
 erts/etc/win32/cygwin_tools/vc/ld.sh | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'erts')

diff --git a/erts/etc/win32/cygwin_tools/vc/ld.sh b/erts/etc/win32/cygwin_tools/vc/ld.sh
index ac39bf871c..4fa3312286 100755
--- a/erts/etc/win32/cygwin_tools/vc/ld.sh
+++ b/erts/etc/win32/cygwin_tools/vc/ld.sh
@@ -167,6 +167,9 @@ eval link.exe "$CMD"  >/tmp/link.exe.${p}.1 2>/tmp/link.exe.${p}.2
 RES=$?
 CMANIFEST=`cygpath $MANIFEST`
 if [ "$RES" = "0" -a -f "$CMANIFEST" ]; then
+    # Add stuff to manifest to turn off "virtualization"
+    sed -i "s/<\/assembly>/ <trustInfo>\n  <security>\n   <requestedPrivileges>\n    <requestedExecutionLevel level=\"AsInvoker\" uiAccess=\"false\"\/>\n   <\/requestedPrivileges>\n  <\/security>\n <\/trustInfo>\n<\/assembly>/" $CMANIFEST
+
     eval mt.exe -nologo -manifest "$MANIFEST" -outputresource:"$OUTPUTRES" >>/tmp/link.exe.${p}.1 2>>/tmp/link.exe.${p}.2
     RES=$?
     if [ "$RES" != "0" ]; then
-- 
cgit v1.2.3


From 57fb67b4a54ba3943efd3784433b01f9fa341747 Mon Sep 17 00:00:00 2001
From: Patrik Nyblom <pan@erlang.org>
Date: Fri, 23 Jul 2010 19:44:11 +0200
Subject: Teach XP to ignore virtualization part of manifest

ld.sh built files not executable on XP, as parts of the manifest
were incomprehensible for XP machines.
---
 erts/etc/win32/cygwin_tools/vc/ld.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'erts')

diff --git a/erts/etc/win32/cygwin_tools/vc/ld.sh b/erts/etc/win32/cygwin_tools/vc/ld.sh
index 4fa3312286..b04935ed9b 100755
--- a/erts/etc/win32/cygwin_tools/vc/ld.sh
+++ b/erts/etc/win32/cygwin_tools/vc/ld.sh
@@ -3,7 +3,7 @@
 # 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2002-2009. All Rights Reserved.
+# Copyright Ericsson AB 2002-2010. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -168,7 +168,7 @@ RES=$?
 CMANIFEST=`cygpath $MANIFEST`
 if [ "$RES" = "0" -a -f "$CMANIFEST" ]; then
     # Add stuff to manifest to turn off "virtualization"
-    sed -i "s/<\/assembly>/ <trustInfo>\n  <security>\n   <requestedPrivileges>\n    <requestedExecutionLevel level=\"AsInvoker\" uiAccess=\"false\"\/>\n   <\/requestedPrivileges>\n  <\/security>\n <\/trustInfo>\n<\/assembly>/" $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
     RES=$?
-- 
cgit v1.2.3