[Windows] Allow VS2010 Build to use VS2005 Support Libraries

https://bugs.webkit.org/show_bug.cgi?id=115935

Reviewed by Jer Noble.

* WinLauncher/WinLauncher.vcxproj/WinLauncher.exe.manifest: Added.
* WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj: Add reference
to the new manifest file.
* WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj.filters: Ditto.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@149916 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 54e3772..90f5b3c 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2013-05-10  Brent Fulgham  <bfulgham@apple.com>
+
+        [Windows] Allow VS2010 Build to use VS2005 Support Libraries
+        https://bugs.webkit.org/show_bug.cgi?id=115935
+
+        Reviewed by Jer Noble.
+
+        * WinLauncher/WinLauncher.vcxproj/WinLauncher.exe.manifest: Added.
+        * WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj: Add reference
+        to the new manifest file.
+        * WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj.filters: Ditto.
+
 2013-05-10  Jacky Jiang  <zhajiang@blackberry.com>
 
         Fix some compiler warnings (miscellaneous)

diff --git a/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.exe.manifest b/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.exe.manifest
new file mode 100644 (file)
index 0000000..5c6aca7
--- /dev/null
+++ b/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.exe.manifest
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\r
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">\r
+    <assemblyIdentity\r
+      version="1.0.0.0"\r
+        processorArchitecture="X86"\r
+        name="apple.WebKit.WinLauncher.exe"\r
+        type="win32"\r
+    />\r
+    <description>WinLauncher Test Utility</description>\r
+    <dependency>\r
+        <dependentAssembly>\r
+            <assemblyIdentity\r
+                type="win32"\r
+                name="Microsoft.Windows.Common-Controls"\r
+                version="6.0.0.0"\r
+                processorArchitecture="X86"\r
+                publicKeyToken="6595b64144ccf1df"\r
+                language="*"\r
+            />\r
+        </dependentAssembly>\r
+    </dependency>\r
+    <dependency>\r
+      <dependentAssembly>\r
+            <assemblyIdentity\r
+                 type="win32"\r
+                 name="Microsoft.VC80.CRT"\r
+                 version="8.0.50727.6195"\r
+                 processorArchitecture="x86"\r
+                 publicKeyToken="1fc8b3b9a1e18e3b"\r
+            />\r
+      </dependentAssembly>\r
+    </dependency>\r
+\r
+    <!-- Set application to run with user privilege but no virtualization. -->\r
+    <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">\r
+        <security>\r
+            <requestedPrivileges>\r
+                <requestedExecutionLevel\r
+                    level="asInvoker"\r
+                    uiAccess="false"\r
+            />\r
+            </requestedPrivileges>\r
+        </security>\r
+    </trustInfo>\r
+</assembly>\r

diff --git a/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj b/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj
index 7307de6..f116f42 100644 (file)
--- a/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj
+++ b/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj
@@ -104,6 +104,9 @@
     <None Include="WinLauncherPostBuild.cmd" />\r
     <None Include="WinLauncherPreBuild.cmd" />\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <Manifest Include="WinLauncher.exe.manifest" />\r
+  </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r

diff --git a/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj.filters b/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj.filters
index 9bdcce3..8b74721 100644 (file)
--- a/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj.filters
+++ b/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj.filters
@@ -30,4 +30,9 @@
     <None Include="WinLauncherPostBuild.cmd" />\r
     <None Include="WinLauncherPreBuild.cmd" />\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <Manifest Include="WinLauncher.exe.manifest">\r
+      <Filter>Resource Files</Filter>\r
+    </Manifest>\r
+  </ItemGroup>\r
 </Project>
\ No newline at end of file