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

Side by Side Diff: icu.gyp

Issue 18836004: Move ICU headers from public/{common,i18n} to source/{common,i18n} (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu46.git@master
Patch Set: same as ps #3. retry uploading Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | public/common/unicode/brkiter.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'use_system_icu%': 0, 7 'use_system_icu%': 0,
8 'icu_use_data_file_flag%': 0, 8 'icu_use_data_file_flag%': 0,
9 }, 9 },
10 'target_defaults': { 10 'target_defaults': {
(...skipping 11 matching lines...) Expand all
22 'defines': [ 22 'defines': [
23 'U_USING_ICU_NAMESPACE=0', 23 'U_USING_ICU_NAMESPACE=0',
24 ], 24 ],
25 'conditions': [ 25 'conditions': [
26 ['component=="static_library"', { 26 ['component=="static_library"', {
27 'defines': [ 27 'defines': [
28 'U_STATIC_IMPLEMENTATION', 28 'U_STATIC_IMPLEMENTATION',
29 ], 29 ],
30 }], 30 }],
31 ], 31 ],
32 # TODO(mark): Looks like this is causing the "public" include
33 # directories to show up twice in some targets in this file. Fix.
34 'include_dirs': [ 32 'include_dirs': [
35 'public/common',
36 'public/i18n',
37 'source/common', 33 'source/common',
38 'source/i18n', 34 'source/i18n',
39 ], 35 ],
40 'msvs_disabled_warnings': [4005, 4068, 4355, 4996, 4267], 36 'msvs_disabled_warnings': [4005, 4068, 4355, 4996, 4267],
41 }, 37 },
42 'targets': [ 38 'targets': [
43 { 39 {
44 'target_name': 'icudata', 40 'target_name': 'icudata',
45 'type': 'static_library', 41 'type': 'static_library',
46 'defines': [ 42 'defines': [
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 'source/i18n/zstrfmt.cpp', 250 'source/i18n/zstrfmt.cpp',
255 'source/i18n/ztrans.cpp', 251 'source/i18n/ztrans.cpp',
256 ], 252 ],
257 'defines': [ 253 'defines': [
258 'U_I18N_IMPLEMENTATION', 254 'U_I18N_IMPLEMENTATION',
259 ], 255 ],
260 'dependencies': [ 256 'dependencies': [
261 'icuuc', 257 'icuuc',
262 ], 258 ],
263 'direct_dependent_settings': { 259 'direct_dependent_settings': {
264 # Use prepend (+) because the WebKit build needs to pick up these 260 'include_dirs': [
265 # ICU headers instead of the ones in ../WebKit/JavaScriptCore/wtf, 261 'source/i18n',
266 # also in WebKit's include path.
267 # TODO(mark): The triple + is a bug. It should be a double +. It
268 # seems that a + is being chopped off when the "target" section is
269 # merged into "target_defaults".
270 'include_dirs+++': [
271 'public/i18n',
272 ], 262 ],
273 }, 263 },
274 'conditions': [ 264 'conditions': [
275 [ 'os_posix == 1 and OS != "mac" and OS != "ios"', { 265 [ 'os_posix == 1 and OS != "mac" and OS != "ios"', {
276 # Since ICU wants to internally use its own deprecated APIs, don't 266 # Since ICU wants to internally use its own deprecated APIs, don't
277 # complain about it. 267 # complain about it.
278 'cflags': [ 268 'cflags': [
279 '-Wno-deprecated-declarations', 269 '-Wno-deprecated-declarations',
280 ], 270 ],
281 'cflags_cc': [ 271 'cflags_cc': [
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
499 'source/common/uvectr64.cpp', 489 'source/common/uvectr64.cpp',
500 'source/common/wintz.c', 490 'source/common/wintz.c',
501 ], 491 ],
502 'defines': [ 492 'defines': [
503 'U_COMMON_IMPLEMENTATION', 493 'U_COMMON_IMPLEMENTATION',
504 ], 494 ],
505 'dependencies': [ 495 'dependencies': [
506 'icudata', 496 'icudata',
507 ], 497 ],
508 'direct_dependent_settings': { 498 'direct_dependent_settings': {
509 # Use prepend (+) because the WebKit build needs to pick up these 499 'include_dirs': [
510 # ICU headers instead of the ones in ../WebKit/JavaScriptCore/wtf, 500 'source/common',
511 # also in WebKit's include path.
512 # TODO(mark): The triple + is a bug. It should be a double +. It
513 # seems that a + is being chopped off when the "target" section is
514 # merged into "target_defaults".
515 'include_dirs+++': [
516 'public/common',
517 ], 501 ],
518 'conditions': [ 502 'conditions': [
519 [ 'component=="static_library"', { 503 [ 'component=="static_library"', {
520 'defines': [ 504 'defines': [
521 'U_STATIC_IMPLEMENTATION', 505 'U_STATIC_IMPLEMENTATION',
522 ], 506 ],
523 }], 507 }],
524 ], 508 ],
525 }, 509 },
526 'conditions': [ 510 'conditions': [
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
627 'type': 'none', 611 'type': 'none',
628 'dependencies': ['system_icu'], 612 'dependencies': ['system_icu'],
629 'export_dependent_settings': ['system_icu'], 613 'export_dependent_settings': ['system_icu'],
630 }, 614 },
631 { 615 {
632 'target_name': 'icui18n', 616 'target_name': 'icui18n',
633 'type': 'none', 617 'type': 'none',
634 'dependencies': ['system_icu'], 618 'dependencies': ['system_icu'],
635 'export_dependent_settings': ['system_icu'], 619 'export_dependent_settings': ['system_icu'],
636 'variables': { 620 'variables': {
637 'headers_root_path': 'public/i18n', 621 'headers_root_path': 'source/i18n',
638 'header_filenames': [ 622 'header_filenames': [
639 # This list can easily be updated using the command below: 623 # This list can easily be updated using the command below:
640 # find third_party/icu/public/i18n -iname '*.h' \ 624 # find third_party/icu/source/i18n/unicode -iname '*.h' \
641 # -printf "'%p',\n" | \ 625 # -printf "'%p',\n" | \
642 # sed -e 's|third_party/icu/public/i18n/||' | sort -u 626 # sed -e 's|third_party/icu/source/i18n/||' | sort -u
643 'unicode/basictz.h', 627 'unicode/basictz.h',
644 'unicode/bmsearch.h', 628 'unicode/bmsearch.h',
645 'unicode/bms.h', 629 'unicode/bms.h',
646 'unicode/calendar.h', 630 'unicode/calendar.h',
647 'unicode/choicfmt.h', 631 'unicode/choicfmt.h',
648 'unicode/coleitr.h', 632 'unicode/coleitr.h',
649 'unicode/colldata.h', 633 'unicode/colldata.h',
650 'unicode/coll.h', 634 'unicode/coll.h',
651 'unicode/curramt.h', 635 'unicode/curramt.h',
652 'unicode/currpinf.h', 636 'unicode/currpinf.h',
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
713 'includes': [ 697 'includes': [
714 '../../build/shim_headers.gypi', 698 '../../build/shim_headers.gypi',
715 ], 699 ],
716 }, 700 },
717 { 701 {
718 'target_name': 'icuuc', 702 'target_name': 'icuuc',
719 'type': 'none', 703 'type': 'none',
720 'dependencies': ['system_icu'], 704 'dependencies': ['system_icu'],
721 'export_dependent_settings': ['system_icu'], 705 'export_dependent_settings': ['system_icu'],
722 'variables': { 706 'variables': {
723 'headers_root_path': 'public/common', 707 'headers_root_path': 'source/common',
724 'header_filenames': [ 708 'header_filenames': [
725 # This list can easily be updated using the command below: 709 # This list can easily be updated using the command below:
726 # find third_party/icu/public/common -iname '*.h' \ 710 # find third_party/icu/source/common/unicode -iname '*.h' \
727 # -printf "'%p',\n" | \ 711 # -printf "'%p',\n" | \
728 # sed -e 's|third_party/icu/public/common/||' | sort -u 712 # sed -e 's|third_party/icu/source/common/||' | sort -u
729 'unicode/brkiter.h', 713 'unicode/brkiter.h',
730 'unicode/bytestream.h', 714 'unicode/bytestream.h',
731 'unicode/caniter.h', 715 'unicode/caniter.h',
732 'unicode/chariter.h', 716 'unicode/chariter.h',
733 'unicode/dbbi.h', 717 'unicode/dbbi.h',
734 'unicode/docmain.h', 718 'unicode/docmain.h',
735 'unicode/dtintrv.h', 719 'unicode/dtintrv.h',
736 'unicode/errorcode.h', 720 'unicode/errorcode.h',
737 'unicode/icudataver.h', 721 'unicode/icudataver.h',
738 'unicode/icuplug.h', 722 'unicode/icuplug.h',
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
815 ], 799 ],
816 }, 800 },
817 'includes': [ 801 'includes': [
818 '../../build/shim_headers.gypi', 802 '../../build/shim_headers.gypi',
819 ], 803 ],
820 }, 804 },
821 ], 805 ],
822 }], 806 }],
823 ], 807 ],
824 } 808 }
OLDNEW
« no previous file with comments | « no previous file | public/common/unicode/brkiter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698