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

Jump to bottom

Visual Studio: Improve performance of parsing project file #88949

Merged
merged 1 commit into from
Feb 29, 2024
Merged

Visual Studio: Improve performance of parsing project file #88949

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
69 changes: 46 additions & 23 deletions methods.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1142,6 +1142,11 @@ def format_key_value(v):
# This lets projects be regenerated even if there are build errors.
filtered_args.pop("vsproj_gen_only", None)

# This flag allows users to regenerate only the props file without touching the sln or vcxproj files.
# This preserves any customizations users have done to the solution, while still updating the file list
# and build commands.
filtered_args.pop("vsproj_props_only", None)

# The "progress" option is ignored as the current compilation progress indication doesn't work in VS
filtered_args.pop("progress", None)

Expand Down Expand Up @@ -1334,27 +1339,30 @@ def format_key_value(v):
set_sources = set(sources_active)
set_others = set(others_active)
for file in headers:
base_path = os.path.dirname(file).replace("\\", "_")
all_items.append(f'<ClInclude Include="{file}">')
all_items.append(
f" <ExcludedFromBuild Condition=\"!$(ActiveProjectItemList.Contains(';{file};'))\">true</ExcludedFromBuild>"
f" <ExcludedFromBuild Condition=\"!$(ActiveProjectItemList_{base_path}.Contains(';{file};'))\">true</ExcludedFromBuild>"
)
all_items.append("</ClInclude>")
if file in set_headers:
activeItems.append(file)

for file in sources:
base_path = os.path.dirname(file).replace("\\", "_")
all_items.append(f'<ClCompile Include="{file}">')
all_items.append(
f" <ExcludedFromBuild Condition=\"!$(ActiveProjectItemList.Contains(';{file};'))\">true</ExcludedFromBuild>"
f" <ExcludedFromBuild Condition=\"!$(ActiveProjectItemList_{base_path}.Contains(';{file};'))\">true</ExcludedFromBuild>"
)
all_items.append("</ClCompile>")
if file in set_sources:
activeItems.append(file)

for file in others:
base_path = os.path.dirname(file).replace("\\", "_")
all_items.append(f'<None Include="{file}">')
all_items.append(
f" <ExcludedFromBuild Condition=\"!$(ActiveProjectItemList.Contains(';{file};'))\">true</ExcludedFromBuild>"
f" <ExcludedFromBuild Condition=\"!$(ActiveProjectItemList_{base_path}.Contains(';{file};'))\">true</ExcludedFromBuild>"
)
all_items.append("</None>")
if file in set_others:
Expand All @@ -1368,7 +1376,18 @@ def format_key_value(v):
break

condition = "'$(GodotConfiguration)|$(GodotPlatform)'=='" + vsconf + "'"
properties.append("<ActiveProjectItemList>;" + ";".join(activeItems) + ";</ActiveProjectItemList>")
itemlist = {}
for item in activeItems:
key = os.path.dirname(item).replace("\\", "_")
if not key in itemlist:
itemlist[key] = [item]
else:
itemlist[key] += [item]

for x in itemlist.keys():
properties.append(
"<ActiveProjectItemList_%s>;%s;</ActiveProjectItemList_%s>" % (x, ";".join(itemlist[x]), x)
)
output = f'bin\\godot{env["PROGSUFFIX"]}'

props_template = open("misc/msvs/props.template", "r").read()
Expand Down Expand Up @@ -1406,6 +1425,8 @@ def format_key_value(v):

cmd_rebuild = [
"vsproj=yes",
"vsproj_props_only=yes",
"vsproj_gen_only=no",
f"vsproj_name={project_name}",
] + common_build_postfix

Expand Down Expand Up @@ -1523,25 +1544,27 @@ def format_key_value(v):
section1 = sorted(section1)
section2 = sorted(section2)

proj_template = open("misc/msvs/vcxproj.template", "r").read()

proj_template = proj_template.replace("%%UUID%%", proj_uuid)
proj_template = proj_template.replace("%%CONFS%%", "\n ".join(configurations))
proj_template = proj_template.replace("%%IMPORTS%%", "\n ".join(imports))
proj_template = proj_template.replace("%%DEFAULT_ITEMS%%", "\n ".join(all_items))
proj_template = proj_template.replace("%%PROPERTIES%%", "\n ".join(properties))

with open(f"{project_name}.vcxproj", "w") as f:
f.write(proj_template)

sln_template = open("misc/msvs/sln.template", "r").read()
sln_template = sln_template.replace("%%NAME%%", project_name)
sln_template = sln_template.replace("%%UUID%%", proj_uuid)
sln_template = sln_template.replace("%%SLNUUID%%", sln_uuid)
sln_template = sln_template.replace("%%SECTION1%%", "\n ".join(section1))
sln_template = sln_template.replace("%%SECTION2%%", "\n ".join(section2))
with open(f"{project_name}.sln", "w") as f:
f.write(sln_template)
if not get_bool(original_args, "vsproj_props_only", False):
proj_template = open("misc/msvs/vcxproj.template", "r").read()
proj_template = proj_template.replace("%%UUID%%", proj_uuid)
proj_template = proj_template.replace("%%CONFS%%", "\n ".join(configurations))
proj_template = proj_template.replace("%%IMPORTS%%", "\n ".join(imports))
proj_template = proj_template.replace("%%DEFAULT_ITEMS%%", "\n ".join(all_items))
proj_template = proj_template.replace("%%PROPERTIES%%", "\n ".join(properties))

with open(f"{project_name}.vcxproj", "w") as f:
f.write(proj_template)

if not get_bool(original_args, "vsproj_props_only", False):
sln_template = open("misc/msvs/sln.template", "r").read()
sln_template = sln_template.replace("%%NAME%%", project_name)
sln_template = sln_template.replace("%%UUID%%", proj_uuid)
sln_template = sln_template.replace("%%SLNUUID%%", sln_uuid)
sln_template = sln_template.replace("%%SECTION1%%", "\n ".join(section1))
sln_template = sln_template.replace("%%SECTION2%%", "\n ".join(section2))

with open(f"{project_name}.sln", "w") as f:
f.write(sln_template)

if get_bool(original_args, "vsproj_gen_only", True):
sys.exit()
Loading