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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/cld_2/cld_2.gyp

Issue 416863002: Make it possible to generate static and dynamic CLD2 libraries in one build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add all_dependent_settings for CLD2_DYNAMIC_MODE Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/cld_2/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/cld_2/cld_2.gyp
diff --git a/third_party/cld_2/cld_2.gyp b/third_party/cld_2/cld_2.gyp
index 267531fccee9a21a7140908b22235d256c286c45..cde2bd3ac43a244d4cb734d71298c87a72874c3b 100644
--- a/third_party/cld_2/cld_2.gyp
+++ b/third_party/cld_2/cld_2.gyp
@@ -15,9 +15,90 @@
# 175-language version of CLD2.
{
+ 'target_defaults': {
+ 'conditions': [
+ ['OS=="win"', {
+ 'msvs_disabled_warnings': [4267],
+ }],
+ ],
+ },
+ 'variables': {
+ # These sources need to be included in both static and dynamic builds as
+ # well as the dynamic data tool.
+ 'cld2_core_sources': [
+ 'src/internal/cld2tablesummary.h',
+ 'src/internal/cldutil.cc',
+ 'src/internal/cldutil.h',
+ 'src/internal/cldutil_shared.cc',
+ 'src/internal/cldutil_shared.h',
+ 'src/internal/compact_lang_det.cc',
+ 'src/internal/compact_lang_det_hint_code.cc',
+ 'src/internal/compact_lang_det_hint_code.h',
+ 'src/internal/compact_lang_det_impl.cc',
+ 'src/internal/compact_lang_det_impl.h',
+ 'src/internal/debug.h',
+ 'src/internal/debug_empty.cc',
+ 'src/internal/fixunicodevalue.cc',
+ 'src/internal/fixunicodevalue.h',
+ 'src/internal/generated_distinct_bi_0.cc',
+ 'src/internal/generated_entities.cc',
+ 'src/internal/generated_language.cc',
+ 'src/internal/generated_language.h',
+ 'src/internal/generated_ulscript.cc',
+ 'src/internal/generated_ulscript.h',
+ 'src/internal/getonescriptspan.cc',
+ 'src/internal/getonescriptspan.h',
+ 'src/internal/integral_types.h',
+ 'src/internal/lang_script.cc',
+ 'src/internal/lang_script.h',
+ 'src/internal/langspan.h',
+ 'src/internal/offsetmap.cc',
+ 'src/internal/offsetmap.h',
+ 'src/internal/port.h',
+ 'src/internal/scoreonescriptspan.cc',
+ 'src/internal/scoreonescriptspan.h',
+ 'src/internal/stringpiece.h',
+ 'src/internal/tote.cc',
+ 'src/internal/tote.h',
+ 'src/internal/utf8prop_lettermarkscriptnum.h',
+ 'src/internal/utf8repl_lettermarklower.h',
+ 'src/internal/utf8scannot_lettermarkspecial.h',
+ 'src/internal/utf8statetable.cc',
+ 'src/internal/utf8statetable.h',
+ 'src/public/compact_lang_det.h',
+ 'src/public/encodings.h',
+ ],
+ 'cld2_dynamic_data_loader_sources': [
+ 'src/internal/cld2_dynamic_data.h',
+ 'src/internal/cld2_dynamic_data.cc',
+ 'src/internal/cld2_dynamic_data_loader.h',
+ 'src/internal/cld2_dynamic_data_loader.cc',
+ ],
+ 'cld2_data_sources': [
+ 'src/internal/cld2_generated_cjk_compatible.cc',
+ 'src/internal/cld2_generated_deltaoctachrome0122.cc',
+ 'src/internal/cld2_generated_distinctoctachrome0122.cc',
+ 'src/internal/cld_generated_cjk_delta_bi_4.cc',
+ 'src/internal/cld_generated_cjk_uni_prop_80.cc',
+ 'src/internal/cld_generated_score_quad_octa_0122_2.cc',
+ 'src/internal/generated_distinct_bi_0.cc',
+ ],
+ 'conditions': [
+ ['cld2_table_size==0', {
+ 'cld2_data_sources+': ['src/internal/cld2_generated_quadchrome0122_16.cc']
+ }],
+ ['cld2_table_size==1', {
+ 'cld2_data_sources+': ['src/internal/cld2_generated_quadchrome0122_19.cc']
+ }],
+ ['cld2_table_size==2', {
+ 'cld2_data_sources+': ['src/internal/cld2_generated_quadchrome0122_2.cc']
+ }],
+ ],
+ },
+
'targets': [
{
- # GN version: //third_party/cld_2:cld_2_dynamic_data_tool
+ # GN version: //third_party/cld_2
'target_name': 'cld_2_dynamic_data_tool',
'type': 'executable',
'include_dirs': [
@@ -26,190 +107,59 @@
],
'sources': [
# Note: sources list duplicated in GN build.
- 'src/internal/cld2_dynamic_data.h',
- 'src/internal/cld2_dynamic_data.cc',
+ '<@(cld2_core_sources)',
+ '<@(cld2_data_sources)',
+ '<@(cld2_dynamic_data_loader_sources)',
'src/internal/cld2_dynamic_data_extractor.h',
'src/internal/cld2_dynamic_data_extractor.cc',
- 'src/internal/cld2_dynamic_data_loader.h',
- 'src/internal/cld2_dynamic_data_loader.cc',
'src/internal/cld2_dynamic_data_tool.cc',
- 'src/internal/cld2_generated_cjk_compatible.cc',
- 'src/internal/cld2_generated_deltaoctachrome0122.cc',
- 'src/internal/cld2_generated_distinctoctachrome0122.cc',
- 'src/internal/cld2tablesummary.h',
- 'src/internal/cld_generated_cjk_delta_bi_4.cc',
- 'src/internal/cld_generated_cjk_uni_prop_80.cc',
- 'src/internal/cld_generated_score_quad_octa_0122_2.cc',
- 'src/internal/cldutil.cc',
- 'src/internal/cldutil.h',
- 'src/internal/cldutil_shared.cc',
- 'src/internal/cldutil_shared.h',
- 'src/internal/compact_lang_det.cc',
- 'src/internal/compact_lang_det_hint_code.cc',
- 'src/internal/compact_lang_det_hint_code.h',
- 'src/internal/compact_lang_det_impl.cc',
- 'src/internal/compact_lang_det_impl.h',
- 'src/internal/debug.h',
- 'src/internal/debug_empty.cc',
- 'src/internal/fixunicodevalue.cc',
- 'src/internal/fixunicodevalue.h',
- 'src/internal/generated_distinct_bi_0.cc',
- 'src/internal/generated_entities.cc',
- 'src/internal/generated_language.cc',
- 'src/internal/generated_language.h',
- 'src/internal/generated_ulscript.cc',
- 'src/internal/generated_ulscript.h',
- 'src/internal/getonescriptspan.cc',
- 'src/internal/getonescriptspan.h',
- 'src/internal/integral_types.h',
- 'src/internal/lang_script.cc',
- 'src/internal/lang_script.h',
- 'src/internal/langspan.h',
- 'src/internal/offsetmap.cc',
- 'src/internal/offsetmap.h',
- 'src/internal/port.h',
- 'src/internal/scoreonescriptspan.cc',
- 'src/internal/scoreonescriptspan.h',
- 'src/internal/stringpiece.h',
- 'src/internal/tote.cc',
- 'src/internal/tote.h',
- 'src/internal/utf8prop_lettermarkscriptnum.h',
- 'src/internal/utf8repl_lettermarklower.h',
- 'src/internal/utf8scannot_lettermarkspecial.h',
- 'src/internal/utf8statetable.cc',
- 'src/internal/utf8statetable.h',
- 'src/public/compact_lang_det.h',
- 'src/public/encodings.h',
],
+ },
+
+ {
+ # GN version: //third_party/cld_2
+ 'target_name': 'cld_2',
+ 'type': 'static_library',
+ 'sources': [],
+ 'dependencies': [],
'conditions': [
- ['OS=="win"', {
- 'msvs_disabled_warnings': [4267],
- }],
- ['cld2_table_size==0', {
- # Small table sizes
- 'sources+': [
- 'src/internal/cld2_generated_quadchrome0122_16.cc',
- ],
- }],
- ['cld2_table_size==1', {
- # Medium table sizes
- 'sources+': [
- 'src/internal/cld2_generated_quadchrome0122_19.cc',
- ],
- }],
- ['cld2_table_size==2', {
- # Large table sizes
- 'sources+': [
- 'src/internal/cld2_generated_quadchrome0122_2.cc',
- ],
- }],
+ ['cld2_data_source=="static"',
+ {'dependencies': ['cld2_static']},
+ {'dependencies': ['cld2_dynamic']}
+ ],
],
},
+
{
# GN version: //third_party/cld_2
- 'target_name': 'cld_2',
+ 'target_name': 'cld2_static',
'type': 'static_library',
'include_dirs': [
'src/internal',
'src/public',
],
'sources': [
- # Note: sources list duplicated in GN build.
- 'src/internal/cld2tablesummary.h',
- 'src/internal/cldutil.cc',
- 'src/internal/cldutil.h',
- 'src/internal/cldutil_shared.cc',
- 'src/internal/cldutil_shared.h',
- 'src/internal/compact_lang_det.cc',
- 'src/internal/compact_lang_det_hint_code.cc',
- 'src/internal/compact_lang_det_hint_code.h',
- 'src/internal/compact_lang_det_impl.cc',
- 'src/internal/compact_lang_det_impl.h',
- 'src/internal/debug.h',
- 'src/internal/debug_empty.cc',
- 'src/internal/fixunicodevalue.cc',
- 'src/internal/fixunicodevalue.h',
- 'src/internal/generated_distinct_bi_0.cc',
- 'src/internal/generated_entities.cc',
- 'src/internal/generated_language.cc',
- 'src/internal/generated_language.h',
- 'src/internal/generated_ulscript.cc',
- 'src/internal/generated_ulscript.h',
- 'src/internal/getonescriptspan.cc',
- 'src/internal/getonescriptspan.h',
- 'src/internal/integral_types.h',
- 'src/internal/lang_script.cc',
- 'src/internal/lang_script.h',
- 'src/internal/langspan.h',
- 'src/internal/offsetmap.cc',
- 'src/internal/offsetmap.h',
- 'src/internal/port.h',
- 'src/internal/scoreonescriptspan.cc',
- 'src/internal/scoreonescriptspan.h',
- 'src/internal/stringpiece.h',
- 'src/internal/tote.cc',
- 'src/internal/tote.h',
- 'src/internal/utf8prop_lettermarkscriptnum.h',
- 'src/internal/utf8repl_lettermarklower.h',
- 'src/internal/utf8scannot_lettermarkspecial.h',
- 'src/internal/utf8statetable.cc',
- 'src/internal/utf8statetable.h',
- 'src/public/compact_lang_det.h',
- 'src/public/encodings.h',
+ '<@(cld2_core_sources)',
+ '<@(cld2_data_sources)',
],
- 'conditions': [
- ['OS=="win"', {
- 'msvs_disabled_warnings': [4267],
- }],
- # Dynamic or vanilla mode
- ['cld2_data_source!="static"',
- {
- # Enable dynamic mode, which allows CLD to read its data from a file
- # instead of requiring the data to be linked into the library.
- # You must generate the data file and check it in using the
- # cld2_dynamic_data_tool.
- # build/common.gypi takes care of setting -D CLD2_MODE_DYNAMIC
- 'sources+': [
- 'src/internal/cld2_dynamic_data.h',
- 'src/internal/cld2_dynamic_data.cc',
- 'src/internal/cld2_dynamic_data_loader.h',
- 'src/internal/cld2_dynamic_data_loader.cc',
- ],
- },
- {
- # Else it's regular mode, so link in all the data blobs directly.
- 'sources+': [
- 'src/internal/cld2_generated_cjk_compatible.cc',
- 'src/internal/cld2_generated_deltaoctachrome0122.cc',
- 'src/internal/cld2_generated_distinctoctachrome0122.cc',
- 'src/internal/cld_generated_cjk_delta_bi_4.cc',
- 'src/internal/cld_generated_cjk_uni_prop_80.cc',
- 'src/internal/cld_generated_score_quad_octa_0122_2.cc',
- 'src/internal/generated_distinct_bi_0.cc',
- ],
- 'conditions': [
- ['cld2_table_size==0', {
- # Small table sizes
- 'sources+': [
- 'src/internal/cld2_generated_quadchrome0122_16.cc',
- ],
- }],
- ['cld2_table_size==1', {
- # Medium table sizes
- 'sources+': [
- 'src/internal/cld2_generated_quadchrome0122_19.cc',
- ],
- }],
- ['cld2_table_size==2', {
- # Large table sizes
- 'sources+': [
- 'src/internal/cld2_generated_quadchrome0122_2.cc',
- ],
- }],
- ],
- },
- ],
+ },
+
+ {
+ # GN version: //third_party/cld_2
+ 'target_name': 'cld2_dynamic',
+ 'type': 'static_library',
+ 'include_dirs': [
+ 'src/internal',
+ 'src/public',
+ ],
+ 'sources': [
+ '<@(cld2_core_sources)',
+ '<@(cld2_dynamic_data_loader_sources)',
],
+ 'defines': ['CLD2_DYNAMIC_MODE'],
+ 'all_dependent_settings': {
+ 'defines': ['CLD2_DYNAMIC_MODE'],
+ },
},
],
}
« no previous file with comments | « third_party/cld_2/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698