Skip to content
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

Jump to bottom

[ace] tao as feature #11473

Merged
merged 10 commits into from
Jun 12, 2020
Merged

[ace] tao as feature #11473

merged 10 commits into from
Jun 12, 2020

Conversation

victorburckel
Copy link
Contributor

Build tao as feature with ace

@msftclas
Copy link

msftclas commented May 20, 2020 •
edited
Loading

CLA assistant check
All CLA requirements met.

@NancyLi1013
Copy link
Contributor

Hi @victorburckel
Thanks for this PR.

Since this PR is related with #11369 and #11441.
Personally, it would be better to update the changes after these two PRs are merged.

What do you think about this?

@victorburckel
Copy link
Contributor Author

Hi @NancyLi1013
Yes sure, there's even #11464 that should be merged first. I will then have to do some small adaptations.

@NancyLi1013
Copy link
Contributor

@victorburckel
Could you please resolve the conflicts?

@victorburckel
Copy link
Contributor Author

Ok I merged the master branch and resolved the conflicts. I updated the CONTROL file to set the version to -4 because it should be merged after #11441 (which updates the version to -2) and #11464 (which updates the version to -3). I guess there will still be conflicts when the both will merged, especially the last one which uses arrays to enumerate includes to install for windows build.

@victorburckel
Merge remote-tracking branch 'upstream/master' into AceTaoAsFeature
0ce0353 
# Conflicts:
#	ports/ace/CONTROL
#	ports/ace/portfile.cmake
NancyLi1013
NancyLi1013 suggested changes May 28, 2020
View reviewed changes
@JackBoosY
Copy link
Contributor

JackBoosY commented May 29, 2020 •
edited
Loading

Now, I think you can continue this PR.
So please resolve the file conflicts first.

Thanks.

@NancyLi1013 NancyLi1013 added the category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist label May 29, 2020
@victorburckel
Copy link
Contributor Author

Thanks, conflicts resolved.

@victorburckel
Copy link
Contributor Author

Hi, are you waiting for any feedback, rework from me ?

@JackBoosY JackBoosY added the requires:testing Needs tests added before merging label Jun 3, 2020
@NancyLi1013
Copy link
Contributor

@victorburckel

Could you please resolve the conflicts?

All features have passed with the following triplets:

  • x86-windows
  • x64-windows
  • x64-windows-static

@victorburckel
Copy link
Contributor Author

Ok thanks for the test, I merged master and adapt to reflect the changes made to the portfile, and updated the version.
Seems like multiple packages fail to build currently.

@JackBoosY
Copy link
Contributor

JackBoosY commented Jun 4, 2020 •
edited
Loading

Please wait for us until the baseline error is resolved. #11742

@NancyLi1013 NancyLi1013 removed the requires:testing Needs tests added before merging label Jun 4, 2020
@victorburckel
Copy link
Contributor Author

Hi, I can't see if build failures are related to this PR or not. Can I do something to help making progress on that PR ?

@NancyLi1013
Copy link
Contributor

@victorburckel
The failures are not related with PR. We will rerun it once resolved in #11839.

@JackBoosY
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@NancyLi1013 NancyLi1013 added the info:reviewed Pull Request changes follow basic guidelines label Jun 10, 2020
@dan-shaw dan-shaw merged commit 0df89ff into microsoft:master Jun 12, 2020
@dan-shaw
Copy link
Contributor

Thanks for the PR!

JangBoo pushed a commit to JangBoo/vcpkg that referenced this pull request Jun 18, 2020
@victorburckel @BillyONeal @JangBoo
[ace] tao as feature (microsoft#11473)
146eeda 
* Add tao as feature for ace

* Use vcpkg_install_msbuild instead of vcpkg_build_msbuild

* Use lists for directories installation as in microsoft#11464

* Update to version 6.5.9-4

* Update version

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
penumbra23 pushed a commit to codespace-dev/vcpkg that referenced this pull request Aug 5, 2020
@victorburckel @BillyONeal @penumbra23
[ace] tao as feature (microsoft#11473)
c066823 
* Add tao as feature for ace

* Use vcpkg_install_msbuild instead of vcpkg_build_msbuild

* Use lists for directories installation as in microsoft#11464

* Update to version 6.5.9-4

* Update version

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
@victorburckel victorburckel deleted the AceTaoAsFeature branch November 7, 2020 08:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jwillemsen jwillemsen jwillemsen left review comments

@dan-shaw dan-shaw dan-shaw left review comments

@NancyLi1013 NancyLi1013 NancyLi1013 approved these changes

Assignees

@NancyLi1013 NancyLi1013

@JackBoosY JackBoosY

Labels
category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[New Port Request] ace+tao
7 participants
@victorburckel @msftclas @NancyLi1013 @JackBoosY @dan-shaw @jwillemsen @BillyONeal