Skip to content

Fix binding project LinkWithAttributes generation to prevent unnecess… - #1029

Merged
rolfbjarne merged 3 commits into
masterfrom
binding_project_rebuild_fix
Oct 31, 2016
Merged

Fix binding project LinkWithAttributes generation to prevent unnecess…#1029
rolfbjarne merged 3 commits into
masterfrom
binding_project_rebuild_fix

Conversation

@chamons

@chamons chamons commented Oct 24, 2016

Copy link
Copy Markdown
Contributor

@chamons

chamons commented Oct 24, 2016

Copy link
Copy Markdown
Contributor Author

Repeat of #1017 but this time not early merged.

@chamons chamons added the do-not-merge Do not merge this pull request label Oct 24, 2016
@chamons

chamons commented Oct 24, 2016

Copy link
Copy Markdown
Contributor Author

Similar in spirit to #1014 but should fix both XI and XM since logic is shared in this case.

This patch assumes PR 1014 lands first, It might not build w\o the other test changes (I just cherry picked for review).

}
if (!skipLinkWithGeneration) {
Directory.CreateDirectory (Path.GetDirectoryName (linkWith));
File.WriteAllText (linkWith, text.ToString ());

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

you might be calling text.ToString() twice (not sure if it's cached, assuming it's a StringBuilder)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@spouliot fixed.

@monojenkins

Copy link
Copy Markdown
Contributor

Build failure

1 similar comment
@monojenkins

Copy link
Copy Markdown
Contributor

Build failure

@rolfbjarne

Copy link
Copy Markdown
Member

@chamons it doesn't merge cleanly anymore, can you fix?

@chamons

chamons commented Oct 28, 2016

Copy link
Copy Markdown
Contributor Author

@rolfbjarne Fixed. Will wait for build.

@monojenkins

Copy link
Copy Markdown
Contributor

Build failure

@rolfbjarne

Copy link
Copy Markdown
Member

Test failures are unrelated:

a) introspection-mac/Unified: random crash filed as bug #46102
b) introspection-ios/watchOS: ibtool hung during build - filed as bug #46097

So this is green from jenkins.

@rolfbjarne

Copy link
Copy Markdown
Member

This is dependent on PR #1014, which is already merged.

@rolfbjarne rolfbjarne removed the do-not-merge Do not merge this pull request label Oct 31, 2016
@rolfbjarne
rolfbjarne merged commit 612f52b into master Oct 31, 2016
@chamons
chamons deleted the binding_project_rebuild_fix branch October 31, 2016 13:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants