summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-04-09 22:29:47 +0200
committerRémi Verschelde <rverschelde@gmail.com>2024-04-09 22:29:47 +0200
commit6c579280630715ff7da8310d405ef34194847294 (patch)
tree157c2bbb14710d896e358755598e4bc4f0da4b79
parent0993df8be321fa0c219b01a50fcd32098ad18515 (diff)
parent9ad140f4f2e1298887ead5b363e00b073538f2c6 (diff)
downloadredot-engine-6c579280630715ff7da8310d405ef34194847294.tar.gz
Merge pull request #90450 from akien-mga/scons-fix-scu-windows
SCons: Fix SCU build regression on Windows
-rw-r--r--scu_builders.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/scu_builders.py b/scu_builders.py
index b180cbc864..e6adf6543c 100644
--- a/scu_builders.py
+++ b/scu_builders.py
@@ -23,8 +23,9 @@ def clear_out_stale_files(output_folder, extension, fresh_files):
return
for file in glob.glob(output_folder + "/*." + extension):
+ file = Path(file)
if not file in fresh_files:
- # print("removed stale file: " + file)
+ # print("removed stale file: " + str(file))
os.remove(file)
@@ -97,7 +98,7 @@ def write_output_file(file_count, include_list, start_line, end_line, output_fol
elif _verbose:
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):
@@ -124,7 +125,7 @@ def write_exception_output_file(file_count, exception_string, output_folder, out
elif _verbose:
print("SCU: Generation not needed for: " + short_filename)
- return output_filename
+ return output_path
def find_section_name(sub_folder):