Merge pull request #90450 from akien-mga/scons-fix-scu-windows

SCons: Fix SCU build regression on Windows
This commit is contained in:
Rémi Verschelde 2024-04-09 22:29:47 +02:00
commit 6c57928063
No known key found for this signature in database
GPG key ID: C3336907360768E1

View file

@ -23,8 +23,9 @@ def clear_out_stale_files(output_folder, extension, fresh_files):
return return
for file in glob.glob(output_folder + "/*." + extension): for file in glob.glob(output_folder + "/*." + extension):
file = Path(file)
if not file in fresh_files: if not file in fresh_files:
# print("removed stale file: " + file) # print("removed stale file: " + str(file))
os.remove(file) os.remove(file)
@ -97,7 +98,7 @@ def write_output_file(file_count, include_list, start_line, end_line, output_fol
elif _verbose: elif _verbose:
print("SCU: Generation not needed for: " + short_filename) print("SCU: Generation not needed for: " + short_filename)
return output_filename return output_path
def write_exception_output_file(file_count, exception_string, output_folder, output_filename_prefix, extension): def write_exception_output_file(file_count, exception_string, output_folder, output_filename_prefix, extension):
@ -124,7 +125,7 @@ def write_exception_output_file(file_count, exception_string, output_folder, out
elif _verbose: elif _verbose:
print("SCU: Generation not needed for: " + short_filename) print("SCU: Generation not needed for: " + short_filename)
return output_filename return output_path
def find_section_name(sub_folder): def find_section_name(sub_folder):