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.

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

[ace] Simplified port file #11464

Merged
merged 33 commits into from
May 28, 2020
Merged

Conversation

jwillemsen
Copy link
Contributor

Describe the pull request

  • What does your PR fix?

Reworked portfile to use an array to simplify the port file and more easily add more directories later

    * ports/ace/portfile.cmake:
    * ports/ace/portfile.cmake:
    * ports/ace/portfile.cmake:
    * ports/ace/portfile.cmake:
    * ports/ace/portfile.cmake:
    * ports/ace/portfile.cmake:
    * ports/ace/process_manager.patch:
      Added.

    * ports/ace/CONTROL:
    * ports/ace/portfile.cmake:
    * ports/ace/portfile.cmake:
    * ports/ace/portfile.cmake:
    * ports/ace/process_manager.patch:
    * ports/ace/portfile.cmake:
    * scripts/ci.baseline.txt:
    * ports/ace/CONTROL:
…libraries

    * ports/ace/CONTROL:
    * ports/ace/portfile.cmake:
@jwillemsen
Copy link
Contributor Author

See #8468, there it was added for adding tao

@jwillemsen
Copy link
Contributor Author

Looks failure is not caused by my changes

ports/ace/process_manager.patch Outdated Show resolved Hide resolved
ports/ace/process_manager.patch Outdated Show resolved Hide resolved
ports/ace/portfile.cmake Outdated Show resolved Hide resolved
Co-authored-by: Jack·Boos·Yu <[email protected]>
@JackBoosY JackBoosY added info:reviewed Pull Request changes follow basic guidelines and removed waiting for response labels May 21, 2020
@strega-nil
Copy link
Contributor

@jwillemsen should this be the second or third PR merged?

@jwillemsen
Copy link
Contributor Author

3rd

@strega-nil strega-nil added the depends:different-pr This PR or Issue depends on a PR which has been filed label May 21, 2020
@LilyWangL
Copy link
Contributor

@jwillemsen Can you resolve the conflict files?

@jwillemsen
Copy link
Contributor Author

Conflicts have been resolved

victorburckel added a commit to victorburckel/vcpkg that referenced this pull request May 28, 2020
@dan-shaw dan-shaw merged commit 3da5539 into microsoft:master May 28, 2020
@dan-shaw
Copy link
Contributor

Thanks!

dan-shaw pushed a commit that referenced this pull request Jun 12, 2020
* Add tao as feature for ace

* Use vcpkg_install_msbuild instead of vcpkg_build_msbuild

* Use lists for directories installation as in #11464

* Update to version 6.5.9-4

* Update version

Co-authored-by: Billy Robert O'Neal III <[email protected]>
JangBoo pushed a commit to JangBoo/vcpkg that referenced this pull request Jun 18, 2020
* 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 <[email protected]>
penumbra23 pushed a commit to codespace-dev/vcpkg that referenced this pull request Aug 5, 2020
* 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 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
depends:different-pr This PR or Issue depends on a PR which has been filed info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants