commit e51c74bdfa4e76f89565949f6105cc31c845b480
author Mike Schuchardt <mikes@lunarg.com> Wed Jul 10 17:01:21 2019 -0700
committer Mike Schuchardt <mikes@lunarg.com> Thu Jul 11 16:33:03 2019 -0700
tree 0945e4523d0b7f126596c52fc89db2ef490fbbab
parent 27b35726d21d1e8a00aa58b7949bae69aeb6700d

scripts: Move path helper into common_codegen.py

Change-Id: I0b66a8d42aa8a6ab5205d496de3df8fc253e2a54

scripts/generate_source.py

diff --git a/scripts/generate_source.py b/scripts/generate_source.py
index 4b3b606..3c448ad 100755
--- a/scripts/generate_source.py
+++ b/scripts/generate_source.py
@@ -19,6 +19,7 @@
 # Author: Mike Schuchardt <mikes@lunarg.com>
 
 import argparse
+import common_codegen
 import filecmp
 import os
 import shutil
@@ -29,10 +30,6 @@
 # files to exclude from --verify check
 verify_exclude = ['.clang-format']
 
-# helper to define paths relative to this file
-def script_relative(path):
-    return os.path.abspath(os.path.join(os.path.dirname(__file__), path))
-
 def main(argv):
     parser = argparse.ArgumentParser(description='Generate source code for this repository')
     parser.add_argument('registry', metavar='REGISTRY_PATH', help='path to the Vulkan-Headers registry directory')
@@ -41,7 +38,7 @@
     group.add_argument('-v', '--verify', action='store_true', help='verify repo files match generator output')
     args = parser.parse_args(argv)
 
-    gen_cmds = [*[[script_relative('lvl_genvk.py'),
+    gen_cmds = [*[[common_codegen.repo_relative('scripts/lvl_genvk.py'),
                    '-registry', os.path.abspath(os.path.join(args.registry,  'vk.xml')),
                    '-quiet',
                    filename] for filename in ["chassis.cpp",
@@ -62,15 +59,15 @@
                                               "vk_safe_struct.cpp",
                                               "vk_safe_struct.h",
                                               "vk_typemap_helper.h"]],
-                [script_relative('vk_validation_stats.py'),
+                [common_codegen.repo_relative('scripts/vk_validation_stats.py'),
                  os.path.abspath(os.path.join(args.registry, 'validusage.json')),
                  '-export_header'],
-                [script_relative('external_revision_generator.py'),
-                 '--rev_file', script_relative('known_good.json'),
+                [common_codegen.repo_relative('scripts/external_revision_generator.py'),
+                 '--rev_file', common_codegen.repo_relative('scripts/known_good.json'),
                  '-s', 'SPIRV_TOOLS_COMMIT_ID',
                  '-o', 'spirv_tools_commit_id.h']]
 
-    repo_dir = script_relative('../layers/generated')
+    repo_dir = common_codegen.repo_relative('layers/generated')
 
     # get directory where generators will run
     if args.verify or args.incremental: