Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps: update librime to 1.11.0 #860

Merged
merged 2 commits into from
Apr 15, 2024
Merged

deps: update librime to 1.11.0 #860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
204b82f
chore: upgrade to librime 1.11.0
ksqsf Apr 15, 2024
63cf689
build: copy plugins
ksqsf Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ librime: $(RIME_DEPS)

copy-rime-binaries:
cp -L $(RIME_LIB_DIR)/$(RIME_LIBRARY_FILE_NAME) lib/
cp -pR $(RIME_LIB_DIR)/rime-plugins lib/
cp $(RIME_BIN_DIR)/rime_deployer bin/
cp $(RIME_BIN_DIR)/rime_dict_manager bin/
$(INSTALL_NAME_TOOL) $(INSTALL_NAME_TOOL_ARGS) bin/rime_deployer
Expand Down
23 changes: 23 additions & 0 deletions Squirrel.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
objects = {

/* Begin PBXBuildFile section */
2C6B9F9D2BCD086700E327DF /* librime-lua.dylib in Copy Rime plugins */ = {isa = PBXBuildFile; fileRef = 2C6B9F9A2BCD086700E327DF /* librime-lua.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
2C6B9F9E2BCD086700E327DF /* librime-octagram.dylib in Copy Rime plugins */ = {isa = PBXBuildFile; fileRef = 2C6B9F9B2BCD086700E327DF /* librime-octagram.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
2C6B9F9F2BCD086700E327DF /* librime-predict.dylib in Copy Rime plugins */ = {isa = PBXBuildFile; fileRef = 2C6B9F9C2BCD086700E327DF /* librime-predict.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
441E637722B7E96F006DCCDD /* bopomofo_express.schema.yaml in Copy Shared Support Files */ = {isa = PBXBuildFile; fileRef = 441E636C22B7E90D006DCCDD /* bopomofo_express.schema.yaml */; };
441E637822B7E96F006DCCDD /* bopomofo_tw.schema.yaml in Copy Shared Support Files */ = {isa = PBXBuildFile; fileRef = 441E636722B7E90D006DCCDD /* bopomofo_tw.schema.yaml */; };
441E637922B7E96F006DCCDD /* bopomofo.schema.yaml in Copy Shared Support Files */ = {isa = PBXBuildFile; fileRef = 441E636822B7E90D006DCCDD /* bopomofo.schema.yaml */; };
Expand Down Expand Up @@ -88,6 +91,19 @@
/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
2C6B9F992BCD083D00E327DF /* Copy Rime plugins */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "rime-plugins";
dstSubfolderSpec = 10;
files = (
2C6B9F9D2BCD086700E327DF /* librime-lua.dylib in Copy Rime plugins */,
2C6B9F9E2BCD086700E327DF /* librime-octagram.dylib in Copy Rime plugins */,
2C6B9F9F2BCD086700E327DF /* librime-predict.dylib in Copy Rime plugins */,
);
name = "Copy Rime plugins";
runOnlyForDeploymentPostprocessing = 0;
};
4407F3CA14EC079A001329FE /* Copy opencc Files */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -192,6 +208,9 @@
29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
2C6B9F9A2BCD086700E327DF /* librime-lua.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "librime-lua.dylib"; path = "lib/rime-plugins/librime-lua.dylib"; sourceTree = "<group>"; };
2C6B9F9B2BCD086700E327DF /* librime-octagram.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "librime-octagram.dylib"; path = "lib/rime-plugins/librime-octagram.dylib"; sourceTree = "<group>"; };
2C6B9F9C2BCD086700E327DF /* librime-predict.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "librime-predict.dylib"; path = "lib/rime-plugins/librime-predict.dylib"; sourceTree = "<group>"; };
32CA4F630368D1EE00C91783 /* Squirrel_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Squirrel_Prefix.pch; sourceTree = "<group>"; };
441E636322B7E90C006DCCDD /* cangjie5.schema.yaml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = cangjie5.schema.yaml; path = data/plum/cangjie5.schema.yaml; sourceTree = "<group>"; };
441E636422B7E90C006DCCDD /* terra_pinyin.dict.yaml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = terra_pinyin.dict.yaml; path = data/plum/terra_pinyin.dict.yaml; sourceTree = "<group>"; };
Expand Down Expand Up @@ -351,6 +370,9 @@
29B97314FDCFA39411CA2CEA /* Squirrel */ = {
isa = PBXGroup;
children = (
2C6B9F9A2BCD086700E327DF /* librime-lua.dylib */,
2C6B9F9B2BCD086700E327DF /* librime-octagram.dylib */,
2C6B9F9C2BCD086700E327DF /* librime-predict.dylib */,
442C648F1F7A40180027EFBE /* bin */,
44DA7A4214DD598900C1ED3B /* SharedSupport */,
080E96DDFE201D6D7F000001 /* Sources */,
Expand Down Expand Up @@ -487,6 +509,7 @@
8D11072C0486CEB800E47090 /* Sources */,
8D11072E0486CEB800E47090 /* Frameworks */,
A464E3780F65263000148227 /* Copy 3rd-party Frameworks */,
2C6B9F992BCD083D00E327DF /* Copy Rime plugins */,
44DA7A1614DD581B00C1ED3B /* Copy Shared Support Files */,
4407F3CA14EC079A001329FE /* Copy opencc Files */,
44E21A8D16A653AC00C2B08F /* CopyFiles */,
Expand Down
8 changes: 4 additions & 4 deletions action-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

set -e

rime_version=1.8.5
rime_git_hash=08dd95f
rime_version=1.11.0
rime_git_hash=76a0a16

rime_archive="rime-${rime_git_hash}-macOS.tar.bz2"
rime_archive="rime-${rime_git_hash}-macOS-universal.tar.bz2"
rime_download_url="https://github.com/rime/librime/releases/download/${rime_version}/${rime_archive}"

rime_deps_archive="rime-deps-${rime_git_hash}-macOS.tar.bz2"
rime_deps_archive="rime-deps-${rime_git_hash}-macOS-universal.tar.bz2"
rime_deps_download_url="https://github.com/rime/librime/releases/download/${rime_version}/${rime_deps_archive}"

mkdir -p download && (
Expand Down
2 changes: 1 addition & 1 deletion librime
Open in desktop
Submodule librime updated 40 files
+3 −3 .github/workflows/commit-ci.yml
+18 −31 .github/workflows/macos-build.yml
+5 −3 .github/workflows/release-ci.yml
+15 −29 .github/workflows/windows-build.yml
+44 −0 CHANGELOG.md
+5 −1 CMakeLists.txt
+3 −2 Makefile
+15 −13 README-windows.md
+18 −19 build.bat
+77 −0 cmake/AddRCInfo.cmake
+1 −3 install-boost.bat
+1 −2 install-boost.sh
+1 −1 package.json
+6 −0 src/CMakeLists.txt
+62 −0 src/rime.rc
+4 −4 src/rime/algo/encoder.cc
+5 −0 src/rime/common.h
+4 −0 src/rime/config/config_component.cc
+2 −0 src/rime/config/config_component.h
+6 −2 src/rime/config/config_data.cc
+2 −0 src/rime/config/config_data.h
+3 −0 src/rime/context.cc
+2 −2 src/rime/dict/dict_compiler.cc
+2 −2 src/rime/dict/entry_collector.cc
+15 −0 src/rime/dict/user_dictionary.cc
+0 −4 src/rime/dict/vocabulary.cc
+7 −1 src/rime/dict/vocabulary.h
+13 −15 src/rime/engine.cc
+29 −20 src/rime/gear/chord_composer.cc
+27 −5 src/rime/gear/chord_composer.h
+2 −1 src/rime/gear/contextual_translation.cc
+3 −0 src/rime/gear/echo_translator.cc
+93 −60 src/rime/gear/script_translator.cc
+1 −1 src/rime/gear/simplifier.cc
+7 −7 src/rime/lever/deployment_tasks.cc
+2 −1 src/rime/lever/switcher_settings.cc
+9 −1 src/rime/switcher.cc
+3 −1 src/rime/switcher.h
+1 −1 src/rime_api.cc
+23 −25 tools/CMakeLists.txt