Revert "Always use commit_id.py to generate commit.h"

BUILD.gn

@@ -54,6 +54,15 @@ if (ozone_platform_gbm) {
   }
 }
 
+angle_git_is_present = exec_script("src/commit_id.py",
+                                   [
+                                     "check",
+                                     rebase_path(".", root_build_dir),
+                                   ],
+                                   "value")
+
+angle_use_commit_id = angle_git_is_present == 1
+
 import("src/compiler.gni")
 import("src/libGLESv2.gni")
 
@@ -457,33 +466,29 @@ config("commit_id_config") {
   visibility = [ ":commit_id" ]
 }
 
-commit_id_output_file = "$root_gen_dir/angle/commit.h"
-action("commit_id") {
-  script = "src/commit_id.py"
-  outputs = [ commit_id_output_file ]
+commit_id_output_file = "$root_gen_dir/angle/id/commit.h"
+if (angle_use_commit_id) {
+  action("commit_id") {
+    script = "src/commit_id.py"
+    outputs = [ commit_id_output_file ]
 
-  # commit id should depend on angle's HEAD revision
-  commit_id_git_dep = ".git/HEAD"
+    # commit id should depend on angle's HEAD revision
+    inputs = [ ".git/HEAD" ]
 
-  # Add git as a dependency if it is available.
-  angle_git_is_present =
-      exec_script("src/commit_id.py",
-                  [
-                    "check",
-                    rebase_path(commit_id_git_dep, root_build_dir),
-                  ],
-                  "value") == 1
-  if (angle_git_is_present) {
-    inputs = [ commit_id_git_dep ]
-  }
-
-  args = [
-    "gen",
-    rebase_path(commit_id_git_dep, root_build_dir),
-    rebase_path(commit_id_output_file, root_build_dir),
-  ]
+    args = [
+      "gen",
+      rebase_path(".", root_build_dir),
+      rebase_path(commit_id_output_file, root_build_dir),
+    ]
 
-  public_configs = [ ":commit_id_config" ]
+    public_configs = [ ":commit_id_config" ]
+  }
+} else {
+  copy("commit_id") {
+    sources = [ "src/commit.h" ]
+    outputs = [ commit_id_output_file ]
+    public_configs = [ ":commit_id_config" ]
+  }
 }
 
 angle_source_set("angle_version") {

src/commit.h

+//
+// Copyright 2014 The ANGLE Project Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+// commit.h:
+//   This is a default commit hash header, when git is not available.
+//
+
+#define ANGLE_COMMIT_HASH "unknown hash"
+#define ANGLE_COMMIT_HASH_SIZE 12
+#define ANGLE_COMMIT_DATE "unknown date"
+
+#define ANGLE_DISABLE_PROGRAM_BINARY_LOAD

src/commit_id.py

@@ -23,17 +23,13 @@ if len(sys.argv) < 3:
     sys.exit(usage)
 
 operation = sys.argv[1]
-if os.path.isdir(sys.argv[2]):
-    cwd = sys.argv[2]
-else:
-    cwd = os.path.dirname(sys.argv[2])
+cwd = sys.argv[2]
 
 if operation == 'check':
-    try:
-        # Try a git command to verify the cwd is valid and we can use the 'gen command'
-        grab_output('git status', cwd)
+    index_path = os.path.join(cwd, '.git', 'index')
+    if os.path.exists(index_path):
         print("1")
-    except:
+    else:
         print("0")
     sys.exit(0)
 
@@ -42,15 +38,13 @@ if len(sys.argv) < 4 or operation != 'gen':
 
 output_file = sys.argv[3]
 commit_id_size = 12
-commit_id = 'unknown hash'
-commit_date = 'unknown date'
 
-additional_defines = []
 try:
     commit_id = grab_output('git rev-parse --short=%d HEAD' % commit_id_size, cwd)
     commit_date = grab_output('git show -s --format=%ci HEAD', cwd)
 except:
-    additional_defines.append('#define ANGLE_DISABLE_PROGRAM_BINARY_LOAD')
+    commit_id = 'invalid-hash'
+    commit_date = 'invalid-date'
 
 hfile = open(output_file, 'w')
 
@@ -58,7 +52,4 @@ hfile.write('#define ANGLE_COMMIT_HASH "%s"\n' % commit_id)
 hfile.write('#define ANGLE_COMMIT_HASH_SIZE %d\n' % commit_id_size)
 hfile.write('#define ANGLE_COMMIT_DATE "%s"\n' % commit_date)
 
-for additional_define in additional_defines:
-    hfile.write(additional_define + '\n')
-
 hfile.close()

src/common/version.h

@@ -7,7 +7,7 @@
 #ifndef COMMON_VERSION_H_
 #define COMMON_VERSION_H_
 
-#include "commit.h"
+#include "id/commit.h"
 
 #define ANGLE_MAJOR_VERSION 2
 #define ANGLE_MINOR_VERSION 1