Update source code for RRA v1.7 release

Author: ahosier

CMakeLists.txt

@@ -15,7 +15,7 @@ project(RRA)
 
 # Define version information
 set(RRA_MAJOR_VERSION 1)
-set(RRA_MINOR_VERSION 6)
+set(RRA_MINOR_VERSION 7)
 if (NOT RRA_BUGFIX_NUMBER)
     set(RRA_BUGFIX_NUMBER 0)
 endif ()

build/dependency_map.py

@@ -22,12 +22,22 @@
 # each git dependency has a desired directory where it will be cloned - along with a commit to checkout
 # The third parameter in the value field is whether to do a shallow clone. Usually, this will be True but if a commit hash is used as a branch, a full clone is needed.
 git_mapping = {
-    github_tools + "qt_common"                                      : ["../external/qt_common",          "v4.0.0",                                   True],
+    github_tools + "qt_common"                                      : ["../external/qt_common",          "v4.1.0",                                   True],
     github_tools + "update_check_api"                               : ["../external/update_check_api",   "v2.1.1",                                   True],
-    github_tools + "system_info_utils"                              : ["../external/system_info_utils",  "88a338a01949f8d8bad60a30b78b65300fd13a9f", False],
+    github_tools + "system_info_utils"                              : ["../external/system_info_utils",  "v2.0",                                     True],
     github_root  + "g-truc/glm"                                     : ["../external/third_party/glm",    "0.9.9.8",                                  True],
     github_root  + "KhronosGroup/Vulkan-Headers"                    : ["../external/third_party/vulkan", "sdk-1.3.211",                              True],
     github_root  + "zeux/volk"                                      : ["../external/third_party/volk",   "1.2.190",                                  True],
     github_root  + "GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator" : ["../external/vma",                "d2f0313d20c803f83cc3637ac1facf8e4d6899e4", False],
-    github_root  + "GPUOpen-Drivers/libamdrdf"                      : ["../external/rdf",                "v1.1.2",                                   True],
+    github_root  + "GPUOpen-Drivers/libamdrdf"                      : ["../external/rdf",                "v1.4.0",                                   True],
+}
+
+# Downloads required for Windows builds.
+url_mapping_win = {
+    "https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.7.2308/dxc_2023_08_14.zip" : "../external/third_party/dxc",
+}
+
+# Downloads required for Linux builds.
+url_mapping_linux = {
+    "https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.7.2308/linux_dxc_2023_08_14.x86_64.tar.gz" : "../external/third_party/dxc",
 }

build/fetch_dependencies.py

@@ -48,6 +48,69 @@ def log_print(message):
 # add script root to support import of URL and git maps
 sys.path.append(script_root)
 from dependency_map import git_mapping
+from dependency_map import url_mapping_win
+from dependency_map import url_mapping_linux
+
+# Download a zip or tgz file from the specified URL and unzip into the directory defined by destination.
+# The destination directory will be created if it doesn't exist
+# if the 'update' parameter is true then the existing file and output directory will be deleted and re-created
+# TODO - this function needs to handle errors gracefully when URL is incorrect or inaccessible
+def download_url_dependencies(url_mapping, update, retry_count = 10):
+    for url in url_mapping:
+        # convert targetPath to OS specific format
+        tmp_path = os.path.join(script_root, url_mapping[url])
+
+        # clean up path, collapsing any ../ and converting / to \ for Windows
+        target_path = os.path.normpath(tmp_path)
+
+        # TODO if update is defined - delete file and directory if they exist
+
+        # make target directory if it doesn't exist
+        if not os.path.isdir(target_path):
+            os.makedirs(target_path)
+
+        # generate the target zip file name from the source URL filename and the target path
+        # note - this rule currently handles URLs that contain # and ? characters at the end
+        # those currently used by Jenkins don't have this style
+        zip_file_name = url.split('/')[-1].split('#')[0].split('?')[0]
+        zip_path = os.path.join(target_path, zip_file_name)
+
+        # Build folder name for the zip_path.
+        zip_file_path_list = zip_file_name.split(".")
+        zip_file_path = os.path.join(target_path, zip_file_path_list[0])
+
+        if (os.path.isfile(zip_path)):
+            # If the archive file exists, print message and continue
+            log_print("URL Dependency %s found and not updated" % zip_path)
+        elif (os.path.isdir(zip_file_path)):
+            # If a folder of the same name as the archive exists, print message and continue
+            log_print("URL Dependency %s found and not updated" % zip_file_path)
+        else:
+            # File doesn't exist - download and unpack it
+            log_print("Downloading " + url + " into " + zip_path)
+            try:
+                urllib.urlretrieve(url, zip_path)
+            except urllib.ContentTooShortError:
+                os.remove(zip_path)
+                if retry_count > 0:
+                    log_print("URL content too short. Retrying. Retries remaining: %d" % retry_count)
+                    download_url_dependencies(url_mapping, update, retry_count - 1)
+                return
+
+            # Unpack the downloaded file into the target directory
+            extension = os.path.splitext(zip_path)[1]
+            if extension == ".zip":
+                # if file extension is .zip then unzip it
+                log_print("Extracting in " + target_path)
+                zipfile.ZipFile(zip_path).extractall(target_path)
+                # delete downloaded zip file
+                os.remove(zip_path)
+            elif extension == ".tgz" or extension == ".gz":
+                # if file extension is .tgz then untar it
+                log_print("Extracting in " + target_path)
+                tarfile.open(zip_path).extractall(target_path)
+                # delete downloaded tgz file
+                os.remove(zip_path)
 
 # Clone or update a git repo
 def update_git_dependencies(git_mapping, update):
@@ -115,6 +178,10 @@ def do_fetch_dependencies(update):
 
     # Update all git dependencies
     if update_git_dependencies(git_mapping, update):
+        if sys.platform == "win32":
+            download_url_dependencies(url_mapping_win, update)
+        elif sys.platform.startswith('linux') == True:
+            download_url_dependencies(url_mapping_linux, update)
         return True
     else:
         return False