Skip to content

[readosm] Update to 1.1.0a#15038

Merged
BillyONeal merged 6 commits intomicrosoft:masterfrom
longhuan2018:update-readosm-1.1.0a
Dec 17, 2020
Merged

[readosm] Update to 1.1.0a#15038
BillyONeal merged 6 commits intomicrosoft:masterfrom
longhuan2018:update-readosm-1.1.0a

Conversation

@longhuan2018
Copy link
Copy Markdown
Contributor

@longhuan2018 longhuan2018 commented Dec 10, 2020

update to 1.1.0a
support linux and osx build

@JonLiu1993 JonLiu1993 added the category:port-update The issue is with a library, which is requesting update new revision label Dec 10, 2020
@longhuan2018
Copy link
Copy Markdown
Contributor Author

longhuan2018 commented Dec 10, 2020

The detection failure is caused by spatialite-tools. I fixed this port in PR #15039. I don’t know if I need to block the linux and osx compilation of spatialite-tools in this PR.

@PhoebeHui PhoebeHui added the depends:different-pr This PR or Issue depends on a PR which has been filed label Dec 10, 2020
@PhoebeHui
Copy link
Copy Markdown
Contributor

PhoebeHui commented Dec 10, 2020

@longhuan2018, after PR #15039 merged, I will rerun the CI testing, so you don't need to block them in this PR.

PhoebeHui
PhoebeHui requested changes Dec 10, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@PhoebeHui PhoebeHui left a comment

Choose a reason for hiding this comment

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

Thanks for your contribution!

Could you please exported the cmake config and targets file instead?

@longhuan2018
Copy link
Copy Markdown
Contributor Author

longhuan2018 commented Dec 11, 2020

Do I need to add spatialite-tools to ci.baseline.txt first to exclude its compilation in linux and osx? Because the current version of the spatialite-tools port only supports windows. @PhoebeHui

@PhoebeHui
Copy link
Copy Markdown
Contributor

PhoebeHui commented Dec 11, 2020

@longhuan2018, since you have fixed it by PR #15039, so this is not required, I will rerun the CI testing after the PR merged.

@longhuan2018
Copy link
Copy Markdown
Contributor Author

longhuan2018 commented Dec 11, 2020 •
edited
Loading

But spatialite-tools is dependent on readosm. If this PR fails, then it cannot be compiled.
The current error is reported because the original readosm and spatialite-tools only support Windows. Now readosm supports linux and osx, but the CONTROL of spatialite-tools does not exclude linux and osx, so the error is caused.

@PhoebeHui
Copy link
Copy Markdown
Contributor

PhoebeHui commented Dec 11, 2020

@longhuan2018, I think you should update the 2 ports togather, then the CI would test the changes and catch the regressions.

@longhuan2018
Copy link
Copy Markdown
Contributor Author

longhuan2018 commented Dec 11, 2020

This is what I split from PR #14951, CI has been verified

@PhoebeHui PhoebeHui changed the title [readosm]update to 1.1.0a [readosm] Update to 1.1.0a Dec 11, 2020
@PhoebeHui
Copy link
Copy Markdown
Contributor

PhoebeHui commented Dec 11, 2020

@longhuan2018, that's fine, you can enable the spatialite-tools in PR #15039 after this PR merged.

@PhoebeHui PhoebeHui removed the depends:different-pr This PR or Issue depends on a PR which has been filed label Dec 11, 2020
PhoebeHui
PhoebeHui approved these changes Dec 11, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@PhoebeHui PhoebeHui left a comment

Choose a reason for hiding this comment

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

Thanks for your contribution!

@PhoebeHui PhoebeHui added info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. and removed requires:author-response labels Dec 11, 2020
BillyONeal
BillyONeal reviewed Dec 12, 2020
View reviewed changes
@BillyONeal BillyONeal added requires:author-response and removed info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. labels Dec 12, 2020
longhuan2018 and others added 2 commits December 14, 2020 09:27
@longhuan2018 @BillyONeal
Update scripts/ci.baseline.txt
9421a71 
Co-authored-by: Billy O'Neal <bion@microsoft.com>
@longhuan2018
Update portfile.cmake
7e5583e
@PhoebeHui PhoebeHui added info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. and removed requires:author-response labels Dec 16, 2020
@BillyONeal BillyONeal merged commit 4b6f0b1 into microsoft:master Dec 17, 2020
@BillyONeal
Copy link
Copy Markdown
Member

BillyONeal commented Dec 17, 2020

Thanks!

ryukw7 pushed a commit to ryukw7/vcpkg that referenced this pull request Dec 24, 2020
@longhuan2018
[readosm] Update to 1.1.0a (microsoft#15038)
6648797
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@BillyONeal BillyONeal BillyONeal left review comments

@PhoebeHui PhoebeHui PhoebeHui approved these changes

Assignees

@PhoebeHui PhoebeHui

Labels

category:port-update The issue is with a library, which is requesting update new revision info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@longhuan2018 @PhoebeHui @BillyONeal @JonLiu1993