Skip to content

Initial integration of libdispatch into build-script #1030

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

Merged
merged 1 commit into from
Jan 21, 2016
Merged

Initial integration of libdispatch into build-script #1030

merged 1 commit into from
Jan 21, 2016

Conversation

dgrove-oss
Copy link
Contributor

Extend build-script, build-script-impl, and update-checkout
to include libdispatch. For now, libdispatch is not
built by default (user must enable via command line
argument).

Integration of testing is functional, but should be improved
in a later pull request. The basic autotools based test
harness does not give the nice high-level progress output
as the rest of the test suite.

A related pull request to libdispatch (#34) has some fixes
to the autotools build that are needed to enable the test
target to succeed when run in an external directory.

@dgrove-oss
Copy link
Contributor Author

Taking the approach as discussed with @parkera on the swift-corelibs-dev list yesdterday of just invoking libdisaptch's autotools build machinery from these scripts.

@@ -1284,6 +1300,9 @@ function cmake_config_opt() {
foundation)
echo "--config ${FOUNDATION_BUILD_TYPE}"
;;
libdispatch)
Copy link
Contributor

Choose a reason for hiding this comment

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

Does libdispatch use CMake? If not, why is this change needed?

@gribozavr
Copy link
Contributor

Some comments above, but looks reasonable in general.

@dgrove-oss
Copy link
Contributor Author

Thanks for the quick review. Sorry about the indentation; I was using my libdispatch emacs mode (force tabs; tabs are 4 spaces). Need a different mode for foundation...
Pushed a follow up commit to hopefully address all your comments.

@gribozavr
Copy link
Contributor

Thanks. One more place with tabs.

My concern about the build mode is that we shouldn't accidentally ship a debug library, and IIRC Autoconf builds in debug by default. We can fix that in a later commit though.

@dgrove-oss
Copy link
Contributor Author

Thanks. I'll look on the dispatch side and see if it needs tweaking to support debug/release build modes in the autoconf driven build.

Do you need me to squash & open a new pull request (since this one has gotten a bit messy with the whitespace fixups)?

@gribozavr
Copy link
Contributor

@dgrove-oss Please squash in-place.

Extend build-script, build-script-impl, and update-checkout
to include libdispatch.  For now, libdispatch is not
built by default (user must enable via command line
argument).

Integration of testing is functional, but should be improved
in a later pull request.  The basic autotools based test
harness does not give the nice high-level progress output
as the rest of the test suite.

A related pull request to libdispatch (#34) has some fixes
to the autotools build that are needed to enable the test
target to succeed when run in an external directory.
@dgrove-oss
Copy link
Contributor Author

squashed in place. Thanks.

@gribozavr gribozavr self-assigned this Jan 21, 2016
@gribozavr
Copy link
Contributor

Passes tests on Ubuntu 14.04. Merging.

gribozavr added a commit that referenced this pull request Jan 21, 2016
Initial integration of libdispatch into build-script
@gribozavr gribozavr merged commit 8c1d7a0 into swiftlang:master Jan 21, 2016
@dgrove-oss dgrove-oss deleted the libdispatch-build-script branch February 16, 2016 14:38
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.

2 participants