Skip to content

File resolve and globbing improvements #438

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

Open
martinecker-ATVI wants to merge 1 commit into
base: main
Choose a base branch
from
Open

File resolve and globbing improvements #438

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
35 changes: 34 additions & 1 deletion Sharpmake/Project.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -900,8 +900,30 @@ internal virtual void ResolveSourceFiles(Builder builder)
NoneExtensions.RemoveAll(s => NoneExtensionsCopyIfNewer.Contains(s));
}

var extensionContainers = new[]
{
SourceFilesExtensions,
ResourceFilesExtensions,
PRIFilesExtensions,
NatvisFilesExtensions,
NoneExtensions,
NoneExtensionsCopyIfNewer,
ProtoExtensions
};

// The code below does an expensive glob to get source files, which when generating the
// debug project will have to scan a potentially large depot tree and takes a long time
// Clear all extensions to not do the file scanning for the debug project.
if (this is DebugProject)
{
foreach (var container in extensionContainers)
{
container.Clear();
}
}

// Only scan directory for files if needed
if (SourceFilesExtensions.Count != 0 || ResourceFilesExtensions.Count != 0 || PRIFilesExtensions.Count != 0 || NoneExtensions.Count != 0 || NoneExtensionsCopyIfNewer.Count != 0)
if (extensionContainers.Any(container => container.Count != 0))
{
string capitalizedSourceRootPath = Util.GetCapitalizedPath(SourceRootPath);

Expand Down Expand Up @@ -1912,6 +1934,13 @@ internal virtual void Resolve(Builder builder, bool skipInvalidPath)
Util.ResolvePath(SourceRootPath, ref SourceFilesExclude);
Util.ResolvePath(SourceRootPath, ref SourceFilesBlobExclude);
Util.ResolvePath(SourceRootPath, ref SourceFilesBuildExclude);
Util.ResolvePath(SourceRootPath, ref PRIFiles);
Util.ResolvePath(SourceRootPath, ref ResourceFiles);
Util.ResolvePath(SourceRootPath, ref NatvisFiles);
Util.ResolvePath(SourceRootPath, ref NoneFiles);
Util.ResolvePath(SourceRootPath, ref NoneFilesCopyIfNewer);
Util.ResolvePath(SourceRootPath, ref ProtoFiles);

Util.ResolvePath(SharpmakeCsPath, ref _blobPath);

if (SourceFilesFilters != null)
Expand Down Expand Up @@ -2046,6 +2075,10 @@ public FastBuildAllProject(Type targetType)
SourceFilesExtensions.Clear();
ResourceFilesExtensions.Clear();
PRIFilesExtensions.Clear();
NatvisFilesExtensions.Clear();
NoneExtensions.Clear();
NoneExtensionsCopyIfNewer.Clear();
ProtoExtensions.Clear();
}
}

Expand Down