encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix commit build rule to use empty hash (and not throw error) if git is not available. 

Bug: dawn:549
Change-Id: I75ab6eb0273ddcb2dc571d5c91d35422793fdffc
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/85745
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Loko Kung <lokokung@google.com>
This commit is contained in:
Loko Kung 2022-04-05 20:11:43 +00:00 committed by Dawn LUCI CQ
parent 29b72c87e9
commit 24ae176d91
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
generator/dawn_version_generator.py
View File

@ -28,11 +28,17 @@ def get_gitHash(dawnDir):
cwd=dawnDir) cwd=dawnDir)
if result.returncode == 0: if result.returncode == 0:
return result.stdout.decode('utf-8').strip() return result.stdout.decode('utf-8').strip()
# No hash was available (possibly) because the directory was not a git checkout. Dawn should
# explicitly handle its absenece and disable features relying on the hash, i.e. caching.
return '' return ''
def get_gitHead(dawnDir): def get_gitHead(dawnDir):
return [os.path.join(dawnDir, '.git', 'HEAD')] return os.path.join(dawnDir, '.git', 'HEAD')
def gitExists(dawnDir):
return os.path.exists(get_gitHead(dawnDir))
def unpackGitRef(packed, resolved): def unpackGitRef(packed, resolved):
@ -89,8 +95,10 @@ class DawnVersionGenerator(Generator):
help='The Dawn root directory path to use') help='The Dawn root directory path to use')
def get_dependencies(self, args): def get_dependencies(self, args):
dawn_dir = os.path.abspath(args.dawn_dir) dawnDir = os.path.abspath(args.dawn_dir)
return get_gitHead(dawn_dir) + get_gitResolvedHead(dawn_dir) if gitExists(dawnDir):
return [get_gitHead(dawnDir)] + get_gitResolvedHead(dawnDir)
return []
def get_file_renders(self, args): def get_file_renders(self, args):
params = compute_params(args) params = compute_params(args)