Skip to content

[msbuild] Fixed logic for building WatchOS storyboards #75

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
rolfbjarne merged 1 commit into from
May 25, 2016
Merged

[msbuild] Fixed logic for building WatchOS storyboards #75

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
14 changes: 4 additions & 10 deletions msbuild/Xamarin.MacDev.Tasks.Core/Tasks/IBToolTaskBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,6 @@ string GetBundleRelativeOutputPath (ITaskItem input)

switch (Path.GetExtension (bundleName)) {
case ".storyboard":
if (IsWatchApp)
return Path.ChangeExtension (bundleName, ".plist");

return Path.ChangeExtension (bundleName, ".storyboardc");
case ".xib":
return Path.ChangeExtension (bundleName, ".nib");
Expand Down Expand Up @@ -228,10 +225,10 @@ public override bool Execute ()
output.SetMetadata ("LogicalName", bundleName);
output.SetMetadata ("Optimize", "false");

if (Path.GetExtension (bundleName) != ".plist") {
// Don't include Watch storyboards that got compiled to plists
compiled.Add (output);
}
if (!string.IsNullOrEmpty (resourceTags))
output.SetMetadata ("ResourceTags", resourceTags);

compiled.Add (output);

if (UseCompilationDirectory) {
// Note: When using --compilation-directory, we need to specify the output path as the parent directory
Expand All @@ -240,9 +237,6 @@ public override bool Execute ()
output.SetMetadata ("LogicalName", Path.GetDirectoryName (bundleName));
}

if (!string.IsNullOrEmpty (resourceTags))
output.SetMetadata ("ResourceTags", resourceTags);

if (!ManifestExists (manifest.ItemSpec) || File.GetLastWriteTime (manifest.ItemSpec) < File.GetLastWriteTime (item.ItemSpec)) {
Directory.CreateDirectory (manifestDir);
Directory.CreateDirectory (outputDir);
Expand Down