-
Notifications
You must be signed in to change notification settings - Fork 7.4k
[ace] Added TAO as feature #8468
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
Closed
Closed
Changes from all commits
Commits
Show all changes
32 commits
Select commit
Hold shift + click to select a range
7747805
ace-tao 6.5.6
bold84 7f80da2
Enabled building for ARM, ARM64, UWP, Darwin
bold84 0f884f0
fix CMake script
bold84 0322188
Merge branch 'master' into vcpkg-ace-port
bold84 7676509
Now not copying the CMake Find files anymore.
bold84 b55cc45
Removed deprecated vcpkg_common_functions inclusion
bold84 7de2270
changed the feature names (removed tao-)
bold84 7243c70
Updated version in CONTROL file, removed Maintainer string and replac…
bold84 49e9874
Merge remote-tracking branch 'upstream/master' into vcpkg-ace-port
bold84 15419a7
temporarily added .gitlab-ci.yml
bold84 21dbefe
Update .gitlab-ci.yml
bold84 870dcc3
openssl11=1
bold84 8306555
Merge branch 'vcpkg-ace-port' of http://gitlab.intra.ordis.co.th/ordi…
bold84 086c820
Removed entries from ci.ci.baseline.txt
bold84 1e273f1
removed .gitlab-ci.yml
bold84 48801fe
Removed unnecessary patch files and other files
bold84 3f8db11
renamed feature xml to xerces-c
bold84 6554600
reverted last change and replaced MPC feature xml with xerces3
bold84 65e1bbe
Added VCPKG_TARGET_IS_*
bold84 8259e3c
replaced vcpkg_execute_required_process with vcpkg_build_make
bold84 95815d8
replaced xml with xerces-c
bold84 bb17c5d
disabled UWP builds
bold84 4337dec
Removed Qt5 support
bold84 6a99966
Don't support UWP
bold84 e74ce5a
Don't support linux and expect such build to fail
bold84 5bbcdbe
x86 -> Win32
bold84 ada4b76
"re-enable" linux build
bold84 78e8c7b
working dir for linux build
bold84 29d0cbb
removed nonsense argument.
bold84 67212c2
added vcpkg_configure_make
bold84 7d38421
handle executable file extensions correctly
bold84 e3a74b9
Removed arm_prevent_amd64_definition.patch
bold84 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,30 @@ | ||
| Source: ace | ||
| Version: 6.5.8 | ||
| Homepage: https://www.dre.vanderbilt.edu/~schmidt/ACE.html | ||
| Description: The ADAPTIVE Communication Environment | ||
| Supports: !uwp | ||
| Homepage: https://www.dre.vanderbilt.edu/~schmidt/TAO.html | ||
| Supports: !(uwp|linux) | ||
|
|
||
| Feature: wchar | ||
| Description: Enable extra wide char functions in ACE | ||
| Description: Enable extra wide char functions | ||
|
|
||
| Feature: ssl | ||
| Description: Enable SSL/TLS features in ACE | ||
| Build-Depends: openssl | ||
| Description: Enable SSL/TLS features | ||
|
|
||
| Feature: xerces-c | ||
| Build-Depends: xerces-c | ||
| Description: Enable XML features | ||
|
|
||
| Feature: zlib | ||
| Build-Depends: zlib | ||
| Description: Enable zlib support | ||
|
|
||
| Feature: bzip2 | ||
| Build-Depends: bzip2 | ||
| Description: Enable bzip2 support | ||
|
|
||
| Feature: tao | ||
| Description: The ACE ORB | ||
|
|
||
|
|
||
|
|
||
| Feature: xml | ||
| Description: Enable XML features in ACE |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| --- a/MPC/config/bzip2.mpb 2019-10-06 11:14:51.164094600 +0700 | ||
| +++ b/MPC/config/bzip2.mpb 2019-10-06 11:15:08.269289500 +0700 | ||
| @@ -5,8 +5,6 @@ | ||
| macros += USE_BZIP2 | ||
|
|
||
| specific(prop:windows) { | ||
| - lit_libs += bzip2 | ||
| - } else { | ||
| lit_libs += bz2 | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you create a PR for MPC https://github.com/DOCGroup/MPC
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes... I've moved our office. I expect to be done tonight and can take care about this and the other PRs on the weekend.