<div dir="ltr"><span style="color:rgb(0,0,0);font-family:arial,sans-serif;font-size:13px"> out << "<?xml version=\"1.0\" standalone=\"yes\"?>\n"</span><br style="color:rgb(0,0,0);font-family:arial,sans-serif;font-size:13px">
<span style="color:rgb(0,0,0);font-family:arial,sans-serif;font-size:13px"> << "<assembly xmlns=\"urn:schemas-microsoft-</span><span style="color:rgb(0,0,0);font-family:arial,sans-serif;font-size:13px">com:asm.v1\"\n"</span><br style="color:rgb(0,0,0);font-family:arial,sans-serif;font-size:13px">
<span style="color:rgb(0,0,0);font-family:arial,sans-serif;font-size:13px"> << " manifestVersion=\"1.0\">\n"</span><br style="color:rgb(0,0,0);font-family:arial,sans-serif;font-size:13px">
<span style="color:rgb(0,0,0);font-family:arial,sans-serif;font-size:13px">- << " <trustinfo>\n"</span><br style="color:rgb(0,0,0);font-family:arial,sans-serif;font-size:13px"><span style="color:rgb(0,0,0);font-family:arial,sans-serif;font-size:13px">+ << " <trustInfo>\n"</span><br style="color:rgb(0,0,0);font-family:arial,sans-serif;font-size:13px">
<span style="color:rgb(0,0,0);font-family:arial,sans-serif;font-size:13px"> << " <security>\n"</span><br style="color:rgb(0,0,0);font-family:arial,sans-serif;font-size:13px"><span style="color:rgb(0,0,0);font-family:arial,sans-serif;font-size:13px"> << " <requestedPrivileges>\n"</span><br style="color:rgb(0,0,0);font-family:arial,sans-serif;font-size:13px">
<span style="color:rgb(0,0,0);font-family:arial,sans-serif;font-size:13px"> << " <requestedExecutionLevel level=" << ctx.getManifestLevel()</span><br style="color:rgb(0,0,0);font-family:arial,sans-serif;font-size:13px">
<span style="color:rgb(0,0,0);font-family:arial,sans-serif;font-size:13px"> << " uiAccess=" << ctx.getManifestUiAccess() << "/>\n"</span><br style="color:rgb(0,0,0);font-family:arial,sans-serif;font-size:13px">
<span style="color:rgb(0,0,0);font-family:arial,sans-serif;font-size:13px"> << " </requestedPrivileges>\n"</span><br style="color:rgb(0,0,0);font-family:arial,sans-serif;font-size:13px"><span style="color:rgb(0,0,0);font-family:arial,sans-serif;font-size:13px"> << " </security>\n"</span><br style="color:rgb(0,0,0);font-family:arial,sans-serif;font-size:13px">
<span style="color:rgb(0,0,0);font-family:arial,sans-serif;font-size:13px">- << " </trustinfo>\n";</span><br style="color:rgb(0,0,0);font-family:arial,sans-serif;font-size:13px"><span style="color:rgb(0,0,0);font-family:arial,sans-serif;font-size:13px">+ << " </trustInfo>\n";</span><br>
<div><span style="color:rgb(0,0,0);font-family:arial,sans-serif;font-size:13px"><br></span></div><div><span style="color:rgb(0,0,0);font-family:arial,sans-serif;font-size:13px">FYI, you can just eliminate the `<<`'s and the strings will be concatenated. Might simplify this code a bit or make it a bit more efficient.</span></div>
<div><span style="color:rgb(0,0,0);font-family:arial,sans-serif;font-size:13px"><br></span></div><div><span style="color:rgb(0,0,0);font-family:arial,sans-serif;font-size:13px">-- Sean Silva</span></div></div><div class="gmail_extra">
<br><br><div class="gmail_quote">On Thu, Oct 24, 2013 at 6:08 PM, Rui Ueyama <span dir="ltr"><<a href="mailto:ruiu@google.com" target="_blank">ruiu@google.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Author: ruiu<br>
Date: Thu Oct 24 17:08:19 2013<br>
New Revision: 193375<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=193375&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=193375&view=rev</a><br>
Log:<br>
[PECOFF] Fix spelling in manifest XML.<br>
<br>
Modified:<br>
lld/trunk/lib/Driver/WinLinkDriver.cpp<br>
lld/trunk/test/pecoff/manifest.test<br>
<br>
Modified: lld/trunk/lib/Driver/WinLinkDriver.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/WinLinkDriver.cpp?rev=193375&r1=193374&r2=193375&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/WinLinkDriver.cpp?rev=193375&r1=193374&r2=193375&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/lib/Driver/WinLinkDriver.cpp (original)<br>
+++ lld/trunk/lib/Driver/WinLinkDriver.cpp Thu Oct 24 17:08:19 2013<br>
@@ -223,14 +223,14 @@ std::string createManifestXml(PECOFFLink<br>
out << "<?xml version=\"1.0\" standalone=\"yes\"?>\n"<br>
<< "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\"\n"<br>
<< " manifestVersion=\"1.0\">\n"<br>
- << " <trustinfo>\n"<br>
+ << " <trustInfo>\n"<br>
<< " <security>\n"<br>
<< " <requestedPrivileges>\n"<br>
<< " <requestedExecutionLevel level=" << ctx.getManifestLevel()<br>
<< " uiAccess=" << ctx.getManifestUiAccess() << "/>\n"<br>
<< " </requestedPrivileges>\n"<br>
<< " </security>\n"<br>
- << " </trustinfo>\n";<br>
+ << " </trustInfo>\n";<br>
const std::string &dependency = ctx.getManifestDependency();<br>
if (!dependency.empty()) {<br>
out << " <dependency>\n"<br>
<br>
Modified: lld/trunk/test/pecoff/manifest.test<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/pecoff/manifest.test?rev=193375&r1=193374&r2=193375&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/pecoff/manifest.test?rev=193375&r1=193374&r2=193375&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/pecoff/manifest.test (original)<br>
+++ lld/trunk/test/pecoff/manifest.test Thu Oct 24 17:08:19 2013<br>
@@ -7,13 +7,13 @@<br>
MANIFEST: ?xml version="1.0" standalone="yes"?><br>
MANIFEST: <assembly xmlns="urn:schemas-microsoft-com:asm.v1"<br>
MANIFEST: manifestVersion="1.0"><br>
-MANIFEST: <trustinfo><br>
+MANIFEST: <trustInfo><br>
MANIFEST: <security><br>
MANIFEST: <requestedPrivileges><br>
MANIFEST: <requestedExecutionLevel level='asInvoker' uiAccess='false'/><br>
MANIFEST: </requestedPrivileges><br>
MANIFEST: </security><br>
-MANIFEST: </trustinfo><br>
+MANIFEST: </trustInfo><br>
MANIFEST: </assembly><br>
<br>
# RUN: lld -flavor link /out:%t2.exe /subsystem:console /force /opt:noref \<br>
@@ -23,13 +23,13 @@ MANIFEST: </assembly><br>
UAC: ?xml version="1.0" standalone="yes"?><br>
UAC: <assembly xmlns="urn:schemas-microsoft-com:asm.v1"<br>
UAC: manifestVersion="1.0"><br>
-UAC: <trustinfo><br>
+UAC: <trustInfo><br>
UAC: <security><br>
UAC: <requestedPrivileges><br>
UAC: <requestedExecutionLevel level='requireAdministrator' uiAccess='true'/><br>
UAC: </requestedPrivileges><br>
UAC: </security><br>
-UAC: </trustinfo><br>
+UAC: </trustInfo><br>
UAC: </assembly><br>
<br>
# RUN: lld -flavor link /out:%t3.exe /subsystem:console /force /opt:noref \<br>
@@ -39,13 +39,13 @@ UAC: </assembly><br>
DEPENDENCY: ?xml version="1.0" standalone="yes"?><br>
DEPENDENCY: <assembly xmlns="urn:schemas-microsoft-com:asm.v1"<br>
DEPENDENCY: manifestVersion="1.0"><br>
-DEPENDENCY: <trustinfo><br>
+DEPENDENCY: <trustInfo><br>
DEPENDENCY: <security><br>
DEPENDENCY: <requestedPrivileges><br>
DEPENDENCY: <requestedExecutionLevel level='asInvoker' uiAccess='false'/><br>
DEPENDENCY: </requestedPrivileges><br>
DEPENDENCY: </security><br>
-DEPENDENCY: </trustinfo><br>
+DEPENDENCY: </trustInfo><br>
DEPENDENCY: <dependency><br>
DEPENDENCY: <dependentAssembly><br>
DEPENDENCY: <assemblyIdentity foo='bar' /><br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>