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

ICU-20482 Backport support for Placeholder New Era in Japanese Calendar to ICU 62 #514

Merged
merged 17 commits into from
Mar 21, 2019

Conversation

jefgen
Copy link
Member

@jefgen jefgen commented Mar 6, 2019

This change back ports various changes/commits from newer versions of ICU to ICU 62 so as to enable support for the placeholder new era in the Japanese Calendar in ICU.

Also included in this PR are additional changes to enable the CI build bots to build cleanly, so that we can verify ICU builds and the tests pass with these changes.

I purposely did not use the original commit titles, as I did not want JIRA to become confused about when the original tickets/issues were merged. However, I did include the original commit hash (SHA) and commit message for reference.

Note: This PR does not back port support for the Gannen year formatting.
It only enables the placeholder era. (I don't plan on back-porting the Gannen formatting).

Checklist

yumaoka and others added 17 commits March 13, 2019 11:30
… the New Era.

Manually cherry-picked from commit: 45cdda6

Original commit message:


ICU-12973 CLDR Japanese Era data and tentative Japanese new era support (unicode-org#111)

* Updated era data format in supplementalData.

* Include tentative era names in data. Implemented Japanese era loaded from CLDR data in ICU4J.

* ICU4C implementation, ICU4C refactoring. WIP.

* VS project updates and some bug fixes

Also added API comments.

* Review feedback and bug fixes

- NULL to nullptr
- use of LocalUResourceBundlePointer
- TYPO "name" to "named"
- env var checking stricmp() == 0

* API comment correction based on feedback

* Duplicate the comment in ucal.h to calendar.h

* Fixed spelling errors in API comment
… remove gotos and typos.

cherry-picked from: 3ec241f

Original commit message:

- Enable UWP version of ICU to use Environment variable `ICU_ENABLE_TENTATIVE_ERA` for testing placeholder era names.
- Use `LocalArray<int32_t>` for the Era Start Dates to simply memory management, so that `goto` can be removed.
- Also fix some minor typos in header file.

cherry-picked from 4a8b474.
cherry-picked from: 0963829

Original commit message:

Selectively cherry pick memory fixes and dependencies changes from ICU 63 RC BRS tasks.
(cherry-picked from: cc1784a )
…ws headers.

cherry-picked from: 8a2094d

Original commit message:

Changes for the Windows system component version.
…on of new era.

cherry-picked from: 78ce120

Original commit message:

ICU-20145 Allow passing locale in ICU4C "date" sample program for testing without using the environment variable "LC_ALL". (unicode-org#125)

The ICU4C sample "date" program just uses the "default" ICU locale. This change lets you pass in an explicit locale argument for testing on platforms like Windows that don't have/use the environment variable "LC_ALL".
- Regenerate the ICU4J data files (icudata.jar and icutzdata.jar).
- Remove unsupported Java Diamond operators in order to unbreak the Java build.
cherry-picked from: 12e2a72

Original commit message:

ICU-20062 Set the Python -B flag to inhibit the writing of .pyc files.

This will prevent littering the source tree with spurious .pyc files.
The potential faster execution when re-running a script that has an
up-to-date .pyc file is negligible.
cherry-picked from: cc66247

Original commit message:

ICU-20334 Add python3 support to icu4c scripts

Test: Execute every python script with python 2 and 3
cherry-picked from: 335abbe

Original commit message:

ICU-20334 Additional python3 compatibility changes to depstest.

Also adds python3 depstest call to .travis.yml.
cherry-picked from: f89a1d9

Original commit message:

ICU-20066 add a copyright scan stage (unicode-org#26)

- name the travis build steps
- copy cpyskip.txt to /.cpyskip.txt
- add one named "lint" which runs cpyscan.pl
- remove network access from Cpy.pm (requires installation)
@jira-pull-request-webhook
Copy link

Hooray! The files in the branch are the same across the force-push. 😃

~ Your Friendly Jira-GitHub PR Checker Bot

@jefgen
Copy link
Member Author

jefgen commented Mar 15, 2019

@yumaoka I've edited the commit messages in this PR so that they now have the backport ticket number in them (ICU-20482).
Let me know if you have any other concerns. Thank you!

Copy link
Member

@yumaoka yumaoka left a comment

Choose a reason for hiding this comment

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

Thanks. I walked through these commits, and all look fine.

@jefgen
Copy link
Member Author

jefgen commented Mar 21, 2019

@yumaoka Thank you very kindly for taking a look at the changes!

@jefgen jefgen merged commit 6d0c1f4 into unicode-org:maint/maint-62 Mar 21, 2019
jefgen added a commit to jefgen/electron that referenced this pull request Mar 22, 2019
This change backports changes from the upstream ICU 62.1 maintenance
branch into the Chromium copy of ICU, in order to enable the
"placeholder era" for the upcoming new Japanese Era.

Upstream change: unicode-org/icu#514
Upstream ticket: https://unicode-org.atlassian.net/browse/ICU-20482

With this change you can set/define an Environment Variable
`ICU_ENABLE_TENTATIVE_ERA` to `true which will enable the placeholder
era name.

Note: This change requires re-generating the checked-in Chromium ICU
data files (icudtl.dat) in order for them to have the updated data
for the placeholder era name.

Also included in this change are some minor changes to the scripts
used by Chromium for building the data files so that they actually
work on Ubuntu.
jkleinsc pushed a commit to electron/electron that referenced this pull request Mar 27, 2019
This change backports changes from the upstream ICU 62.1 maintenance
branch into the Chromium copy of ICU, in order to enable the
"placeholder era" for the upcoming new Japanese Era.

Upstream change: unicode-org/icu#514
Upstream ticket: https://unicode-org.atlassian.net/browse/ICU-20482

With this change you can set/define an Environment Variable
`ICU_ENABLE_TENTATIVE_ERA` to `true which will enable the placeholder
era name.

Note: This change requires re-generating the checked-in Chromium ICU
data files (icudtl.dat) in order for them to have the updated data
for the placeholder era name.

Also included in this change are some minor changes to the scripts
used by Chromium for building the data files so that they actually
work on Ubuntu.
@jefgen jefgen deleted the maint/maint-62-jaera branch April 8, 2019 20:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
6 participants