Merge branch 'master' of https://github.com/martine/ninja

26 files changed, 455 insertions, 29 deletions

diff --git a/src/browse.py b/src/browse.py
index dd7b5dc..92c7eaa 100755
--- a/src/browse.py
+++ b/src/browse.py
@@ -1,4 +1,18 @@
 #!/usr/bin/python
+#
+# Copyright 2001 Google Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 """Simple web server for browsing dependency graph data.
 
diff --git a/src/build.cc b/src/build.cc
index 8e567d9..95f20bc 100644
--- a/src/build.cc
+++ b/src/build.cc
@@ -1,3 +1,17 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 #include "build.h"
 
 #include <stdio.h>
@@ -15,6 +29,8 @@ struct BuildStatus {
   // Returns the time the edge took, in ms.
   int BuildEdgeFinished(Edge* edge);
 
+  void PrintStatus(Edge* edge);
+
   time_t last_update_;
   int finished_edges_, total_edges_;
 
@@ -22,11 +38,16 @@ struct BuildStatus {
   RunningEdgeMap running_edges_;
 
   BuildConfig::Verbosity verbosity_;
+  // Whether we can do fancy terminal control codes.
+  bool smart_terminal_;
 };
 
 BuildStatus::BuildStatus()
     : last_update_(time(NULL)), finished_edges_(0), total_edges_(0),
-      verbosity_(BuildConfig::NORMAL) {}
+      verbosity_(BuildConfig::NORMAL) {
+  const char* term = getenv("TERM");
+  smart_terminal_ = isatty(1) && term && string(term) != "dumb";
+}
 
 void BuildStatus::PlanHasTotalEdges(int total) {
   total_edges_ = total;
@@ -37,13 +58,7 @@ void BuildStatus::BuildEdgeStarted(Edge* edge) {
   gettimeofday(&now, NULL);
   running_edges_.insert(make_pair(edge, now));
 
-  string desc = edge->GetDescription();
-  if (verbosity_ != BuildConfig::QUIET) {
-    if (verbosity_ != BuildConfig::VERBOSE && !desc.empty())
-      printf("%s\n", desc.c_str());
-    else
-      printf("%s\n", edge->EvaluateCommand().c_str());
-  }
+  PrintStatus(edge);
 }
 
 int BuildStatus::BuildEdgeFinished(Edge* edge) {
@@ -51,10 +66,18 @@ int BuildStatus::BuildEdgeFinished(Edge* edge) {
   gettimeofday(&now, NULL);
   ++finished_edges_;
 
-  if (now.tv_sec - last_update_ > 5) {
-    printf("%.1f%% %d/%d\n", finished_edges_ * 100 / (float)total_edges_,
-           finished_edges_, total_edges_);
-    last_update_ = now.tv_sec;
+  if (verbosity_ != BuildConfig::QUIET) {
+    if (smart_terminal_ && verbosity_ == BuildConfig::NORMAL) {
+      PrintStatus(edge);
+      if (finished_edges_ == total_edges_)
+        printf("\n");
+    } else {
+      if (now.tv_sec - last_update_ > 5) {
+        printf("%.1f%% %d/%d\n", finished_edges_ * 100 / (float)total_edges_,
+               finished_edges_, total_edges_);
+        last_update_ = now.tv_sec;
+      }
+    }
   }
 
   RunningEdgeMap::iterator i = running_edges_.find(edge);
@@ -66,6 +89,33 @@ int BuildStatus::BuildEdgeFinished(Edge* edge) {
   return ms;
 }
 
+void BuildStatus::PrintStatus(Edge* edge) {
+  switch (verbosity_) {
+  case BuildConfig::QUIET:
+    return;
+
+  case BuildConfig::VERBOSE:
+    printf("%s\n", edge->EvaluateCommand().c_str());
+    break;
+
+  default: {
+    string to_print = edge->GetDescription();
+    if (to_print.empty() || verbosity_ == BuildConfig::VERBOSE)
+      to_print = edge->EvaluateCommand();
+
+    if (smart_terminal_) {
+      printf("\r[%d/%d] %s\e[K", finished_edges_, total_edges_,
+             to_print.c_str());
+      fflush(stdout);
+    } else {
+      printf("%s\n", to_print.c_str());
+    }
+  }
+  }
+}
+
+Plan::Plan() : command_edges_(0) {}
+
 bool Plan::AddTarget(Node* node, string* err) {
   vector<Node*> stack;
   return AddSubTarget(node, &stack, err);
@@ -93,6 +143,8 @@ bool Plan::AddSubTarget(Node* node, vector<Node*>* stack, string* err) {
   if (want_.find(edge) != want_.end())
     return true;  // We've already enqueued it.
   want_.insert(edge);
+  if (!edge->is_phony())
+    ++command_edges_;
 
   stack->push_back(node);
   bool awaiting_inputs = false;
@@ -230,12 +282,16 @@ Edge* RealCommandRunner::NextFinishedCommand(bool* success) {
   Edge* edge = i->second;
   subproc_to_edge_.erase(i);
 
-  if (!*success)
-    printf("FAILED: %s\n", edge->EvaluateCommand().c_str());
-  if (!subproc->stdout_.buf_.empty())
-    printf("%s\n", subproc->stdout_.buf_.c_str());
-  if (!subproc->stderr_.buf_.empty())
-    printf("%s\n", subproc->stderr_.buf_.c_str());
+  if (!*success ||
+      !subproc->stdout_.buf_.empty() ||
+      !subproc->stderr_.buf_.empty()) {
+    printf("\n%s%s\n", *success ? "" : "FAILED: ",
+           edge->EvaluateCommand().c_str());
+    if (!subproc->stdout_.buf_.empty())
+      printf("%s\n", subproc->stdout_.buf_.c_str());
+    if (!subproc->stderr_.buf_.empty())
+      printf("%s\n", subproc->stderr_.buf_.c_str());
+  }
 
   delete subproc;
   return edge;
@@ -302,7 +358,7 @@ bool Builder::Build(string* err) {
     return true;
   }
 
-  status_->PlanHasTotalEdges(plan_.edge_count());
+  status_->PlanHasTotalEdges(plan_.command_edge_count());
   while (plan_.more_to_do()) {
     while (command_runner_->CanRunMore()) {
       Edge* edge = plan_.FindWork();
@@ -312,7 +368,7 @@ bool Builder::Build(string* err) {
       if (!StartEdge(edge, err))
         return false;
 
-      if (edge->rule_ == &State::kPhonyRule)
+      if (edge->is_phony())
         FinishEdge(edge);
     }
 
@@ -338,7 +394,7 @@ bool Builder::Build(string* err) {
 }
 
 bool Builder::StartEdge(Edge* edge, string* err) {
-  if (edge->rule_ == &State::kPhonyRule)
+  if (edge->is_phony())
     return true;
 
   status_->BuildEdgeStarted(edge);
@@ -370,7 +426,7 @@ void Builder::FinishEdge(Edge* edge) {
   }
   plan_.EdgeFinished(edge);
 
-  if (edge->rule_ == &State::kPhonyRule)
+  if (edge->is_phony())
     return;
 
   int ms = status_->BuildEdgeFinished(edge);
diff --git a/src/build.h b/src/build.h
index a1d6d4c..cf9398e 100644
--- a/src/build.h
+++ b/src/build.h
@@ -1,3 +1,17 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 #ifndef NINJA_BUILD_H_
 #define NINJA_BUILD_H_
 
@@ -15,6 +29,8 @@ struct State;
 // Plan stores the state of a build plan: what we intend to build,
 // which steps we're ready to execute.
 struct Plan {
+  Plan();
+
   // Add a target to our plan (including all its dependencies).
   // Returns false if we don't need to build this target; may
   // fill in |err| with an error message if there's a problem.
@@ -34,8 +50,8 @@ struct Plan {
   // tests.
   void EdgeFinished(Edge* edge);
 
-  // Number of edges to run.
-  int edge_count() const { return want_.size(); }
+  // Number of edges with commands to run.
+  int command_edge_count() const { return command_edges_; }
 
 private:
   bool AddSubTarget(Node* node, vector<Node*>* stack, string* err);
@@ -44,6 +60,9 @@ private:
 
   set<Edge*> want_;
   set<Edge*> ready_;
+
+  // Total number of edges that have commands (not phony).
+  int command_edges_;
 };
 
 // CommandRunner is an interface that wraps running the build
diff --git a/src/build_log.cc b/src/build_log.cc
index b8a782f..9add945 100644
--- a/src/build_log.cc
+++ b/src/build_log.cc
@@ -1,3 +1,17 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 #include "build_log.h"
 
 #include <errno.h>
diff --git a/src/build_log.h b/src/build_log.h
index 58a598e..be12d85 100644
--- a/src/build_log.h
+++ b/src/build_log.h
@@ -1,3 +1,17 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 #include <map>
 #include <string>
 using namespace std;
diff --git a/src/build_log_test.cc b/src/build_log_test.cc
index 11d5f72..26021d5 100644
--- a/src/build_log_test.cc
+++ b/src/build_log_test.cc
@@ -1,3 +1,17 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 #include "build_log.h"
 
 #include "test.h"
diff --git a/src/build_test.cc b/src/build_test.cc
index 0c35f8c..7533b44 100644
--- a/src/build_test.cc
+++ b/src/build_test.cc
@@ -1,3 +1,17 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 #include "build.h"
 
 #include "test.h"
diff --git a/src/eval_env.cc b/src/eval_env.cc
index 172544c..0a53ae5 100644
--- a/src/eval_env.cc
+++ b/src/eval_env.cc
@@ -1,3 +1,17 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 #include "eval_env.h"
 
 string BindingEnv::LookupVariable(const string& var) {
diff --git a/src/eval_env.h b/src/eval_env.h
index 46fb1f1..fd0e4eb 100644
--- a/src/eval_env.h
+++ b/src/eval_env.h
@@ -1,3 +1,17 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 #ifndef NINJA_EVAL_ENV_H_
 #define NINJA_EVAL_ENV_H_
 
diff --git a/src/graph.cc b/src/graph.cc
index f73028e..aead200 100644
--- a/src/graph.cc
+++ b/src/graph.cc
@@ -1,3 +1,17 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 #include "graph.h"
 
 #include <stdio.h>
@@ -170,3 +184,6 @@ void Edge::Dump() {
   printf("]\n");
 }
 
+bool Edge::is_phony() const {
+  return rule_ == &State::kPhonyRule;
+}
diff --git a/src/graph.h b/src/graph.h
index 2ebf2e4..f3cfa97 100644
--- a/src/graph.h
+++ b/src/graph.h
@@ -1,3 +1,17 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 #ifndef NINJA_GRAPH_H_
 #define NINJA_GRAPH_H_
 
@@ -101,6 +115,8 @@ struct Edge {
   bool is_order_only(int index) {
     return index >= ((int)inputs_.size()) - order_only_deps_;
   }
+
+  bool is_phony() const;
 };
 
 #endif  // NINJA_GRAPH_H_
diff --git a/src/graphviz.h b/src/graphviz.h
index eb9ee25..fd6b58e 100644
--- a/src/graphviz.h
+++ b/src/graphviz.h
@@ -1,3 +1,17 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 #include <set>
 
 // XXX deinline all this code so we don't need this include
diff --git a/src/hash_map.h b/src/hash_map.h
index 820f773..45a83a9 100644
--- a/src/hash_map.h
+++ b/src/hash_map.h
@@ -1,3 +1,17 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 #include <ext/hash_map>
 
 using __gnu_cxx::hash_map;
diff --git a/src/ninja.cc b/src/ninja.cc
index 0547013..eb7e41c 100644
--- a/src/ninja.cc
+++ b/src/ninja.cc
@@ -1,9 +1,26 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 #include "ninja.h"
 
+#include <errno.h>
 #include <getopt.h>
 #include <limits.h>
 #include <stdio.h>
 #include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 
 #include "build.h"
 #include "build_log.h"
@@ -32,7 +49,7 @@ void usage(const BuildConfig& config) {
 "usage: ninja [options] target\n"
 "\n"
 "options:\n"
-"  -i FILE  specify input build file [default=build.ninja]\n"
+"  -f FILE  specify input build file [default=build.ninja]\n"
 "  -j N     run N jobs in parallel [default=%d]\n"
 "  -n       dry run (don't run commands but pretend they succeeded)\n"
 "  -v       show all command lines\n"
@@ -144,9 +161,9 @@ int main(int argc, char** argv) {
   config.parallelism = GuessParallelism();
 
   int opt;
-  while ((opt = getopt_long(argc, argv, "hi:j:nt:v", options, NULL)) != -1) {
+  while ((opt = getopt_long(argc, argv, "f:hj:nt:v", options, NULL)) != -1) {
     switch (opt) {
-      case 'i':
+      case 'f':
         input_file = optarg;
         break;
       case 'j':
@@ -206,7 +223,16 @@ int main(int argc, char** argv) {
 
   const string build_dir = state.bindings_.LookupVariable("builddir");
   const char* kLogPath = ".ninja_log";
-  string log_path = build_dir.empty() ? kLogPath : build_dir + "/" + kLogPath;
+  string log_path = kLogPath;
+  if (!build_dir.empty()) {
+    if (mkdir(build_dir.c_str(), 0777) < 0 && errno != EEXIST) {
+      fprintf(stderr, "Error creating build directory %s: %s\n",
+              build_dir.c_str(), strerror(errno));
+      return 1;
+    }
+    log_path = build_dir + "/" + kLogPath;
+  }
+
   if (!build_log.Load(log_path.c_str(), &err)) {
     fprintf(stderr, "error loading build log %s: %s\n",
             log_path.c_str(), err.c_str());
diff --git a/src/ninja.h b/src/ninja.h
index 26432c3..706cb9c 100644
--- a/src/ninja.h
+++ b/src/ninja.h
@@ -1,3 +1,17 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 #ifndef NINJA_NINJA_H_
 #define NINJA_NINJA_H_
 
diff --git a/src/ninja_jumble.cc b/src/ninja_jumble.cc
index a1ba219..a935c21 100644
--- a/src/ninja_jumble.cc
+++ b/src/ninja_jumble.cc
@@ -1,3 +1,17 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 // This file is all the code that used to be in one file.
 // TODO: split into modules, delete this file.
 
diff --git a/src/ninja_test.cc b/src/ninja_test.cc
index 7e8bdc0..7ec77fd 100644
--- a/src/ninja_test.cc
+++ b/src/ninja_test.cc
@@ -1,3 +1,17 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 #include "ninja.h"
 
 #include <gtest/gtest.h>
diff --git a/src/parsers.cc b/src/parsers.cc
index 8e44a38..2fb2c9a 100644
--- a/src/parsers.cc
+++ b/src/parsers.cc
@@ -1,3 +1,17 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 #include "parsers.h"
 
 #include <assert.h>
diff --git a/src/parsers.h b/src/parsers.h
index 01f65c0..78865d1 100644
--- a/src/parsers.h
+++ b/src/parsers.h
@@ -1,3 +1,17 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 #ifndef NINJA_PARSERS_H_
 #define NINJA_PARSERS_H_
 
diff --git a/src/parsers_test.cc b/src/parsers_test.cc
index 7810113..8a1efc5 100644
--- a/src/parsers_test.cc
+++ b/src/parsers_test.cc
@@ -1,3 +1,17 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 #include "parsers.h"
 
 #include <gtest/gtest.h>
diff --git a/src/subprocess.cc b/src/subprocess.cc
index 168ac10..1043e65 100644
--- a/src/subprocess.cc
+++ b/src/subprocess.cc
@@ -1,3 +1,17 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 #include "subprocess.h"
 
 #include <algorithm>
diff --git a/src/subprocess.h b/src/subprocess.h
index 2c91f4a..35b7914 100644
--- a/src/subprocess.h
+++ b/src/subprocess.h
@@ -1,3 +1,17 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 #include <string>
 #include <vector>
 #include <queue>
diff --git a/src/subprocess_test.cc b/src/subprocess_test.cc
index 51d4a11..4eb878b 100644
--- a/src/subprocess_test.cc
+++ b/src/subprocess_test.cc
@@ -1,3 +1,17 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 #include "subprocess.h"
 
 #include "test.h"
diff --git a/src/test.h b/src/test.h
index 405f039..bc8dfcc 100644
--- a/src/test.h
+++ b/src/test.h
@@ -1,3 +1,17 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 #include <gtest/gtest.h>
 
 #include "graph.h"
diff --git a/src/util.cc b/src/util.cc
index 7a1c4e6..2eb4559 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -1,3 +1,17 @@
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 #include "util.h"
 
 #include <execinfo.h>
diff --git a/src/util.h b/src/util.h
index d0f0815..188528c 100644
--- a/src/util.h
+++ b/src/util.h
@@ -1,4 +1,16 @@
-
+// Copyright 2011 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 // Dump a backtrace to stderr.
 // |skip_frames| is how many frames to skip;