From 028792077614438cccd12022f733a281aa0d0339 Mon Sep 17 00:00:00 2001 From: telans Date: Wed, 29 Jan 2020 21:35:09 +1300 Subject: [PATCH] remove unused git_sha1.h --- bin/git_sha1_gen.py | 50 --------------------------------------------- meson.build | 8 -------- src/overlay.cpp | 2 -- 3 files changed, 60 deletions(-) delete mode 100644 bin/git_sha1_gen.py diff --git a/bin/git_sha1_gen.py b/bin/git_sha1_gen.py deleted file mode 100644 index c6fbf490..00000000 --- a/bin/git_sha1_gen.py +++ /dev/null @@ -1,50 +0,0 @@ -""" -Generate the contents of the git_sha1.h file. -The output of this script goes to stdout. -""" - - -import argparse -import os -import os.path -import subprocess -import sys - - -def get_git_sha1(): - """Try to get the git SHA1 with git rev-parse.""" - git_dir = os.path.join(os.path.dirname(sys.argv[0]), '..', '.git') - try: - git_sha1 = subprocess.check_output([ - 'git', - '--git-dir=' + git_dir, - 'rev-parse', - 'HEAD', - ], stderr=open(os.devnull, 'w')).decode("ascii") - except: - # don't print anything if it fails - git_sha1 = '' - return git_sha1 - -def write_if_different(contents): - """ - Avoid touching the output file if it doesn't need modifications - Useful to avoid triggering rebuilds when nothing has changed. - """ - if os.path.isfile(args.output): - with open(args.output, 'r') as file: - if file.read() == contents: - return - with open(args.output, 'w') as file: - file.write(contents) - -parser = argparse.ArgumentParser() -parser.add_argument('--output', help='File to write the #define in', - required=True) -args = parser.parse_args() - -git_sha1 = os.environ.get('MESA_GIT_SHA1_OVERRIDE', get_git_sha1())[:10] -if git_sha1: - write_if_different('#define MESA_GIT_SHA1 " (git-' + git_sha1 + ')"') -else: - write_if_different('#define MESA_GIT_SHA1 ""') diff --git a/meson.build b/meson.build index ee50fccb..88448e31 100644 --- a/meson.build +++ b/meson.build @@ -182,14 +182,6 @@ endif dep_pthread = cc.find_library('pthread') -git_sha1_gen_py = files('bin/git_sha1_gen.py') -sha1_h = custom_target( - 'git_sha1.h', - output : 'git_sha1.h', - command : [prog_python, git_sha1_gen_py, '--output', '@OUTPUT@'], - build_always : true, # commit sha1 can change without having touched these files -) - vk_layer_table_helpers = [] loader_genvk_py = files('modules/Vulkan-Loader/scripts/loader_genvk.py') foreach s : ['vk_dispatch_table_helper.h', 'vk_layer_dispatch_table.h']#, 'vk_loader_extensions.h', 'vk_loader_extensions.c'] diff --git a/src/overlay.cpp b/src/overlay.cpp index efb5e2c8..83f242a8 100644 --- a/src/overlay.cpp +++ b/src/overlay.cpp @@ -28,8 +28,6 @@ #include #include -// #include "git_sha1.h" - #include "imgui.h" #include "overlay_params.h"