Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compile_commands.json output location when generator_output is None #239

Merged
merged 4 commits into from
Apr 2, 2024
Merged

Fix compile_commands.json output location when generator_output is None #239

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
df61b9b
Fix compile_commands.json output location when generator_output is None
segevfiner Apr 1, 2024
7c60cb5
Fix lint
segevfiner Apr 2, 2024
89cc9e4
Update pylib/gyp/generator/compile_commands_json.py
segevfiner Apr 2, 2024
aab0b24
Update pylib/gyp/generator/compile_commands_json.py
segevfiner Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions pylib/gyp/generator/compile_commands_json.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,14 @@ def GenerateOutput(target_list, target_dicts, data, params):
cwd = os.path.dirname(build_file)
AddCommandsForTarget(cwd, target, params, per_config_commands)

output_dir = None
try:
# generator_output can be `None` on Windows machines
output_dir = params["options"].generator_output or os.getcwd()
except (AttributeError, KeyError):
output_dir = params["generator_flags"].get("output_dir", "out")
# generator_output can be `None` on Windows machines, or even not
# defined in other cases
output_dir = params.get("options").generator_output
except AttributeError:
pass
output_dir = output_dir or params["generator_flags"].get("output_dir", "out")
for configuration_name, commands in per_config_commands.items():
filename = os.path.join(output_dir, configuration_name, "compile_commands.json")
gyp.common.EnsureDirExists(filename)
Expand Down
Loading