Skip to content

Commit

Permalink
SCons: Fix SCU build regression on Windows
Browse files Browse the repository at this point in the history
PR #89452 made assumptions on comparing paths as strings
which doesn't work when composing them as POSIX paths (`/`)
but processing them on NT (`\`, `\\`).
  • Loading branch information
akien-mga committed Apr 9, 2024
1 parent a7b8602 commit 9ad140f
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions scu_builders.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down Expand Up @@ -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):
Expand All @@ -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):
Expand Down

0 comments on commit 9ad140f

Please sign in to comment.