fix mozc build (#5)

eagleoflqj · web-flow · commit df647c766b60 · 2025-03-03T20:08:54.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -37,7 +37,6 @@ if (NOT DEFINED MOZC_TARGET)
     include(cmake/session.cmake)
     include(cmake/storage.cmake)
     include(cmake/transliteration.cmake)
-    include(cmake/usage_stats.cmake)
 
     include(cmake/mozc-static.cmake)
     set(MOZC_TARGET
@@ -53,7 +52,6 @@ if (NOT DEFINED MOZC_TARGET)
         gen_config_file_stream_data
         gen_pos_matcher_code
         gen_pos_matcher_impl_inc
-        gen_stats_list
         gen_version_def
     )
 endif()
diff --git a/cmake/converter.cmake b/cmake/converter.cmake
@@ -1,4 +1,5 @@
 set(MOZC_CONVERTER_SRCS
+    candidate.cc    
     candidate_filter.cc
     connector.cc
     converter.cc
@@ -7,7 +8,6 @@ set(MOZC_CONVERTER_SRCS
     key_corrector.cc
     lattice.cc
     nbest_generator.cc
-    node_list_builder.cc
     reverse_converter.cc
     segmenter.cc
     segments.cc
diff --git a/cmake/engine.cmake b/cmake/engine.cmake
@@ -1,6 +1,9 @@
 set(MOZC_ENGINE_SRCS
+    candidate_list.cc
     data_loader.cc
     engine.cc
+    engine_converter.cc
+    engine_output.cc
     minimal_converter.cc
     modules.cc
 )
diff --git a/cmake/mozc-static.cmake b/cmake/mozc-static.cmake
@@ -27,6 +27,10 @@ target_compile_options(mozc-static PRIVATE -funsigned-char)
 
 target_compile_definitions(mozc-static PRIVATE
     -DMOZC_DATASET_MAGIC_NUMBER_LENGTH=7
+)
+
+# fcitx5-mozc references session_handler.h.
+target_compile_definitions(mozc-static PUBLIC
     -DMOZC_DISABLE_SESSION_WATCHDOG
 )
 
diff --git a/cmake/protobuf.cmake b/cmake/protobuf.cmake
@@ -20,7 +20,6 @@ set(PROTO_SRCS
     protocol/segmenter_data
     protocol/state
     protocol/user_dictionary_storage
-    usage_stats/usage_stats
 )
 list(TRANSFORM PROTO_SRCS APPEND ".pb.cc" OUTPUT_VARIABLE GENERATED_PROTO_SRCS)
 list(TRANSFORM GENERATED_PROTO_SRCS PREPEND "${PROJECT_BINARY_DIR}/")
diff --git a/cmake/session.cmake b/cmake/session.cmake
@@ -1,15 +1,9 @@
 set(MOZC_SESSION_SRCS
-    internal/candidate_list.cc
-    internal/ime_context.cc
-    internal/key_event_transformer.cc
-    internal/keymap.cc
-    internal/session_output.cc
+    ime_context.cc
+    key_event_transformer.cc
+    keymap.cc
     key_info_util.cc
     session.cc
-    session_converter.cc
     session_handler.cc
-    session_observer_handler.cc
-    session_usage_observer.cc
-    session_usage_stats_util.cc
 )
 list(TRANSFORM MOZC_SESSION_SRCS PREPEND "${MOZC_SRC_DIR}/session/")
diff --git a/cmake/storage.cmake b/cmake/storage.cmake
@@ -6,7 +6,5 @@ set(MOZC_STORAGE_SRCS
     louds/louds_trie.cc
     louds/simple_succinct_bit_vector_index.cc
     lru_storage.cc
-    registry.cc
-    tiny_storage.cc
 )
 list(TRANSFORM MOZC_STORAGE_SRCS PREPEND "${MOZC_SRC_DIR}/storage/")
diff --git a/cmake/usage_stats.cmake b/cmake/usage_stats.cmake

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,10 @@ target_compile_options(mozc-static PRIVATE -funsigned-char)`
`27`	`27`
`28`	`28`	`target_compile_definitions(mozc-static PRIVATE`
`29`	`29`	`-DMOZC_DATASET_MAGIC_NUMBER_LENGTH=7`
	`30`	`+)`
	`31`	`+`
	`32`	`+# fcitx5-mozc references session_handler.h.`
	`33`	`+target_compile_definitions(mozc-static PUBLIC`
`30`	`34`	`-DMOZC_DISABLE_SESSION_WATCHDOG`
`31`	`35`	`)`
`32`	`36`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@ set(PROTO_SRCS`
`20`	`20`	`protocol/segmenter_data`
`21`	`21`	`protocol/state`
`22`	`22`	`protocol/user_dictionary_storage`
`23`		`- usage_stats/usage_stats`
`24`	`23`	`)`
`25`	`24`	`list(TRANSFORM PROTO_SRCS APPEND ".pb.cc" OUTPUT_VARIABLE GENERATED_PROTO_SRCS)`
`26`	`25`	`list(TRANSFORM GENERATED_PROTO_SRCS PREPEND "${PROJECT_BINARY_DIR}/")`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,5 @@ set(MOZC_STORAGE_SRCS`
`6`	`6`	`louds/louds_trie.cc`
`7`	`7`	`louds/simple_succinct_bit_vector_index.cc`
`8`	`8`	`lru_storage.cc`
`9`		`- registry.cc`
`10`		`- tiny_storage.cc`
`11`	`9`	`)`
`12`	`10`	`list(TRANSFORM MOZC_STORAGE_SRCS PREPEND "${MOZC_SRC_DIR}/storage/")`