Title: [149916] trunk/Tools
Revision
149916
Author
[email protected]
Date
2013-05-10 17:46:16 -0700 (Fri, 10 May 2013)

Log Message

[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.

Modified Paths

Added Paths

Diff

Modified: trunk/Tools/ChangeLog (149915 => 149916)


--- trunk/Tools/ChangeLog	2013-05-11 00:32:05 UTC (rev 149915)
+++ trunk/Tools/ChangeLog	2013-05-11 00:46:16 UTC (rev 149916)
@@ -1,3 +1,15 @@
+2013-05-10  Brent Fulgham  <[email protected]>
+
+        [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  <[email protected]>
 
         Fix some compiler warnings (miscellaneous)

Added: trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.exe.manifest (0 => 149916)


--- trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.exe.manifest	                        (rev 0)
+++ trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.exe.manifest	2013-05-11 00:46:16 UTC (rev 149916)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+    <assemblyIdentity
+      version="1.0.0.0"
+        processorArchitecture="X86"
+        name="apple.WebKit.WinLauncher.exe"
+        type="win32"
+    />
+    <description>WinLauncher Test Utility</description>
+    <dependency>
+        <dependentAssembly>
+            <assemblyIdentity
+                type="win32"
+                name="Microsoft.Windows.Common-Controls"
+                version="6.0.0.0"
+                processorArchitecture="X86"
+                publicKeyToken="6595b64144ccf1df"
+                language="*"
+            />
+        </dependentAssembly>
+    </dependency>
+    <dependency>
+      <dependentAssembly>
+            <assemblyIdentity
+                 type="win32"
+                 name="Microsoft.VC80.CRT"
+                 version="8.0.50727.6195"
+                 processorArchitecture="x86"
+                 publicKeyToken="1fc8b3b9a1e18e3b"
+            />
+      </dependentAssembly>
+    </dependency>
+
+    <!-- Set application to run with user privilege but no virtualization. -->
+    <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+        <security>
+            <requestedPrivileges>
+                <requestedExecutionLevel
+                    level="asInvoker"
+                    uiAccess="false"
+            />
+            </requestedPrivileges>
+        </security>
+    </trustInfo>
+</assembly>

Modified: trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj (149915 => 149916)


--- trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj	2013-05-11 00:32:05 UTC (rev 149915)
+++ trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj	2013-05-11 00:46:16 UTC (rev 149916)
@@ -104,6 +104,9 @@
     <None Include="WinLauncherPostBuild.cmd" />
     <None Include="WinLauncherPreBuild.cmd" />
   </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="WinLauncher.exe.manifest" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

Modified: trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj.filters (149915 => 149916)


--- trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj.filters	2013-05-11 00:32:05 UTC (rev 149915)
+++ trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj.filters	2013-05-11 00:46:16 UTC (rev 149916)
@@ -30,4 +30,9 @@
     <None Include="WinLauncherPostBuild.cmd" />
     <None Include="WinLauncherPreBuild.cmd" />
   </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="WinLauncher.exe.manifest">
+      <Filter>Resource Files</Filter>
+    </Manifest>
+  </ItemGroup>
 </Project>
\ No newline at end of file
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to