Lines 1-15
Link Here
|
1 |
- .git/ is missing in archive, so use version from environment |
1 |
- .git/ is missing in archive, so use version from environment |
2 |
|
2 |
|
3 |
--- build/gen.py.orig 2021-12-21 20:25:21 UTC |
3 |
--- build/gen.py.orig 2022-11-19 16:33:38 UTC |
4 |
+++ build/gen.py |
4 |
+++ build/gen.py |
5 |
@@ -213,25 +213,16 @@ def main(argv): |
5 |
@@ -216,25 +216,16 @@ def main(argv): |
6 |
|
6 |
|
7 |
|
7 |
|
8 |
def GenerateLastCommitPosition(host, header): |
8 |
def GenerateLastCommitPosition(host, header): |
9 |
- ROOT_TAG = 'initial-commit' |
9 |
- ROOT_TAG = 'initial-commit' |
10 |
- describe_output = subprocess.check_output( |
10 |
- describe_output = subprocess.check_output( |
11 |
- ['git', 'describe', 'HEAD', '--match', ROOT_TAG], shell=host.is_windows(), |
11 |
- ['git', 'describe', 'HEAD', '--abbrev=12', '--match', ROOT_TAG], |
12 |
- cwd=REPO_ROOT) |
12 |
- shell=host.is_windows(), cwd=REPO_ROOT) |
13 |
- mo = re.match(ROOT_TAG + '-(\d+)-g([0-9a-f]+)', describe_output.decode()) |
13 |
- mo = re.match(ROOT_TAG + '-(\d+)-g([0-9a-f]+)', describe_output.decode()) |
14 |
- if not mo: |
14 |
- if not mo: |
15 |
- raise ValueError( |
15 |
- raise ValueError( |
Lines 30-36
Link Here
|
30 |
|
30 |
|
31 |
# Only write/touch this file if the commit position has changed. |
31 |
# Only write/touch this file if the commit position has changed. |
32 |
old_contents = '' |
32 |
old_contents = '' |
33 |
@@ -274,7 +265,7 @@ def WriteGenericNinja(path, static_libraries, executab |
33 |
@@ -277,7 +268,7 @@ def WriteGenericNinja(path, static_libraries, executab |
34 |
'msys': 'build_linux.ninja.template', |
34 |
'msys': 'build_linux.ninja.template', |
35 |
'darwin': 'build_mac.ninja.template', |
35 |
'darwin': 'build_mac.ninja.template', |
36 |
'linux': 'build_linux.ninja.template', |
36 |
'linux': 'build_linux.ninja.template', |