Create empty shell of llvm-mt.

[ecbeckmann]

Summary

This is the first patch towards creating the llvm-mt tool for merging
Windows manifests. This is a reimplementation of mt.exe.

[rnk]

lgtm

[ruiu]

llvm/tools/llvm-mt/Opts.td

3 ↗

(On Diff #106335)

By convention, option names are written in lowercase. So unsupported instead of UNSUPPORTED. Apply all other options in this file.

6 ↗

(On Diff #106335)

Help text shouldn't end with a full stop.

llvm/tools/llvm-mt/llvm-mt.cpp

48 ↗

(On Diff #106335)

This open parenthesis is not at the same indentation depth as the closing one.

66 ↗

(On Diff #106335)

It is convenient to write out "\n" here, instead of embedding "\n" as part of Msg.

71 ↗

(On Diff #106335)

Please follow the LLVM naming convention.

91 ↗

(On Diff #106335)

; -> :

117 ↗

(On Diff #106335)

Remove this blank line.

[ecbeckmann]

Formatting and naming changes to match convention.

[ruiu]

Looks like this is still the same as the old version. Can you upload again?

[ecbeckmann]

In D35333#810069, @ruiu wrote:

Looks like this is still the same as the old version. Can you upload again?

It's different. Perhaps it looks the same because you are looking at the option IDs which I left capitalized, which is actually the convention. However the actual option text that is matched and displayed in the helptext was moved to lower case. All the other changes you mentioned were also performed.

[ruiu]

Is all uppercase really a convention? I took a quick look at a few .td files in clang, and looks like they write option ids in lowercase.

[ruiu]

llvm/tools/llvm-mt/llvm-mt.cpp

48 ↗

(On Diff #106335)

Is this done?

66 ↗

(On Diff #106335)

It's not done.

71 ↗

(On Diff #106335)

argc and argv still don't follow the LLVM naming convention.

[ecbeckmann]

In D35333#810083, @ruiu wrote:

Is all uppercase really a convention? I took a quick look at a few .td files in clang, and looks like they write option ids in lowercase.

hmm it seems the convention is capital first letter, rest lower case

llvm/tools/llvm-mt/llvm-mt.cpp

48 ↗

(On Diff #106335)

shoot sorry for some reason git format keeps changing this.

66 ↗

(On Diff #106335)

hmmm in most recent revision it should be done

71 ↗

(On Diff #106335)

on most recent revision this should be fine

[ecbeckmann]

In D35333#810083, @ruiu wrote:

Is all uppercase really a convention? I took a quick look at a few .td files in clang, and looks like they write option ids in lowercase.

Or it seems there are differing conventions. I'll do lowercase for now then.

[ecbeckmann]

corrected case of options

[ruiu]

llvm/tools/llvm-mt/llvm-mt.cpp

48 ↗

(On Diff #106744)

Align the trailing \.

90 ↗

(On Diff #106744)

Error messages should start with lowercase letter.

103 ↗

(On Diff #106744)

Ditto

113 ↗

(On Diff #106744)

Ditto

66 ↗

(On Diff #106335)

Error messages shouldn't end with a full stop. See https://clang.llvm.org/diagnostics.html for example.

71 ↗

(On Diff #106335)

Is it? argc and argv should be Argc and Argv.

[ecbeckmann]

Changed errors and formatting.

[ruiu]

llvm/tools/llvm-mt/llvm-mt.cpp

90 ↗

(On Diff #106744)

Shouldn't end with a full stop.

66 ↗

(On Diff #106335)

Please fix.

71 ↗

(On Diff #106335)

Please fix.

[ecbeckmann]

remove error full stops

llvm/tools/llvm-mt/llvm-mt.cpp

71 ↗

(On Diff #106335)

Hmmm I'm not sure if Argc and Argv are the convention in this case. In all the other "mains" in llvm/tools there is variation between using argc, argc_ and *argv[], argv, *argv_[]. The most common combination is argc and argv.

[ruiu]

LGTM

llvm/tools/llvm-mt/llvm-mt.cpp

71 ↗

(On Diff #106335)

If that is a convention, that is fine, but I hope you mentioned that instead of just marking this as done.

llvm/trunk/test/CMakeLists.txt

set(LLVM_TEST_DEPENDS
           llvm-dwp
           llvm-extract
           llvm-lib
           llvm-link
           llvm-lto2
           llvm-mc
           llvm-mcmarkup
           llvm-modextract
+          llvm-mt
           llvm-nm
           llvm-objdump
           llvm-opt-report
           llvm-pdbutil
           llvm-profdata
           llvm-ranlib
           llvm-readobj
           llvm-rtdyld

llvm/trunk/test/tools/llvm-mt/help.test

+RUN: llvm-mt /? | FileCheck %s -check-prefix=HELP
+
+RUN: llvm-mt /inputresource:foo.res /manifest foo.manifest | FileCheck %s -check-prefix=NOT_SUPPORTED
+
+HELP:      OVERVIEW: Manifest Tool
+
+NOT_SUPPORTED: llvm-mt: ignoring unsupported 'inputresource:' option

llvm/trunk/tools/llvm-mt/CMakeLists.txt

+set(LLVM_LINK_COMPONENTS
+  Option
+  Support
+  )
+
+set(LLVM_TARGET_DEFINITIONS Opts.td)
+
+tablegen(LLVM Opts.inc -gen-opt-parser-defs)
+add_public_tablegen_target(MtTableGen)
+
+add_llvm_tool(llvm-mt
+  llvm-mt.cpp
+  )

llvm/trunk/tools/llvm-mt/LLVMBuild.txt

+;===- ./tools/llvm-mt/LLVMBuild.txt ---------------------------*- Conf -*--===;
+;
+;                     The LLVM Compiler Infrastructure
+;
+; This file is distributed under the University of Illinois Open Source
+; License. See LICENSE.TXT for details.
+;
+;===------------------------------------------------------------------------===;
+;
+; This is an LLVMBuild description file for the components in this subdirectory.
+;
+; For more information on the LLVMBuild system, please see:
+;
+;   http://llvm.org/docs/LLVMBuild.html
+;
+;===------------------------------------------------------------------------===;
+
+[component_0]
+type = Tool
+name = llvm-mt
+parent = Tools
+required_libraries = Option Support

llvm/trunk/tools/llvm-mt/Opts.td

+include "llvm/Option/OptParser.td"
+
+def unsupported : OptionGroup<"unsupported">;
+def manifest : Separate<["/", "-"], "manifest">, HelpText<"Used to specify each manifest that need to be processed">, MetaVarName<"manifest">;
+def identity : Joined<["/", "-"], "identity:">, HelpText<"Not supported">, MetaVarName<"identity">, Group<unsupported>;
+def rgs : Joined<["/", "-"], "rgs:">, HelpText<"Not supported">, MetaVarName<"script">, Group<unsupported>;
+def tlb : Joined<["/", "-"], "tlb:">, HelpText<"Not supported">, MetaVarName<"file">, Group<unsupported>;
+def dll : Joined<["/", "-"], "dll:">, HelpText<"Not supported">, MetaVarName<"dll">, Group<unsupported>;
+def replacements : Joined<["/", "-"], "replacements:">, HelpText<"Not supported">, MetaVarName<"file">, Group<unsupported>;
+def managed_assembly_name : Joined<["/", "-"], "managedassemblyname:">, HelpText<"Not supported">, MetaVarName<"assembly">, Group<unsupported>;
+def no_dependency : Flag<["/", "-"], "nodependency">, HelpText<"Not supported">, Group<unsupported>;
+def category : Flag<["/", "-"], "category">, HelpText<"Not supported">, Group<unsupported>;
+def no_logo : Flag<["/", "-"], "nologo">, HelpText<"No effect as this tool never writes copyright data.  Included for parity">;
+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">;
+def input_resource : Joined<["/", "-"], "inputresource:">, HelpText<"Not supported">, MetaVarName<"file">, Group<unsupported>;
+def output_resource : Joined<["/", "-"], "outputresource:">, HelpText<"Not supported">, MetaVarName<"file">, Group<unsupported>;
+def output_resource_flag : Flag<["/", "-"], "outputresource">, Alias<output_resource>, HelpText<"Not supported">, Group<unsupported>;
+def update_resource : Joined<["/", "-"], "updateresource:">, HelpText<"Not supported">, MetaVarName<"file">, Group<unsupported>;
+def hash_update : Joined<["/", "-"], "hashupdate:">, HelpText<"Not supported">, MetaVarName<"file">, Group<unsupported>;
+def hash_update_flag : Flag<["/", "-"], "hashupdate">, Alias<hash_update>, HelpText<"Not supported">, Group<unsupported>;
+def validate_manifest : Flag<["/", "-"], "validate_manifest">, HelpText<"Not supported">, Group<unsupported>;
+def validate_file_hashes : Joined<["/", "-"], "validate_file_hashes:">, HelpText<"Not supported">, MetaVarName<"">, Group<unsupported>;
+def canonicalize : Flag<["/", "-"], "canonicalize:">, HelpText<"Not supported">, Group<unsupported>;
+def check_for_duplicates : Flag<["/", "-"], "check_for_duplicates:">, HelpText<"Not supported">, Group<unsupported>;
+def make_cdfs : Flag<["/", "-"], "makecdfs:">, HelpText<"Not supported">, Group<unsupported>;
+def verbose : Flag<["/", "-"], "verbose">, HelpText<"Not supported">, Group<unsupported>;
+def help : Flag<["/", "-"], "?">;
+def help_long : Flag<["/", "-"], "help">, Alias<help>;
+def h : Flag<["/", "-"], "h">, Alias<help>;

llvm/trunk/tools/llvm-mt/llvm-mt.cpp

+//===- llvm-mt.cpp - Merge .manifest files ---------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===---------------------------------------------------------------------===//
+//
+// Merge .manifest files.  This is intended to be a platform-independent port
+// of Microsoft's mt.exe.
+//
+//===---------------------------------------------------------------------===//
+
+#include "llvm/Option/Arg.h"
+#include "llvm/Option/ArgList.h"
+#include "llvm/Option/Option.h"
+#include "llvm/Support/Error.h"
+#include "llvm/Support/ManagedStatic.h"
+#include "llvm/Support/Path.h"
+#include "llvm/Support/PrettyStackTrace.h"
+#include "llvm/Support/Process.h"
+#include "llvm/Support/Signals.h"
+#include "llvm/Support/raw_ostream.h"
+
+#include <system_error>
+
+using namespace llvm;
+
+namespace {
+
+enum ID {
+  OPT_INVALID = 0, // This is not an option ID.
+#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM,  \
+               HELPTEXT, METAVAR, VALUES)                                      \
+  OPT_##ID,
+#include "Opts.inc"
+#undef OPTION
+};
+
+#define PREFIX(NAME, VALUE) const char *const NAME[] = VALUE;
+#include "Opts.inc"
+#undef PREFIX
+
+static const opt::OptTable::Info InfoTable[] = {
+#define OPTION(PREFIX, NAME, ID, KIND, GROUP, ALIAS, ALIASARGS, FLAGS, PARAM,  \
+               HELPTEXT, METAVAR, VALUES)                                      \
+{                                                                              \
+      PREFIX,      NAME,      HELPTEXT,                                        \
+      METAVAR,     OPT_##ID,  opt::Option::KIND##Class,                        \
+      PARAM,       FLAGS,     OPT_##GROUP,                                     \
+      OPT_##ALIAS, ALIASARGS, VALUES},
+#include "Opts.inc"
+#undef OPTION
+};
+
+class CvtResOptTable : public opt::OptTable {
+public:
+  CvtResOptTable() : OptTable(InfoTable, true) {}
+};
+
+static ExitOnError ExitOnErr;
+} // namespace
+
+LLVM_ATTRIBUTE_NORETURN void reportError(Twine Msg) {
+  errs() << "llvm-mt error: " << Msg << "\n";
+  exit(1);
+}
+
+int main(int argc, const char **argv) {
+  sys::PrintStackTraceOnErrorSignal(argv[0]);
+  PrettyStackTraceProgram X(argc, argv);
+
+  ExitOnErr.setBanner("llvm-mt: ");
+
+  SmallVector<const char *, 256> argv_buf;
+  SpecificBumpPtrAllocator<char> ArgAllocator;
+  ExitOnErr(errorCodeToError(sys::Process::GetArgumentVector(
+      argv_buf, makeArrayRef(argv, argc), ArgAllocator)));
+
+  llvm_shutdown_obj Y; // Call llvm_shutdown() on exit.
+
+  CvtResOptTable T;
+  unsigned MAI, MAC;
+  ArrayRef<const char *> ArgsArr = makeArrayRef(argv + 1, argc);
+  opt::InputArgList InputArgs = T.ParseArgs(ArgsArr, MAI, MAC);
+
+  for (auto &Arg : InputArgs) {
+    if (Arg->getOption().matches(OPT_unsupported)) {
+      outs() << "llvm-mt: ignoring unsupported '" << Arg->getOption().getName()
+             << "' option\n";
+    }
+  }
+
+  if (InputArgs.hasArg(OPT_help)) {
+    T.PrintHelp(outs(), "mt", "Manifest Tool", false);
+    return 0;
+  }
+
+  std::vector<std::string> InputFiles = InputArgs.getAllArgValues(OPT_manifest);
+
+  if (InputFiles.size() == 0) {
+    reportError("no input file specified");
+  }
+
+  StringRef OutputFile;
+
+  if (InputArgs.hasArg(OPT_out)) {
+    OutputFile = InputArgs.getLastArgValue(OPT_out);
+  } else if (InputFiles.size() == 1) {
+    OutputFile = InputFiles[0];
+  } else {
+    reportError("no output file specified");
+  }
+
+  return 0;
+}