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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/cld_2/BUILD.gn

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 | « build/common.gypi ('k') | third_party/cld_2/cld_2.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/cld_2/BUILD.gn
diff --git a/third_party/cld_2/BUILD.gn b/third_party/cld_2/BUILD.gn
index 709446655ac027e6138ec560c1ae15ed989a6b04..0b170a366bf7ffbb917beed237257787478efdbd 100644
--- a/third_party/cld_2/BUILD.gn
+++ b/third_party/cld_2/BUILD.gn
@@ -4,126 +4,144 @@
import("//build/config/features.gni")
-# May need to make this a build arg.
+# May need to make this a build arg, keep the name for now to match gyp
cld2_table_size = 2
-static_library("cld_2") {
- 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",
+core_files = [
+ "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",
+]
+
+data_files = [
+ "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",
+]
+
+if (cld2_table_size == 0) {
+ data_files += [ "src/internal/cld2_generated_quadchrome0122_16.cc" ]
+} else if (cld2_table_size == 1) {
+ data_files += [ "src/internal/cld2_generated_quadchrome0122_19.cc" ]
+} else if (cld2_table_size == 2) {
+ data_files += [ "src/internal/cld2_generated_quadchrome0122_2.cc" ]
+}
+
+data_loader_files = [
+ "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",
+]
+
+source_set("cld2_data") {
+ sources = data_files
+ include_dirs = [
+ "src/internal",
+ "src/public",
]
+ configs -= [ "//build/config/compiler:chromium_code" ]
+ configs += [ "//build/config/compiler:no_chromium_code" ]
+
+ if (is_win) {
+ cflags = [ "/wd4267" ] # size_t -> int conversion.
+ }
+}
+
+static_library("cld2_static") {
+ sources = core_files
include_dirs = [
"src/internal",
"src/public",
]
+ deps = [ ":cld2_data" ]
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
if (is_win) {
cflags = [ "/wd4267" ] # size_t -> int conversion.
}
- if (cld2_data_source != "static") {
- assert(false, "Non-static mode isn't implemented, implement me")
+}
+
+# Meta-target for convenience; dependents don't need to know if this if CLD2
+# is in dynamic or static configuration.
+group("cld_2") {
+ if (cld2_data_source == "static") {
+ deps = [ ":cld2_static" ]
+ } else {
+ deps = [ ":cld2_dynamic" ]
+ }
+}
+
+config("cld2_dynamic_mode_config") {
+ defines = [ "CLD2_DYNAMIC_MODE" ]
+}
+
+static_library("cld2_dynamic") {
+ sources = core_files + data_loader_files
+ all_dependent_configs = [ ":cld2_dynamic_mode_config" ]
+ include_dirs = [
+ "src/internal",
+ "src/public",
+ ]
+
+ configs -= [ "//build/config/compiler:chromium_code" ]
+ configs += [ "//build/config/compiler:no_chromium_code" ]
+
+ if (is_win) {
+ cflags = [ "/wd4267" ] # size_t -> int conversion.
}
}
executable("cld_2_dynamic_data_tool") {
sources = [
- "src/internal/cld2_dynamic_data.h",
- "src/internal/cld2_dynamic_data.cc",
"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",
]
include_dirs = [
@@ -131,17 +149,12 @@ executable("cld_2_dynamic_data_tool") {
"src/public",
]
+ deps = [ ":cld2_data", ":cld2_dynamic" ]
+
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
if (is_win) {
cflags = [ "/wd4267" ] # size_t -> int conversion.
}
- if (cld2_table_size == 0) {
- sources += [ "src/internal/cld2_generated_quadchrome0122_16.cc" ]
- } else if (cld2_table_size == 1) {
- sources += [ "src/internal/cld2_generated_quadchrome0122_19.cc" ]
- } else if (cld2_table_size == 2) {
- sources += [ "src/internal/cld2_generated_quadchrome0122_2.cc" ]
- }
}
« no previous file with comments | « build/common.gypi ('k') | third_party/cld_2/cld_2.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698