[llvm] r308224 - Create empty shell of llvm-mt.
David Majnemer via llvm-commits
llvm-commits at lists.llvm.org
Mon Jul 17 21:24:53 PDT 2017
On Mon, Jul 17, 2017 at 2:35 PM, Eric Beckmann via llvm-commits <
llvm-commits at lists.llvm.org> wrote:
> Author: ecbeckmann
> Date: Mon Jul 17 14:35:12 2017
> New Revision: 308224
>
> URL: http://llvm.org/viewvc/llvm-project?rev=308224&view=rev
> Log:
> Create empty shell of llvm-mt.
>
> Summary:
> This is the first patch towards creating the llvm-mt tool for merging
> Windows manifests. This is a reimplementation of mt.exe.
>
> Reviewers: zturner, ruiu, rnk
>
> Subscribers: llvm-commits, mgorny
>
> Differential Revision: https://reviews.llvm.org/D35333
>
> Added:
> llvm/trunk/test/tools/llvm-mt/
> llvm/trunk/test/tools/llvm-mt/help.test
> llvm/trunk/tools/llvm-mt/
> llvm/trunk/tools/llvm-mt/CMakeLists.txt
> llvm/trunk/tools/llvm-mt/LLVMBuild.txt
> llvm/trunk/tools/llvm-mt/Opts.td
> llvm/trunk/tools/llvm-mt/llvm-mt.cpp
> Modified:
> llvm/trunk/test/CMakeLists.txt
>
> Modified: llvm/trunk/test/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/
> CMakeLists.txt?rev=308224&r1=308223&r2=308224&view=diff
> ============================================================
> ==================
> --- llvm/trunk/test/CMakeLists.txt (original)
> +++ llvm/trunk/test/CMakeLists.txt Mon Jul 17 14:35:12 2017
> @@ -58,6 +58,7 @@ set(LLVM_TEST_DEPENDS
> llvm-mc
> llvm-mcmarkup
> llvm-modextract
> + llvm-mt
> llvm-nm
> llvm-objdump
> llvm-opt-report
>
> Added: llvm/trunk/test/tools/llvm-mt/help.test
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/
> llvm-mt/help.test?rev=308224&view=auto
> ============================================================
> ==================
> --- llvm/trunk/test/tools/llvm-mt/help.test (added)
> +++ llvm/trunk/test/tools/llvm-mt/help.test Mon Jul 17 14:35:12 2017
> @@ -0,0 +1,7 @@
> +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
>
> Added: llvm/trunk/tools/llvm-mt/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-
> mt/CMakeLists.txt?rev=308224&view=auto
> ============================================================
> ==================
> --- llvm/trunk/tools/llvm-mt/CMakeLists.txt (added)
> +++ llvm/trunk/tools/llvm-mt/CMakeLists.txt Mon Jul 17 14:35:12 2017
> @@ -0,0 +1,13 @@
> +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
> + )
>
> Added: llvm/trunk/tools/llvm-mt/LLVMBuild.txt
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-
> mt/LLVMBuild.txt?rev=308224&view=auto
> ============================================================
> ==================
> --- llvm/trunk/tools/llvm-mt/LLVMBuild.txt (added)
> +++ llvm/trunk/tools/llvm-mt/LLVMBuild.txt Mon Jul 17 14:35:12 2017
> @@ -0,0 +1,22 @@
> +;===- ./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
>
> Added: llvm/trunk/tools/llvm-mt/Opts.td
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-
> mt/Opts.td?rev=308224&view=auto
> ============================================================
> ==================
> --- llvm/trunk/tools/llvm-mt/Opts.td (added)
> +++ llvm/trunk/tools/llvm-mt/Opts.td Mon Jul 17 14:35:12 2017
> @@ -0,0 +1,29 @@
> +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>;
>
> Added: llvm/trunk/tools/llvm-mt/llvm-mt.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-
> mt/llvm-mt.cpp?rev=308224&view=auto
> ============================================================
> ==================
> --- llvm/trunk/tools/llvm-mt/llvm-mt.cpp (added)
> +++ llvm/trunk/tools/llvm-mt/llvm-mt.cpp Mon Jul 17 14:35:12 2017
> @@ -0,0 +1,117 @@
> +//===- 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) {
>
It is more customary to use empty() instead of 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;
> +}
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170717/8bc1a880/attachment.html>
More information about the llvm-commits
mailing list