Update librime and glog; add librime-predict (#24)

Co-authored-by: Rocka <i@rocka.me>

.gitmodules

@@ -57,3 +57,6 @@
 [submodule "libime-jyutping"]
 	path = libime-jyutping
 	url = https://github.com/fcitx/libime-jyutping
+[submodule "librime-predict"]
+	path = librime-predict
+	url = https://github.com/rime/librime-predict

patches/glog.patch

@@ -0,0 +1,36 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b787631..1fc8cf4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -402,6 +402,7 @@ add_custom_command (
+   COMMAND ${CMAKE_COMMAND} -E touch ${_glog_EMPTY_SOURCE}
+ )
+
++target_compile_options(glog_internal PRIVATE "-ffile-prefix-map=${CMAKE_SOURCE_DIR}=.")
+ add_library (glog
+   $<TARGET_OBJECTS:glog_internal>
+   ${_glog_EMPTY_SOURCE}
+diff --git a/src/glog/platform.h b/src/glog/platform.h
+index 4aaf5b0..f118ca8 100644
+--- a/src/glog/platform.h
++++ b/src/glog/platform.h
+@@ -42,6 +42,9 @@
+ #  ifndef GLOG_OS_LINUX
+ #    define GLOG_OS_LINUX
+ #  endif
++#  if defined(__ANDROID__)
++#    define GLOG_OS_ANDROID
++#  endif
+ #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
+ #  define GLOG_OS_MACOSX
+ #elif defined(__FreeBSD__)
+@@ -52,9 +55,6 @@
+ #  define GLOG_OS_OPENBSD
+ #elif defined(__EMSCRIPTEN__)
+ #  define GLOG_OS_EMSCRIPTEN
+-#elif defined(__ANDROID__)
+-#  define GLOG_OS_ANDROID
+-#else
+ // TODO(hamaji): Add other platforms.
+ #error Platform not supported by glog. Please consider to contribute platform information by submitting a pull request on Github.
+ #endif

patches/librime-predict.patch

@@ -0,0 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 07703bf..5ab6d3b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -4,6 +4,7 @@ cmake_minimum_required(VERSION 3.10)
+ aux_source_directory(src predict_src)
+
+ add_library(rime-predict-objs OBJECT ${predict_src})
++target_compile_options(rime-predict-objs PRIVATE "-ffile-prefix-map=${CMAKE_SOURCE_DIR}=.")
+ if(BUILD_SHARED_LIBS)
+   set_target_properties(rime-predict-objs
+     PROPERTIES
+@@ -15,4 +16,4 @@ set(plugin_objs $<TARGET_OBJECTS:rime-predict-objs> PARENT_SCOPE)
+ set(plugin_deps ${rime_library} PARENT_SCOPE)
+ set(plugin_modules "predict" PARENT_SCOPE)
+
+-add_subdirectory(tools)
++# add_subdirectory(tools)

patches/librime.patch

@@ -11,15 +11,15 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
 index 6364e1c8..347107f0 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -143,6 +143,8 @@ if(BUILD_SHARED_LIBS)
+@@ -162,6 +162,8 @@ if(BUILD_SHARED_LIBS)
  else()
    add_library(rime-static STATIC ${rime_src})
    target_link_libraries(rime-static ${rime_deps})
 +  target_compile_options(rime-static PRIVATE "-ffile-prefix-map=${CMAKE_SOURCE_DIR}=.")
 +  target_compile_definitions(rime-static PRIVATE BOOST_DISABLE_CURRENT_LOCATION)
-   set_target_properties(rime-static PROPERTIES OUTPUT_NAME "rime" PREFIX "lib")
-   install(TARGETS rime-static DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
- endif()
+   set_target_properties(rime-static PROPERTIES
+     OUTPUT_NAME "rime" PREFIX "lib"
+     ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
 -- 
 2.43.0
 
@@ -40,11 +40,11 @@ diff --git a/src/rime/engine.cc b/src/rime/engine.cc
 index 64c0fb68..549a8112 100644
 --- a/src/rime/engine.cc
 +++ b/src/rime/engine.cc
-@@ -54,7 +54,6 @@ class ConcreteEngine : public Engine {
+@@ -52,7 +52,6 @@ class ConcreteEngine : public Engine {
+   vector<of<Filter>> filters_;
+   vector<of<Formatter>> formatters_;
    vector<of<Processor>> post_processors_;
-   // To make sure dumping user.yaml when processors_.clear(),
-   // switcher is owned by processors_[0]
--  weak<Switcher> switcher_;
+-  an<Switcher> switcher_;
  };
 
  // implementations
@@ -64,7 +64,7 @@ index 2e1c8b81..47c39544 100644
    void set_active_engine(Engine* engine = nullptr) { active_engine_ = engine; }
 
    RIME_API static Engine* Create();
-+  weak<Switcher> switcher_;
++  an<Switcher> switcher_;
 
   protected:
    Engine();
@@ -106,7 +106,7 @@ index 678169c0..1085fe5c 100644
      return;
    ctx->set_option(option, !!value);
 +  auto engine = session->engine_.get();
-+  auto switcher = engine->switcher_.lock();
++  auto switcher = engine->switcher_;
 +  if (switcher->IsAutoSave(option)) {
 +    if (Config* user_config = switcher->user_config()) {
 +      user_config->SetBool("var/option/" + std::string(option), value);

src/Rules/GLog.hs

@@ -20,7 +20,9 @@ glogRule = do
     useCMake $
       (cmakeBuilder "glog")
         { cmakeFlags = const ["-DBUILD_SHARED_LIBS=OFF", "-DWITH_GFLAGS=OFF", "-DWITH_UNWIND=OFF", "-DBUILD_TESTING=OFF"],
-          -- remove absolute path by __FILE__ macro
-          preBuild = BuildAction $ \_ src -> cmd_ (Cwd src) Shell "sed -i '618s|\\(^add_library (glog.*\\)|target_compile_options\\(glogbase PRIVATE \"-ffile-prefix-map=${CMAKE_CURRENT_SOURCE_DIR}=.\"\\)\\n\\1|' CMakeLists.txt"
+          -- disable logging to cwd; remove absolute path by __FILE__ macro
+          preBuild = BuildAction $ \_ src -> do
+            cmd_ (Cwd src) "git checkout ."
+            cmd_ (Cwd src) "git apply ../patches/glog.patch"
         }
   "glog" ~> buildWithAndroidEnv buildGlog GLog

src/Rules/LibRime.hs

@@ -25,24 +25,31 @@ librimeRule = do
             -- canocialize for symlink
             librimeLuaSrc <- liftIO $ canonicalizePath "librime-lua"
             librimeOctagramSrc <- liftIO $ canonicalizePath "librime-octagram"
+            librimePredictSrc <- liftIO $ canonicalizePath "librime-predict"
             liftIO $ do
               removePathForcibly (src </> "plugins" </> "lua")
               createDirectoryLink librimeLuaSrc (src </> "plugins" </> "lua")
               removePathForcibly (src </> "plugins" </> "octagram")
               createDirectoryLink librimeOctagramSrc (src </> "plugins" </> "octagram")
+              removePathForcibly (src </> "plugins" </> "predict")
+              createDirectoryLink librimePredictSrc (src </> "plugins" </> "predict")
             -- find lua with find_package; remove absolute path by __FILE__ macro
             cmd_ (Cwd librimeLuaSrc) "git checkout ."
             cmd_ (Cwd librimeLuaSrc) "git apply ../patches/librime-lua.patch"
             -- disable tools; remove absolute path by __FILE__ macro
             cmd_ (Cwd librimeOctagramSrc) "git checkout ."
             cmd_ (Cwd librimeOctagramSrc) "git apply ../patches/librime-octagram.patch"
+            -- disable tools; remove absolute path by __FILE__ macro
+            cmd_ (Cwd librimePredictSrc) "git checkout ."
+            cmd_ (Cwd librimePredictSrc) "git apply ../patches/librime-predict.patch"
             -- remove absolute path by __FILE__ macro
             cmd_ (Cwd src) "git checkout ."
             cmd_ (Cwd src) "git apply ../patches/librime.patch",
           cmakeFlags = \BuildEnv {..} ->
             [ "-DBUILD_SHARED_LIBS=OFF",
               "-DBUILD_STATIC=ON",
               "-DBUILD_TEST=OFF",
+              "-DALSO_LOG_TO_STDERR=ON",
               "-DCMAKE_FIND_ROOT_PATH="
                 <> intercalate
                   ";"