Skip to content

[Xamarin.Android.Build.Tasks] reduce task time #2093

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

Merged
merged 1 commit into from
Aug 26, 2018
Merged

[Xamarin.Android.Build.Tasks] reduce task time #2093

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
21 changes: 14 additions & 7 deletions src/Xamarin.Android.Build.Tasks/Tasks/ConvertResourcesCases.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,18 +53,25 @@ void FixupResources (ITaskItem item, Dictionary<string, string> acwMap)
{
var resdir = item.ItemSpec;
// Find all the xml and axml files
var xmls = new[] { resdir }
.Concat (Directory.EnumerateDirectories (resdir, "*", SearchOption.AllDirectories)
.Except (Directory.EnumerateDirectories (resdir, "color*", SearchOption.TopDirectoryOnly))
.Except (Directory.EnumerateDirectories (resdir, "raw*", SearchOption.TopDirectoryOnly)))
.SelectMany (dir => Directory.EnumerateFiles (dir, "*.xml")
.Concat (Directory.EnumerateFiles (dir, "*.axml")));
var xmls = new List<string> ();
var colorDir = Path.Combine (resdir, "color");
var rawDir = Path.Combine (resdir, "raw");
foreach (var file in Directory.GetFiles (resdir, "*.*xml", SearchOption.AllDirectories)) {
if (file.StartsWith (colorDir, StringComparison.Ordinal) || file.StartsWith (rawDir, StringComparison.Ordinal))
continue;
var ext = Path.GetExtension (file);
if (ext != ".xml" && ext != ".axml")
continue;
xmls.Add (file);
}

var lastUpdate = DateTime.MinValue;
if (!string.IsNullOrEmpty (AndroidConversionFlagFile) && File.Exists (AndroidConversionFlagFile)) {
lastUpdate = File.GetLastWriteTimeUtc (AndroidConversionFlagFile);
}
Log.LogDebugMessage (" AndroidConversionFlagFile modified: {0}", lastUpdate);

var resourcedirectories = ResourceDirectories.Where (s => s != item).Select(s => s.ItemSpec).ToArray();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@StephaneDelcroix I think too much got taken out.

Something should use this variable?

Copy link
Contributor Author

@StephaneDelcroix StephaneDelcroix Aug 24, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

forgot to push. fixed

// Fix up each file
foreach (string file in xmls) {
var srcmodifiedDate = File.GetLastWriteTimeUtc (file);
Expand All @@ -78,7 +85,7 @@ void FixupResources (ITaskItem item, Dictionary<string, string> acwMap)
MonoAndroidHelper.SetWriteable (tmpdest);
try {
bool success = AndroidResource.UpdateXmlResource (resdir, tmpdest, acwMap,
ResourceDirectories.Where (s => s != item).Select(s => s.ItemSpec), (t, m) => {
resourcedirectories, (t, m) => {
string targetfile = file;
if (targetfile.StartsWith (resdir, StringComparison.InvariantCultureIgnoreCase)) {
targetfile = file.Substring (resdir.Length).TrimStart (Path.DirectorySeparatorChar);
Expand Down