From 4767cf1d66e9aef285c7f86b502270439b81fc31 Mon Sep 17 00:00:00 2001 From: abenmos Date: Fri, 28 Jun 2024 15:27:44 -0400 Subject: [PATCH] Updates for 2.10.0 release. --- build/dependency_map.py | 2 +- build/pre_build.py | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/build/dependency_map.py b/build/dependency_map.py index fa98adb..baf3046 100644 --- a/build/dependency_map.py +++ b/build/dependency_map.py @@ -47,5 +47,5 @@ "device_info" : ["../external/device_info", "c374c2b328bea66a92db6e49f6b32607f97b3e2c"], "update_check_api" : ["../external/update_check_api", "v2.1.1"], # QtCommon. - "qt_common" : ["../external/QtCommon", "6377814493f6e5c97fd5c44fccdd22767bf86355"], + "qt_common" : ["../external/qt_common", "6377814493f6e5c97fd5c44fccdd22767bf86355"], } diff --git a/build/pre_build.py b/build/pre_build.py index b7a3d4e..d890d56 100644 --- a/build/pre_build.py +++ b/build/pre_build.py @@ -15,9 +15,6 @@ import subprocess import platform import time -# START_REMOVE_DURING_SANITIZATION -import fetch_qt -# END_REMOVE_DURING_SANITIZATION # prevent generation of .pyc file sys.dont_write_bytecode = True @@ -210,15 +207,6 @@ def generate_config(config, args): qt_expanded_root = os.path.expanduser(args.qt_root) qt_found,qt_path = check_qt_path(qt_expanded_root, args.qt_root, args.qt) - # START_REMOVE_DURING_SANITIZATION - if qt_found == False: - # Call fetch_qt script - log_print ("Fetching Qt...\n") - target_qt_dir = qt_expanded_root - fetch_qt.do_fetch_qt(target_qt_dir) - qt_found,qt_path = check_qt_path(qt_expanded_root, args.qt_root, args.qt) - # END_REMOVE_DURING_SANITIZATION - if qt_found == False: log_error_and_exit(qt_path) @@ -240,12 +228,6 @@ def generate_config(config, args): elif args.toolchain == "2017": cmake_args.extend(["-Tv141"]) - # START_REMOVE_DURING_SANITIZATION - if args.internal: - cmake_args.extend(["-DINTERNAL_BUILD:BOOL=TRUE"]) - if args.automation: - cmake_args.extend(["-DGUI_AUTOMATION=ON"]) - # END_REMOVE_DURING_SANITIZATION # Use build number. cmake_args.extend(["-DRGA_BUILD_NUMBER=" + str(args.build_number)])