Skip to content

Commit

Permalink
Add empty shell of llvm-cvtres.
Browse files Browse the repository at this point in the history
This marks the beginning of an effort to port remaining
MSVC toolchain miscellaneous utilities to all platforms.

Currently clang-cl shells out to certain additional tools
such as the IDL compiler, resource compiler, and a few
other tools, but as these tools are Windows-only it
limits the ability of clang to target Windows on other
platforms.  having a full suite of these tools directly
in LLVM should eliminate this constraint.

The current implementation provides no actual functionality,
it is just an empty skeleton executable for the purposes
of making incremental changes.

Differential Revision: https://reviews.llvm.org/D32095
Patch by Eric Beckmann (ecbeckmann@google.com)

llvm-svn: 301004
  • Loading branch information
Zachary Turner committed Apr 21, 2017
1 parent d1be869 commit 087edfa
Show file tree
Hide file tree
Showing 6 changed files with 149 additions and 0 deletions.
4 changes: 4 additions & 0 deletions llvm/test/tools/llvm-cvtres/basic.test
@@ -0,0 +1,4 @@
; RUN: llvm-cvtres /h > %t
; RUN: FileCheck -input-file=%t %s -check-prefix=HELP_TEST

; HELP_TEST: OVERVIEW: Resource Converter
13 changes: 13 additions & 0 deletions llvm/tools/llvm-cvtres/CMakeLists.txt
@@ -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(CvtResTableGen)

add_llvm_tool(llvm-cvtres
llvm-cvtres.cpp
)
22 changes: 22 additions & 0 deletions llvm/tools/llvm-cvtres/LLVMBuild.txt
@@ -0,0 +1,22 @@
;===- ./tools/llvm-cvtres/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-cvtres
parent = Tools
required_libraries = Option Support
11 changes: 11 additions & 0 deletions llvm/tools/llvm-cvtres/Opts.td
@@ -0,0 +1,11 @@
include "llvm/Option/OptParser.td"

def DEFINE : Joined<["/"], "DEFINE:">, HelpText<"">, MetaVarName<"symbol">;
def FOLDDUPS : Flag<["/"], "FOLDDUPS:">, HelpText<"">;
def MACHINE : Joined<["/"], "MACHINE:">, HelpText<"">, MetaVarName<"{ARM|EBC|IA64|X64|X86}">;
def NOLOGO : Flag<["/"], "NOLOGO">, HelpText<"">;
def OUT : Joined<["/"], "OUT:">, HelpText<"">, MetaVarName<"filename">;
def READONLY : Flag<["/"], "READONLY">, HelpText<"">;
def VERBOSE : Flag<["/"], "VERBOSE">, HelpText<"">;
def HELP : Flag<["/"], "HELP">;
def H : Flag<["/"], "H">, Alias<HELP>;
86 changes: 86 additions & 0 deletions llvm/tools/llvm-cvtres/llvm-cvtres.cpp
@@ -0,0 +1,86 @@
//===- llvm-cvtres.cpp - Serialize .res files into .obj ---------*- C++ -*-===//
//
// The LLVM Compiler Infrastructure
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
// Serialize .res files into .obj files. This is intended to be a
// platform-independent port of Microsoft's cvtres.exe.
//
//===----------------------------------------------------------------------===//

#include "llvm-cvtres.h"

#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/PrettyStackTrace.h"
#include "llvm/Support/Process.h"
#include "llvm/Support/Signals.h"
#include "llvm/Support/raw_ostream.h"

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) \
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) \
{ \
PREFIX, NAME, HELPTEXT, \
METAVAR, OPT_##ID, opt::Option::KIND##Class, \
PARAM, FLAGS, OPT_##GROUP, \
OPT_##ALIAS, ALIASARGS},
#include "Opts.inc"
#undef OPTION
};

class CvtResOptTable : public opt::OptTable {
public:
CvtResOptTable() : OptTable(InfoTable, true) {}
};

static ExitOnError ExitOnErr;
}

int main(int argc_, const char *argv_[]) {
sys::PrintStackTraceOnErrorSignal(argv_[0]);
PrettyStackTraceProgram X(argc_, argv_);

ExitOnErr.setBanner("llvm-cvtres: ");

SmallVector<const char *, 256> argv;
SpecificBumpPtrAllocator<char> ArgAllocator;
ExitOnErr(errorCodeToError(sys::Process::GetArgumentVector(
argv, makeArrayRef(argv_, argc_), ArgAllocator)));

llvm_shutdown_obj Y; // Call llvm_shutdown() on exit.

CvtResOptTable T;
unsigned MAI, MAC;
ArrayRef<const char *> ArgsArr = makeArrayRef(argv_, argc_);
opt::InputArgList InputArgs = T.ParseArgs(ArgsArr, MAI, MAC);

if (InputArgs.hasArg(OPT_HELP))
T.PrintHelp(outs(), "cvtres", "Resource Converter", false);

return 0;
}
13 changes: 13 additions & 0 deletions llvm/tools/llvm-cvtres/llvm-cvtres.h
@@ -0,0 +1,13 @@
//===- llvm-cvtres.h ------------------------------------------ *- C++ --*-===//
//
// The LLVM Compiler Infrastructure
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//

#ifndef LLVM_TOOLS_LLVMCVTRES_LLVMCVTRES_H
#define LLVM_TOOLS_LLVMCVTRES_LLVMCVTRES_H

#endif

0 comments on commit 087edfa

Please sign in to comment.