0.10.3: drop boost/filesystem

LibreService · Oct 6, 2023 · 8cf2719 · 8cf2719
1 parent 70f1de6
commit 8cf2719
Show file tree

Hide file tree

Showing 12 changed files with 8 additions and 16 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,7 +19,6 @@ jobs:
           sudo apt install -y ninja-build \
             clang-format \
             libboost-dev \
-            libboost-filesystem-dev \
             libboost-regex-dev \
             libyaml-cpp-dev \
             libleveldb-dev \

diff --git a/Dockerfile b/Dockerfile
@@ -9,7 +9,6 @@ RUN apt update && apt install -y \
     cmake \
     ninja-build \
     libboost-dev \
-    libboost-filesystem-dev \
     libboost-regex-dev \
     libyaml-cpp-dev \
     libleveldb-dev \

diff --git a/README.md b/README.md
@@ -42,7 +42,6 @@ apt install -y \
   ninja-build \
   clang-format \
   libboost-dev \
-  libboost-filesystem-dev \
   libboost-regex-dev \
   libyaml-cpp-dev \
   libleveldb-dev \

diff --git a/checksum b/checksum
@@ -1,3 +1,3 @@
 f6a0288a806954b8c0f1d34148aa43e1  public/rime.data
-3eb05f39e70730816776beb18ac3d6e4  public/rime.js
-a60d529a9cfde09e276186475e0e7827  public/rime.wasm
+105f93181e4e6e168b67bc08bd046ada  public/rime.js
+a279df89ea5ba5c2762c7bcee67b30cd  public/rime.wasm
diff --git a/librime b/librime
diff --git a/librime-lua b/librime-lua
diff --git a/librime_patch b/librime_patch
@@ -1,10 +1,10 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 03484ecb..1a493df4 100644
+index aecf5a08..71be3a0b 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.12)
  project(rime)
- set(CMAKE_CXX_STANDARD 14)
+ set(CMAKE_CXX_STANDARD 17)
 
 -set(rime_version 1.9.0)
 +set(rime_version 1.8.5) # keep 1.8.5 so no need to rehash schemas

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@libreservice/my-rime",
-  "version": "0.10.2",
+  "version": "0.10.3",
   "files": [
     "dist"
   ],

diff --git a/scripts/build_lib.ts b/scripts/build_lib.ts
@@ -57,7 +57,6 @@ function buildBoost () {
     'threading=single', // threading defaults to multi on Linux and single on macOS
     'target-os=linux', // Windows hack
     '--layout=system',
-    '--with-filesystem',
     '--with-regex',
     '--disable-icu',
     `--prefix=${CMAKE_FIND_ROOT_PATH}`,

diff --git a/scripts/build_native.ts b/scripts/build_native.ts
@@ -71,7 +71,6 @@ function buildBoost () {
     'link=static',
     'stage',
     'runtime-link=static',
-    '--with-filesystem',
     '--with-regex',
     '-j', `${n}`
   ], spawnArg))

diff --git a/scripts/build_wasm.ts b/scripts/build_wasm.ts
@@ -32,7 +32,7 @@ const exportedFunctions = [
 ]
 
 const compileArgs = [
-  '-std=c++14',
+  '-std=c++17',
   ...(process.env.BUILD_TYPE === 'Debug'
     ? ['-g']
     : [
@@ -63,7 +63,6 @@ const linkArgs = [
   '-L', LIB_PATH,
   // To include __attribute__((constructor)) in librime-lua, see https://stackoverflow.com/a/842770
   '-Wl,--whole-archive', '-l', 'rime', '-Wl,--no-whole-archive',
-  '-l:libboost_filesystem.bc',
   '-l', 'yaml-cpp',
   '-l', 'leveldb',
   '-l', 'marisa',

diff --git a/scripts/update_submodule.ts b/scripts/update_submodule.ts
@@ -38,7 +38,6 @@ for (const submodule of [
   'any',
   'array',
   'assert',
-  'atomic',
   'bind',
   'concept_check',
   'config',
@@ -49,7 +48,6 @@ for (const submodule of [
   'date_time',
   'describe',
   'detail',
-  'filesystem',
   'format',
   'function',
   'function_types',
+9 −7		.github/workflows/linux-build.yml
+22 −15		.github/workflows/windows-build.yml
+4 −3		CMakeLists.txt
+5 −1		Dockerfile
+1 −1		Makefile
+0 −1		action-install-linux.sh
+0 −1		build.bat
+34 −34		include/utf8.h
+77 −85		include/utf8/checked.h
+158 −129		include/utf8/core.h
+103 −0		include/utf8/cpp17.h
+84 −53		include/utf8/unchecked.h
+1 −1		install-boost.sh
+2 −2		plugins/plugins_module.cc
+3 −1		src/CMakeLists.txt
+20 −0		src/rime/algo/fs.h
+3 −2		src/rime/config/build_info_plugin.cc
+2 −2		src/rime/config/config_data.cc
+1 −1		src/rime/config/save_output_plugin.cc
+2 −2		src/rime/deployer.cc
+3 −3		src/rime/dict/db.cc
+3 −3		src/rime/dict/dict_compiler.cc
+3 −3		src/rime/dict/dictionary.cc
+1 −1		src/rime/dict/level_db.cc
+3 −3		src/rime/dict/mapped_file.cc
+1 −1		src/rime/dict/preset_vocabulary.cc
+1 −1		src/rime/dict/reverse_lookup_dictionary.cc
+5 −5		src/rime/dict/user_db_recovery_task.cc
+3 −3		src/rime/gear/simplifier.cc
+2 −2		src/rime/lever/custom_settings.cc
+1 −1		src/rime/lever/customizer.cc
+5 −5		src/rime/lever/customizer.h
+15 −11		src/rime/lever/deployment_tasks.cc
+2 −2		src/rime/lever/switcher_settings.cc
+2 −2		src/rime/lever/switcher_settings.h
+7 −7		src/rime/lever/user_dict_manager.cc
+2 −2		src/rime/lever/user_dict_manager.h
+13 −14		src/rime/resource.cc
+8 −8		src/rime/resource.h
+2 −2		src/rime/setup.cc
+3 −3		test/resource_resolver_test.cc
+2 −2		tools/rime_deployer.cc
+26 −0		src/lib/lua_templates.h
+44 −3		src/lua_gears.cc
+12 −4		src/opencc.cc
+57 −56		src/types.cc
+15 −14		src/types_ext.cc