Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / tools / gn / command_gen.cc

diff --git a/src/tools/gn/command_gen.cc b/src/tools/gn/command_gen.cc
index 9f6d38f..5f0da22 100644 (file)
--- a/src/tools/gn/command_gen.cc
+++ b/src/tools/gn/command_gen.cc
@@ -6,7 +6,7 @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
-#include "base/time/time.h"
+#include "base/timer/elapsed_timer.h"
 #include "tools/gn/build_settings.h"
 #include "tools/gn/commands.h"
 #include "tools/gn/ninja_target_writer.h"
@@ -14,6 +14,7 @@
 #include "tools/gn/scheduler.h"
 #include "tools/gn/setup.h"
 #include "tools/gn/standard_out.h"
+#include "tools/gn/target.h"
 
 namespace commands {
 
@@ -22,10 +23,26 @@ namespace {
 // Suppress output on success.
 const char kSwitchQuiet[] = "q";
 
-void TargetResolvedCallback(base::subtle::Atomic32* write_counter,
-                            const Target* target) {
-  base::subtle::NoBarrier_AtomicIncrement(write_counter, 1);
+const char kSwitchCheck[] = "check";
+
+// Called on worker thread to write the ninja file.
+void BackgroundDoWrite(const Target* target) {
   NinjaTargetWriter::RunAndWriteFile(target);
+  g_scheduler->DecrementWorkCount();
+}
+
+// Called on the main thread.
+void ItemResolvedCallback(base::subtle::Atomic32* write_counter,
+                          scoped_refptr<Builder> builder,
+                          const BuilderRecord* record) {
+  base::subtle::NoBarrier_AtomicIncrement(write_counter, 1);
+
+  const Item* item = record->item();
+  const Target* target = item->AsTarget();
+  if (target) {
+    g_scheduler->IncrementWorkCount();
+    g_scheduler->ScheduleWork(base::Bind(&BackgroundDoWrite, target));
+  }
 }
 
 }  // namespace
@@ -34,35 +51,59 @@ const char kGen[] = "gen";
 const char kGen_HelpShort[] =
     "gen: Generate ninja files.";
 const char kGen_Help[] =
-    "gn gen\n"
-    "  Generates ninja files from the current tree.\n"
+    "gn gen: Generate ninja files.\n"
+    "\n"
+    "  gn gen <output_directory>\n"
+    "\n"
+    "  Generates ninja files from the current tree and puts them in the given\n"
+    "  output directory.\n"
+    "\n"
+    "  The output directory can be a source-repo-absolute path name such as:\n"
+    "      //out/foo\n"
+    "  Or it can be a directory relative to the current directory such as:\n"
+    "      out/foo\n"
     "\n"
     "  See \"gn help\" for the common command-line switches.\n";
 
-// Note: partially duplicated in command_gyp.cc.
 int RunGen(const std::vector<std::string>& args) {
-  base::TimeTicks begin_time = base::TimeTicks::Now();
+  base::ElapsedTimer timer;
+
+  if (args.size() != 1) {
+    Err(Location(), "Need exactly one build directory to generate.",
+        "I expected something more like \"gn gen out/foo\"\n"
+        "You can also see \"gn help gen\".").PrintToStdout();
+    return 1;
+  }
 
   // Deliberately leaked to avoid expensive process teardown.
-  Setup* setup = new Setup;
-  if (!setup->DoSetup())
+  Setup* setup = new Setup();
+  if (!setup->DoSetup(args[0], true))
     return 1;
 
+  if (CommandLine::ForCurrentProcess()->HasSwitch(kSwitchCheck))
+    setup->set_check_public_headers(true);
+
   // Cause the load to also generate the ninja files for each target. We wrap
   // the writing to maintain a counter.
   base::subtle::Atomic32 write_counter = 0;
-  setup->build_settings().set_target_resolved_callback(
-      base::Bind(&TargetResolvedCallback, &write_counter));
+  setup->builder()->set_resolved_callback(
+      base::Bind(&ItemResolvedCallback, &write_counter,
+                 scoped_refptr<Builder>(setup->builder())));
 
   // Do the actual load. This will also write out the target ninja files.
   if (!setup->Run())
     return 1;
 
+  Err err;
   // Write the root ninja files.
-  if (!NinjaWriter::RunAndWriteFiles(&setup->build_settings()))
+  if (!NinjaWriter::RunAndWriteFiles(&setup->build_settings(),
+                                     setup->builder(),
+                                     &err)) {
+    err.PrintToStdout();
     return 1;
+  }
 
-  base::TimeTicks end_time = base::TimeTicks::Now();
+  base::TimeDelta elapsed_time = timer.Elapsed();
 
   if (!CommandLine::ForCurrentProcess()->HasSwitch(kSwitchQuiet)) {
     OutputString("Done. ", DECORATION_GREEN);
@@ -73,7 +114,7 @@ int RunGen(const std::vector<std::string>& args) {
         base::IntToString(
             setup->scheduler().input_file_manager()->GetInputFileCount()) +
         " files in " +
-        base::IntToString((end_time - begin_time).InMilliseconds()) + "ms\n";
+        base::Int64ToString(elapsed_time.InMilliseconds()) + "ms\n";
     OutputString(stats);
   }