Release info script without spir-v tools fix

This fix (based on work by imirkin) checks whether the spir-v tools
source files are available before trying to use them to generate the
release info include file.

Affects:

None

Components: Framework

VK-GL-CTS issue: 1114

Change-Id: I6764a469738a8e6a7797746d963da197b8380301

diff --git a/framework/qphelper/gen_release_info.py b/framework/qphelper/gen_release_info.py
index d4875e3..a3ee54c 100644 (file)
--- a/framework/qphelper/gen_release_info.py
+++ b/framework/qphelper/gen_release_info.py
@@ -96,23 +96,38 @@ if __name__ == "__main__":
 
        if args.git:
                gitDir                          = args.gitDir                           if args.gitDir                          != None else defaultGitDir
-               glslGitDir                      = args.glslGitDir                       if args.glslGitDir                      != None else defaultGlslGitDir
-               spirvToolsGitDir        = args.spirvToolsGitDir         if args.spirvToolsGitDir        != None else defaultSpirvToolsGitDir
-               spirvHeadersGitDir      = args.spirvHeadersGitDir       if args.spirvHeadersGitDir      != None else defaultSpirvHeadersGitDir
                head                            = getHead(gitDir)
-               glslHead                        = getHead(glslGitDir)
-               spirvToolsHead          = getHead(spirvToolsGitDir)
-               spirvHeadersHead        = getHead(spirvHeadersGitDir)
                releaseName                     = "git-%s" % head
                releaseId                       = "0x%s" % head[0:8]
-               glslName                        = "git-%s" % glslHead
-               spirvToolsName          = "git-%s" % spirvToolsHead
-               spirvHeadersName        = "git-%s" % spirvHeadersHead
        else:
                releaseName                     = args.releaseName
                releaseId                       = args.releaseId
+
+       if args.glslGitDir or os.path.exists(defaultGlslGitDir):
+               glslGitDir                      = args.glslGitDir                       if args.glslGitDir                      != None else defaultGlslGitDir
+               glslHead                        = getHead(glslGitDir)
+               glslName                        = "git-%s" % glslHead
+       elif args.git:
+               glslName                        = "unknown"
+       else:
                glslName                        = args.releaseName
+
+       if args.spirvToolsGitDir or os.path.exists(defaultSpirvToolsGitDir):
+               spirvToolsGitDir        = args.spirvToolsGitDir         if args.spirvToolsGitDir        != None else defaultSpirvToolsGitDir
+               spirvToolsHead          = getHead(spirvToolsGitDir)
+               spirvToolsName          = "git-%s" % spirvToolsHead
+       elif args.git:
+               spirvToolsName          = "unknown"
+       else:
                spirvToolsName          = args.releaseName
+
+       if args.spirvHeadersGitDir or os.path.exists(defaultSpirvHeadersGitDir):
+               spirvHeadersGitDir      = args.spirvHeadersGitDir       if args.spirvHeadersGitDir      != None else defaultSpirvHeadersGitDir
+               spirvHeadersHead        = getHead(spirvHeadersGitDir)
+               spirvHeadersName        = "git-%s" % spirvHeadersHead
+       elif args.git:
+               spirvHeadersName        = "unknown"
+       else:
                spirvHeadersName        = args.releaseName
 
        releaseInfo     = makeReleaseInfo(releaseName, releaseId, glslName, spirvToolsName, spirvHeadersName)