Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Issue 111723007: Add support for icu_use_data_file=1 to icu.gyp on Windows (Closed)

Created:
7 years ago by jungshik at Google
Modified:
7 years ago
CC:
chromium-reviews
Visibility:
Public.

Description

Add support for icu_use_data_file=1 to icu.gyp on Windows/Linux 1. When icu_use_data_file_flag is set to 1 on Windows, we don't need to copy icudt.dll. Instead, we have to copy icudt*.dat. 2. Put copies statement for icudt*.dat outside link_settings on all platforms. For static builds on Linux, Windows and Mac, 'copies' should be pulled out of 'link_settings'. Putting it outside 'link_settings' does not hurt shared builds, either. iOS is the only platform with icu_use_data_file=1 at the moment and is affected directly by this CL (dropping link_settings). 3. Simplify the condition for mac_bundle_resource by dropping 'OS=="mac" and _mac_bundle' because it's never satisfied here. 4. Rename icudt46l.dat in source/data/in and android to icudtl.dat. This is to simplify the ICU upgrade process down the road. With the version number removed, there's no need to change the data filename in multiple gyp files and windows package configuration files when upgrading ICU. (the same was done for icudt.dll on Windows a few years ago.) This CL has to go first before we land the chromium-side changes to set icu_use_data_file to 1 on Windows (https://codereview.chromium.org/99473012 ), Linux ( https://codereview.chromium.org/102413007 ), and Mac ( https://codereview.chromium.org/109013004 ) The chromium-side change for Mac will follow this, too. BUG=72633 TEST=None (until this is rolled). R=mark@chromium.org, scottmg@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=241597

Patch Set 1 #

Total comments: 1

Patch Set 2 : #

Patch Set 3 : #

Patch Set 4 : drop link_settings on all platforms #

Total comments: 3

Patch Set 5 : #

Patch Set 6 : add mac cl to the description #

Total comments: 1

Patch Set 7 : #

Total comments: 3
Unified diffs Side-by-side diffs Delta from patch set Stats (+25 lines, -21 lines) Patch
M README.chromium View 1 2 3 4 3 chunks +12 lines, -7 lines 0 comments Download
D android/icudt46l.dat View Binary file 0 comments Download
A + android/icudtl.dat View 0 chunks +-1 lines, --1 lines 0 comments Download
M icu.gyp View 1 2 3 4 5 6 2 chunks +15 lines, -16 lines 3 comments Download
D source/data/in/icudt46l.dat View Binary file 0 comments Download
A + source/data/in/icudtl.dat View 0 chunks +-1 lines, --1 lines 0 comments Download

Messages

Total messages: 27 (0 generated)
jungshik at Google
7 years ago (2013-12-16 18:55:57 UTC) #1
jungshik at Google
7 years ago (2013-12-16 18:57:16 UTC) #2
scottmg
lgtm (as the question below is not specific to the Windows changes here). https://codereview.chromium.org/111723007/diff/1/icu.gyp File ...
7 years ago (2013-12-16 19:23:31 UTC) #3
jungshik at Google
On 2013/12/16 19:23:31, scottmg wrote: > lgtm (as the question below is not specific to ...
7 years ago (2013-12-16 21:08:02 UTC) #4
jungshik at Google
On 2013/12/16 21:08:02, Jungshik Shin wrote: > On 2013/12/16 19:23:31, scottmg wrote: > > lgtm ...
7 years ago (2013-12-17 01:24:31 UTC) #5
jungshik at Google
Mark and Scott, Can you take another look? Mac OS static build (component=static_library) also needs ...
7 years ago (2013-12-17 19:47:57 UTC) #6
scottmg
lgtm https://codereview.chromium.org/111723007/diff/60001/icu.gyp File icu.gyp (right): https://codereview.chromium.org/111723007/diff/60001/icu.gyp#newcode92 icu.gyp:92: 'target_conditions': [ I don't think this target_conditions block ...
7 years ago (2013-12-17 19:59:57 UTC) #7
Mark Mentovai
https://codereview.chromium.org/111723007/diff/60001/icu.gyp File icu.gyp (right): https://codereview.chromium.org/111723007/diff/60001/icu.gyp#newcode94 icu.gyp:94: 'mac_bundle_resources': [ This isn’t doing anything because it’s not ...
7 years ago (2013-12-17 20:15:19 UTC) #8
jungshik at Google
On 2013/12/17 20:15:19, Mark Mentovai wrote: > https://codereview.chromium.org/111723007/diff/60001/icu.gyp > File icu.gyp (right): > > https://codereview.chromium.org/111723007/diff/60001/icu.gyp#newcode94 ...
7 years ago (2013-12-17 21:18:16 UTC) #9
jungshik at Google
https://codereview.chromium.org/111723007/diff/60001/icu.gyp File icu.gyp (right): https://codereview.chromium.org/111723007/diff/60001/icu.gyp#newcode94 icu.gyp:94: 'mac_bundle_resources': [ On 2013/12/17 20:15:19, Mark Mentovai wrote: > ...
7 years ago (2013-12-17 22:40:10 UTC) #10
jungshik at Google
On 2013/12/17 19:59:57, scottmg wrote: > lgtm > > https://codereview.chromium.org/111723007/diff/60001/icu.gyp > File icu.gyp (right): > ...
7 years ago (2013-12-17 22:42:27 UTC) #11
scottmg
On 2013/12/17 22:42:27, Jungshik Shin wrote: > On 2013/12/17 19:59:57, scottmg wrote: > > lgtm ...
7 years ago (2013-12-17 23:03:48 UTC) #12
jungshik at Google
On 2013/12/17 23:03:48, scottmg wrote: > On 2013/12/17 22:42:27, Jungshik Shin wrote: > > On ...
7 years ago (2013-12-17 23:28:17 UTC) #13
scottmg
On 2013/12/17 23:28:17, Jungshik Shin wrote: > On 2013/12/17 23:03:48, scottmg wrote: > > On ...
7 years ago (2013-12-17 23:49:27 UTC) #14
jungshik at Google
On 2013/12/17 23:49:27, scottmg wrote: > On 2013/12/17 23:28:17, Jungshik Shin wrote: > > On ...
7 years ago (2013-12-18 00:42:09 UTC) #15
jungshik at Google
On 2013/12/17 23:49:27, scottmg wrote: > On 2013/12/17 23:28:17, Jungshik Shin wrote: > > On ...
7 years ago (2013-12-18 00:47:36 UTC) #16
scottmg
On 2013/12/18 00:47:36, Jungshik Shin wrote: > On 2013/12/17 23:49:27, scottmg wrote: > > On ...
7 years ago (2013-12-18 00:49:57 UTC) #17
Mark Mentovai
LGTM with this one change. I haven’t looked at your Chrome-side Mac CL yet. I ...
7 years ago (2013-12-18 17:03:03 UTC) #18
jungshik at Google
On 2013/12/18 17:03:03, Mark Mentovai wrote: > LGTM with this one change. > > I ...
7 years ago (2013-12-18 18:03:02 UTC) #19
jungshik at Google
Committed patchset #7 manually as r241597 (presubmit successful).
7 years ago (2013-12-18 18:03:36 UTC) #20
jungshik at Google
Mark and Pinkerton, do you have a idea as to ios_debug_simulator failure mentioned below? I'm ...
7 years ago (2013-12-18 21:33:36 UTC) #21
Mark Mentovai
https://codereview.chromium.org/111723007/diff/120001/icu.gyp File icu.gyp (right): https://codereview.chromium.org/111723007/diff/120001/icu.gyp#newcode94 icu.gyp:94: 'mac_bundle_resources': [ This is a static_library, but a static_library ...
7 years ago (2013-12-18 21:58:27 UTC) #22
jungshik at Google
https://codereview.chromium.org/111723007/diff/120001/icu.gyp File icu.gyp (right): https://codereview.chromium.org/111723007/diff/120001/icu.gyp#newcode94 icu.gyp:94: 'mac_bundle_resources': [ On 2013/12/18 21:58:28, Mark Mentovai wrote: > ...
7 years ago (2013-12-18 22:06:13 UTC) #23
Mark Mentovai
The link_settings is what made it work. That would push the mac_bundle_settings down to the ...
7 years ago (2013-12-18 22:07:40 UTC) #24
jungshik at Google
On 2013/12/18 22:07:40, Mark Mentovai wrote: > The link_settings is what made it work. That ...
7 years ago (2013-12-18 22:10:27 UTC) #25
Mark Mentovai
My advice: Keep link_settings for iOS where it’s needed to make mac_bundle_resources work. Leave the ...
7 years ago (2013-12-18 22:10:36 UTC) #26
jungshik at Google
7 years ago (2013-12-18 23:09:04 UTC) #27
Message was sent while issue was closed.
On 2013/12/18 22:10:36, Mark Mentovai wrote:
> My advice:
> 
> Keep link_settings for iOS where it’s needed to make mac_bundle_resources
work.
> Leave the copies section outside of link_settings for other platforms, because
> you only need to get the copy to happen once in this target, not once in each
> linkable dependent (shared_library or executable), when you’re just copying to
> <(PRODUCT_DIR). You don’t need link_settings there because <(PRODUCT_DIR) is
the
> same for all targets including this one.
> 
> Sorry I didn’t catch this during review.

Don't worry. Thanks a lot for the help. A new CL to take care of iOS is up at
https://codereview.chromium.org/118373006/

Powered by Google App Engine
This is Rietveld 408576698