<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Jul 17, 2017 at 2:35 PM, Eric Beckmann via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: ecbeckmann<br>
Date: Mon Jul 17 14:35:12 2017<br>
New Revision: 308224<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=308224&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=308224&view=rev</a><br>
Log:<br>
Create empty shell of llvm-mt.<br>
<br>
Summary:<br>
This is the first patch towards creating the llvm-mt tool for merging<br>
Windows manifests. This is a reimplementation of mt.exe.<br>
<br>
Reviewers: zturner, ruiu, rnk<br>
<br>
Subscribers: llvm-commits, mgorny<br>
<br>
Differential Revision: <a href="https://reviews.llvm.org/D35333" rel="noreferrer" target="_blank">https://reviews.llvm.org/<wbr>D35333</a><br>
<br>
Added:<br>
llvm/trunk/test/tools/llvm-mt/<br>
llvm/trunk/test/tools/llvm-mt/<wbr>help.test<br>
llvm/trunk/tools/llvm-mt/<br>
llvm/trunk/tools/llvm-mt/<wbr>CMakeLists.txt<br>
llvm/trunk/tools/llvm-mt/<wbr>LLVMBuild.txt<br>
llvm/trunk/tools/llvm-mt/Opts.<wbr>td<br>
llvm/trunk/tools/llvm-mt/llvm-<wbr>mt.cpp<br>
Modified:<br>
llvm/trunk/test/CMakeLists.txt<br>
<br>
Modified: llvm/trunk/test/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CMakeLists.txt?rev=308224&r1=308223&r2=308224&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/test/<wbr>CMakeLists.txt?rev=308224&r1=<wbr>308223&r2=308224&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/test/CMakeLists.txt (original)<br>
+++ llvm/trunk/test/CMakeLists.txt Mon Jul 17 14:35:12 2017<br>
@@ -58,6 +58,7 @@ set(LLVM_TEST_DEPENDS<br>
llvm-mc<br>
llvm-mcmarkup<br>
llvm-modextract<br>
+ llvm-mt<br>
llvm-nm<br>
llvm-objdump<br>
llvm-opt-report<br>
<br>
Added: llvm/trunk/test/tools/llvm-mt/<wbr>help.test<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-mt/help.test?rev=308224&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/test/tools/<wbr>llvm-mt/help.test?rev=308224&<wbr>view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/test/tools/llvm-mt/<wbr>help.test (added)<br>
+++ llvm/trunk/test/tools/llvm-mt/<wbr>help.test Mon Jul 17 14:35:12 2017<br>
@@ -0,0 +1,7 @@<br>
+RUN: llvm-mt /? | FileCheck %s -check-prefix=HELP<br>
+<br>
+RUN: llvm-mt /inputresource:foo.res /manifest foo.manifest | FileCheck %s -check-prefix=NOT_SUPPORTED<br>
+<br>
+HELP: OVERVIEW: Manifest Tool<br>
+<br>
+NOT_SUPPORTED: llvm-mt: ignoring unsupported 'inputresource:' option<br>
<br>
Added: llvm/trunk/tools/llvm-mt/<wbr>CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mt/CMakeLists.txt?rev=308224&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/tools/llvm-<wbr>mt/CMakeLists.txt?rev=308224&<wbr>view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/tools/llvm-mt/<wbr>CMakeLists.txt (added)<br>
+++ llvm/trunk/tools/llvm-mt/<wbr>CMakeLists.txt Mon Jul 17 14:35:12 2017<br>
@@ -0,0 +1,13 @@<br>
+set(LLVM_LINK_COMPONENTS<br>
+ Option<br>
+ Support<br>
+ )<br>
+<br>
+set(LLVM_TARGET_DEFINITIONS Opts.td)<br>
+<br>
+tablegen(LLVM Opts.inc -gen-opt-parser-defs)<br>
+add_public_tablegen_target(<wbr>MtTableGen)<br>
+<br>
+add_llvm_tool(llvm-mt<br>
+ llvm-mt.cpp<br>
+ )<br>
<br>
Added: llvm/trunk/tools/llvm-mt/<wbr>LLVMBuild.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mt/LLVMBuild.txt?rev=308224&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/tools/llvm-<wbr>mt/LLVMBuild.txt?rev=308224&<wbr>view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/tools/llvm-mt/<wbr>LLVMBuild.txt (added)<br>
+++ llvm/trunk/tools/llvm-mt/<wbr>LLVMBuild.txt Mon Jul 17 14:35:12 2017<br>
@@ -0,0 +1,22 @@<br>
+;===- ./tools/llvm-mt/LLVMBuild.txt ---------------------------*- Conf -*--===;<br>
+;<br>
+; The LLVM Compiler Infrastructure<br>
+;<br>
+; This file is distributed under the University of Illinois Open Source<br>
+; License. See LICENSE.TXT for details.<br>
+;<br>
+;===-------------------------<wbr>------------------------------<wbr>-----------------===;<br>
+;<br>
+; This is an LLVMBuild description file for the components in this subdirectory.<br>
+;<br>
+; For more information on the LLVMBuild system, please see:<br>
+;<br>
+; <a href="http://llvm.org/docs/LLVMBuild.html" rel="noreferrer" target="_blank">http://llvm.org/docs/<wbr>LLVMBuild.html</a><br>
+;<br>
+;===-------------------------<wbr>------------------------------<wbr>-----------------===;<br>
+<br>
+[component_0]<br>
+type = Tool<br>
+name = llvm-mt<br>
+parent = Tools<br>
+required_libraries = Option Support<br>
<br>
Added: llvm/trunk/tools/llvm-mt/Opts.<wbr>td<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mt/Opts.td?rev=308224&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/tools/llvm-<wbr>mt/Opts.td?rev=308224&view=<wbr>auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/tools/llvm-mt/Opts.<wbr>td (added)<br>
+++ llvm/trunk/tools/llvm-mt/Opts.<wbr>td Mon Jul 17 14:35:12 2017<br>
@@ -0,0 +1,29 @@<br>
+include "llvm/Option/OptParser.td"<br>
+<br>
+def unsupported : OptionGroup<"unsupported">;<br>
+def manifest : Separate<["/", "-"], "manifest">, HelpText<"Used to specify each manifest that need to be processed">, MetaVarName<"manifest">;<br>
+def identity : Joined<["/", "-"], "identity:">, HelpText<"Not supported">, MetaVarName<"identity">, Group<unsupported>;<br>
+def rgs : Joined<["/", "-"], "rgs:">, HelpText<"Not supported">, MetaVarName<"script">, Group<unsupported>;<br>
+def tlb : Joined<["/", "-"], "tlb:">, HelpText<"Not supported">, MetaVarName<"file">, Group<unsupported>;<br>
+def dll : Joined<["/", "-"], "dll:">, HelpText<"Not supported">, MetaVarName<"dll">, Group<unsupported>;<br>
+def replacements : Joined<["/", "-"], "replacements:">, HelpText<"Not supported">, MetaVarName<"file">, Group<unsupported>;<br>
+def managed_assembly_name : Joined<["/", "-"], "managedassemblyname:">, HelpText<"Not supported">, MetaVarName<"assembly">, Group<unsupported>;<br>
+def no_dependency : Flag<["/", "-"], "nodependency">, HelpText<"Not supported">, Group<unsupported>;<br>
+def category : Flag<["/", "-"], "category">, HelpText<"Not supported">, Group<unsupported>;<br>
+def no_logo : Flag<["/", "-"], "nologo">, HelpText<"No effect as this tool never writes copyright data. Included for parity">;<br>
+def out : Joined<["/", "-"], "out:">, HelpText<"Name of the output manifest. If this is skipped and only one manifest is being operated upon by the tool, that manifest is modified in place">, MetaVarName<"manifest">;<br>
+def input_resource : Joined<["/", "-"], "inputresource:">, HelpText<"Not supported">, MetaVarName<"file">, Group<unsupported>;<br>
+def output_resource : Joined<["/", "-"], "outputresource:">, HelpText<"Not supported">, MetaVarName<"file">, Group<unsupported>;<br>
+def output_resource_flag : Flag<["/", "-"], "outputresource">, Alias<output_resource>, HelpText<"Not supported">, Group<unsupported>;<br>
+def update_resource : Joined<["/", "-"], "updateresource:">, HelpText<"Not supported">, MetaVarName<"file">, Group<unsupported>;<br>
+def hash_update : Joined<["/", "-"], "hashupdate:">, HelpText<"Not supported">, MetaVarName<"file">, Group<unsupported>;<br>
+def hash_update_flag : Flag<["/", "-"], "hashupdate">, Alias<hash_update>, HelpText<"Not supported">, Group<unsupported>;<br>
+def validate_manifest : Flag<["/", "-"], "validate_manifest">, HelpText<"Not supported">, Group<unsupported>;<br>
+def validate_file_hashes : Joined<["/", "-"], "validate_file_hashes:">, HelpText<"Not supported">, MetaVarName<"">, Group<unsupported>;<br>
+def canonicalize : Flag<["/", "-"], "canonicalize:">, HelpText<"Not supported">, Group<unsupported>;<br>
+def check_for_duplicates : Flag<["/", "-"], "check_for_duplicates:">, HelpText<"Not supported">, Group<unsupported>;<br>
+def make_cdfs : Flag<["/", "-"], "makecdfs:">, HelpText<"Not supported">, Group<unsupported>;<br>
+def verbose : Flag<["/", "-"], "verbose">, HelpText<"Not supported">, Group<unsupported>;<br>
+def help : Flag<["/", "-"], "?">;<br>
+def help_long : Flag<["/", "-"], "help">, Alias<help>;<br>
+def h : Flag<["/", "-"], "h">, Alias<help>;<br>
<br>
Added: llvm/trunk/tools/llvm-mt/llvm-<wbr>mt.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mt/llvm-mt.cpp?rev=308224&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/tools/llvm-<wbr>mt/llvm-mt.cpp?rev=308224&<wbr>view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/tools/llvm-mt/llvm-<wbr>mt.cpp (added)<br>
+++ llvm/trunk/tools/llvm-mt/llvm-<wbr>mt.cpp Mon Jul 17 14:35:12 2017<br>
@@ -0,0 +1,117 @@<br>
+//===- llvm-mt.cpp - Merge .manifest files ---------------------*- C++ -*-===//<br>
+//<br>
+// The LLVM Compiler Infrastructure<br>
+//<br>
+// This file is distributed under the University of Illinois Open Source<br>
+// License. See LICENSE.TXT for details.<br>
+//<br>
+//===------------------------<wbr>------------------------------<wbr>---------------===//<br>
+//<br>
+// Merge .manifest files. This is intended to be a platform-independent port<br>
+// of Microsoft's mt.exe.<br>
+//<br>
+//===------------------------<wbr>------------------------------<wbr>---------------===//<br>
+<br>
+#include "llvm/Option/Arg.h"<br>
+#include "llvm/Option/ArgList.h"<br>
+#include "llvm/Option/Option.h"<br>
+#include "llvm/Support/Error.h"<br>
+#include "llvm/Support/ManagedStatic.h"<br>
+#include "llvm/Support/Path.h"<br>
+#include "llvm/Support/<wbr>PrettyStackTrace.h"<br>
+#include "llvm/Support/Process.h"<br>
+#include "llvm/Support/Signals.h"<br>
+#include "llvm/Support/raw_ostream.h"<br>
+<br>
+#include <system_error><br>
+<br>
+using namespace llvm;<br>
+<br>
+namespace {<br>
+<br>
+enum ID {<br>
+ OPT_INVALID = 0, // This is not an option ID.<br>
+#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \<br>
+ HELPTEXT, METAVAR, VALUES) \<br>
+ OPT_##ID,<br>
+#include "Opts.inc"<br>
+#undef OPTION<br>
+};<br>
+<br>
+#define PREFIX(NAME, VALUE) const char *const NAME[] = VALUE;<br>
+#include "Opts.inc"<br>
+#undef PREFIX<br>
+<br>
+static const opt::OptTable::Info InfoTable[] = {<br>
+#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM, \<br>
+ HELPTEXT, METAVAR, VALUES) \<br>
+{ \<br>
+ PREFIX, NAME, HELPTEXT, \<br>
+ METAVAR, OPT_##ID, opt::Option::KIND##Class, \<br>
+ PARAM, FLAGS, OPT_##GROUP, \<br>
+ OPT_##ALIAS, ALIASARGS, VALUES},<br>
+#include "Opts.inc"<br>
+#undef OPTION<br>
+};<br>
+<br>
+class CvtResOptTable : public opt::OptTable {<br>
+public:<br>
+ CvtResOptTable() : OptTable(InfoTable, true) {}<br>
+};<br>
+<br>
+static ExitOnError ExitOnErr;<br>
+} // namespace<br>
+<br>
+LLVM_ATTRIBUTE_NORETURN void reportError(Twine Msg) {<br>
+ errs() << "llvm-mt error: " << Msg << "\n";<br>
+ exit(1);<br>
+}<br>
+<br>
+int main(int argc, const char **argv) {<br>
+ sys::<wbr>PrintStackTraceOnErrorSignal(<wbr>argv[0]);<br>
+ PrettyStackTraceProgram X(argc, argv);<br>
+<br>
+ ExitOnErr.setBanner("llvm-mt: ");<br>
+<br>
+ SmallVector<const char *, 256> argv_buf;<br>
+ SpecificBumpPtrAllocator<char> ArgAllocator;<br>
+ ExitOnErr(errorCodeToError(<wbr>sys::Process::<wbr>GetArgumentVector(<br>
+ argv_buf, makeArrayRef(argv, argc), ArgAllocator)));<br>
+<br>
+ llvm_shutdown_obj Y; // Call llvm_shutdown() on exit.<br>
+<br>
+ CvtResOptTable T;<br>
+ unsigned MAI, MAC;<br>
+ ArrayRef<const char *> ArgsArr = makeArrayRef(argv + 1, argc);<br>
+ opt::InputArgList InputArgs = T.ParseArgs(ArgsArr, MAI, MAC);<br>
+<br>
+ for (auto &Arg : InputArgs) {<br>
+ if (Arg->getOption().matches(OPT_<wbr>unsupported)) {<br>
+ outs() << "llvm-mt: ignoring unsupported '" << Arg->getOption().getName()<br>
+ << "' option\n";<br>
+ }<br>
+ }<br>
+<br>
+ if (InputArgs.hasArg(OPT_help)) {<br>
+ T.PrintHelp(outs(), "mt", "Manifest Tool", false);<br>
+ return 0;<br>
+ }<br>
+<br>
+ std::vector<std::string> InputFiles = InputArgs.getAllArgValues(OPT_<wbr>manifest);<br>
+<br>
+ if (InputFiles.size() == 0) {<br></blockquote><div><br></div><div>It is more customary to use empty() instead of size() == 0.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+ reportError("no input file specified");<br>
+ }<br>
+<br>
+ StringRef OutputFile;<br>
+<br>
+ if (InputArgs.hasArg(OPT_out)) {<br>
+ OutputFile = InputArgs.getLastArgValue(OPT_<wbr>out);<br>
+ } else if (InputFiles.size() == 1) {<br>
+ OutputFile = InputFiles[0];<br>
+ } else {<br>
+ reportError("no output file specified");<br>
+ }<br>
+<br>
+ return 0;<br>
+}<br>
<br>
<br>
______________________________<wbr>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>