close
Skip to content

DO NOT MERGE: [stdlib] Pull in some ICU stubs and relevant code#9032

Closed
milseman wants to merge 8 commits intoswiftlang:masterfrom
milseman:wip_icu_incremental
Closed

DO NOT MERGE: [stdlib] Pull in some ICU stubs and relevant code#9032
milseman wants to merge 8 commits intoswiftlang:masterfrom
milseman:wip_icu_incremental

Conversation

@milseman
Copy link
Copy Markdown
Member

This pulls in several stubs and functionality from the unicode-rethink prototype into master. Small fixes were made along the way to keep it compiling and passing tests.

Dave Abrahams and others added 5 commits April 26, 2017 09:05
Things still need to be made public before they can be tested.
The tests we have are far from complete, but it does seem to work.
FCC is an unofficial normalization that is almost always identical to NFC and
can be used to bypass FCD checks and NFD normalization passes in ICU.  See
http://unicode.org/notes/tn5/
@milseman milseman requested a review from dabrahams April 26, 2017 17:30
@milseman
Copy link
Copy Markdown
Member Author

@dabrahams does this look like a reasonable port?

@milseman
Copy link
Copy Markdown
Member Author

@swift-ci please smoke test

@milseman
Copy link
Copy Markdown
Member Author

@swift-ci please smoke test

@milseman
Copy link
Copy Markdown
Member Author

@swift-ci please smoke test Linux platform

@milseman
Copy link
Copy Markdown
Member Author

Trying to see what path in the config the Linux bot took. We require ICU to be linked against, but I didn't see anything there.

@milseman
Copy link
Copy Markdown
Member Author

@swift-ci please smoke test Linux platform

@milseman milseman force-pushed the wip_icu_incremental branch from 7b43239 to 295fd69 Compare April 26, 2017 18:36
@milseman
Copy link
Copy Markdown
Member Author

@swift-ci please smoke test Linux platform

@milseman
Copy link
Copy Markdown
Member Author

@swift-ci please clean smoke test Linux platform

@milseman
Copy link
Copy Markdown
Member Author

@swift-ci please smoke test Linux platform

list(APPEND swift_core_link_flags "-all_load")
list(APPEND swift_core_framework_depends Foundation)
list(APPEND swift_core_framework_depends CoreFoundation)
list(APPEND swift_core_private_link_libraries -licucore)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The -l is unneeded, it should be sufficient to use icucore.

endif()
if("${ICU_I18N}" STREQUAL "")
message(FATAL_ERROR "ICU_I18N undefined")
endif()
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Use the precondition helper that we have. It will simplify this:

precondition(ICU_UC "ICU_UC must be defined")
precondition(ICU_I18N "ICU_I18N must be defined")

@milseman milseman changed the title [stdlib] Pull in some ICU stubs and relevant code DO NOT MERGE: [stdlib] Pull in some ICU stubs and relevant code May 1, 2017
@milseman
Copy link
Copy Markdown
Member Author

milseman commented May 1, 2017

Thanks, I will make sure the final version uses precondition instead. For now, this is not necessarily the exact same details of how we'll want to integrate ICU, but does still illustrate the Linux issues.

@milseman
Copy link
Copy Markdown
Member Author

milseman commented May 1, 2017

@erg

@erg
Copy link
Copy Markdown
Contributor

erg commented May 8, 2017

Working on this.

@erg
Copy link
Copy Markdown
Contributor

erg commented May 8, 2017

@swift-ci Please smoke test linux

@milseman
Copy link
Copy Markdown
Member Author

milseman commented May 8, 2017

Note that this PR should not be merged, but it exposes the issue we will hit when the real PR (which is likely to be a rebasing / squashing of #9265) lands.

@milseman
Copy link
Copy Markdown
Member Author

The real PR has pthread woe mixed in. Hopefully this PR can isolate the ICU stuff.

@swift-ci please smoke test Linux Platform

@milseman
Copy link
Copy Markdown
Member Author

@swift-ci please smoke test Linux Platform

@milseman
Copy link
Copy Markdown
Member Author

Irrelevant now

@milseman milseman closed this May 18, 2017
@milseman milseman deleted the wip_icu_incremental branch May 18, 2017 01:37
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.

3 participants