[llvm-commits] [llvm] r65825 - in /llvm/trunk: include/llvm/CompilerDriver/Main.inc tools/llvmc/driver/Main.cpp

[Mikhail Glushenkov]

Author: foldr
Date: Mon Mar  2 03:03:02 2009
New Revision: 65825

URL: http://llvm.org/viewvc/llvm-project?rev=65825&view=rev
Log:
Move code from Main.cpp to the include dir.

User drivers based on llvmc must all share the initialization code.
Putting main() into libCompilerDriver is not a very good idea IMO (and ld gave
me some strange EH-related error anyway).

Added:
    llvm/trunk/include/llvm/CompilerDriver/Main.inc
      - copied, changed from r65824, llvm/trunk/tools/llvmc/driver/Main.cpp
Modified:
    llvm/trunk/tools/llvmc/driver/Main.cpp

Copied: llvm/trunk/include/llvm/CompilerDriver/Main.inc (from r65824, llvm/trunk/tools/llvmc/driver/Main.cpp)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CompilerDriver/Main.inc?p2=llvm/trunk/include/llvm/CompilerDriver/Main.inc&p1=llvm/trunk/tools/llvmc/driver/Main.cpp&r1=65824&r2=65825&rev=65825&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc/driver/Main.cpp (original)
+++ llvm/trunk/include/llvm/CompilerDriver/Main.inc Mon Mar  2 03:03:02 2009
@@ -1,4 +1,4 @@
-//===--- Main.cpp - The LLVM Compiler Driver -------------------*- C++ -*-===//
+//===--- Main.inc - The LLVM Compiler Driver --------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -12,8 +12,13 @@
 //  supported please refer to the tools' manual page or run the tool
 //  with the --help option.
 //
+//  This
+//
 //===----------------------------------------------------------------------===//
 
+#ifndef LLVM_INCLUDE_COMPILER_DRIVER_MAIN_INC
+#define LLVM_INCLUDE_COMPILER_DRIVER_MAIN_INC
+
 #include "llvm/CompilerDriver/CompilationGraph.h"
 #include "llvm/CompilerDriver/Error.h"
 #include "llvm/CompilerDriver/Plugin.h"
@@ -124,3 +129,5 @@
   }
   return 1;
 }
+
+#endif // LLVM_INCLUDE_COMPILER_DRIVER_MAIN_INC

Modified: llvm/trunk/tools/llvmc/driver/Main.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc/driver/Main.cpp?rev=65825&r1=65824&r2=65825&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc/driver/Main.cpp (original)
+++ llvm/trunk/tools/llvmc/driver/Main.cpp Mon Mar  2 03:03:02 2009
@@ -7,120 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 //
-//  This tool provides a single point of access to the LLVM
-//  compilation tools.  It has many options. To discover the options
-//  supported please refer to the tools' manual page or run the tool
-//  with the --help option.
+//  Just include CompilerDriver/Main.inc.
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/CompilerDriver/CompilationGraph.h"
-#include "llvm/CompilerDriver/Error.h"
-#include "llvm/CompilerDriver/Plugin.h"
-
-#include "llvm/System/Path.h"
-#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/PluginLoader.h"
-
-#include <iostream>
-#include <stdexcept>
-#include <string>
-
-namespace cl = llvm::cl;
-namespace sys = llvm::sys;
-using namespace llvmc;
-
-// Built-in command-line options.
-// External linkage here is intentional.
-
-cl::list<std::string> InputFilenames(cl::Positional, cl::desc("<input file>"),
-                                     cl::ZeroOrMore);
-cl::opt<std::string> OutputFilename("o", cl::desc("Output file name"),
-                                    cl::value_desc("file"), cl::Prefix);
-cl::list<std::string> Languages("x",
-          cl::desc("Specify the language of the following input files"),
-          cl::ZeroOrMore);
-cl::opt<bool> DryRun("dry-run",
-                     cl::desc("Only pretend to run commands"));
-cl::opt<bool> VerboseMode("v",
-                          cl::desc("Enable verbose mode"));
-
-cl::opt<bool> CheckGraph("check-graph",
-                         cl::desc("Check the compilation graph for errors"),
-                         cl::Hidden);
-cl::opt<bool> WriteGraph("write-graph",
-                         cl::desc("Write compilation-graph.dot file"),
-                         cl::Hidden);
-cl::opt<bool> ViewGraph("view-graph",
-                         cl::desc("Show compilation graph in GhostView"),
-                         cl::Hidden);
-cl::opt<bool> SaveTemps("save-temps",
-                         cl::desc("Keep temporary files"),
-                         cl::Hidden);
-
-namespace {
-  /// BuildTargets - A small wrapper for CompilationGraph::Build.
-  int BuildTargets(CompilationGraph& graph, const LanguageMap& langMap) {
-    int ret;
-    const sys::Path& tempDir = SaveTemps
-      ? sys::Path("")
-      : sys::Path(sys::Path::GetTemporaryDirectory());
-
-    try {
-      ret = graph.Build(tempDir, langMap);
-    }
-    catch(...) {
-      tempDir.eraseFromDisk(true);
-      throw;
-    }
-
-    if (!SaveTemps)
-      tempDir.eraseFromDisk(true);
-    return ret;
-  }
-}
-
-int main(int argc, char** argv) {
-  try {
-    LanguageMap langMap;
-    CompilationGraph graph;
-
-    cl::ParseCommandLineOptions
-      (argc, argv, "LLVM Compiler Driver (Work In Progress)", true);
-
-    PluginLoader Plugins;
-    Plugins.PopulateLanguageMap(langMap);
-    Plugins.PopulateCompilationGraph(graph);
-
-    if (CheckGraph) {
-      return graph.Check();
-    }
-
-    if (ViewGraph) {
-      graph.viewGraph();
-      if (!WriteGraph)
-        return 0;
-    }
-
-    if (WriteGraph) {
-      graph.writeGraph();
-      return 0;
-    }
-
-    if (InputFilenames.empty()) {
-      throw std::runtime_error("no input files");
-    }
-
-    return BuildTargets(graph, langMap);
-  }
-  catch(llvmc::error_code& ec) {
-    return ec.code();
-  }
-  catch(const std::exception& ex) {
-    std::cerr << argv[0] << ": " << ex.what() << '\n';
-  }
-  catch(...) {
-    std::cerr << argv[0] << ": unknown error!\n";
-  }
-  return 1;
-}
+#include "llvm/CompilerDriver/Main.inc"