Skip to content

Commit

Permalink
sync librime and librime-lua
Browse files Browse the repository at this point in the history
  • Loading branch information
eagleoflqj committed Aug 2, 2023
1 parent 552490d commit 31cdd08
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 17 deletions.
4 changes: 2 additions & 2 deletions checksum
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
1af97e7578a6b23af1aff33269acf462 public/rime.data
1e13a53e575bdd4e3de55006139bb0c2 public/rime.js
25910b3c7cffa12145415bd2a8adca1b public/rime.wasm
49e7134138ba650d620bb426eb724a58 public/rime.js
140c8306c19e84a8f8dc81fee51988c2 public/rime.wasm
2 changes: 1 addition & 1 deletion librime
2 changes: 1 addition & 1 deletion librime-lua
16 changes: 4 additions & 12 deletions librime_patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c36bca2e..99b494f3 100644
index 5262f168..bd6c9bbe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,6 +45,9 @@ if (ENABLE_ASAN)
@@ -46,6 +46,9 @@ if (ENABLE_ASAN)
set(CMAKE_SHARED_LINKER_FLAGS "${asan_lflags} ${CMAKE_SHARED_LINKER_FLAGS}")
endif()

Expand Down Expand Up @@ -39,7 +39,7 @@ index a60b6b56..eb521bb4 100644
compiler->EnumerateResources([&](an<ConfigResource> resource) {
if (!resource->loaded) {
diff --git a/src/rime/deployer.cc b/src/rime/deployer.cc
index 1394679b..0d524fae 100644
index 2b2169ca..19ac1097 100644
--- a/src/rime/deployer.cc
+++ b/src/rime/deployer.cc
@@ -5,6 +5,7 @@
Expand All @@ -66,16 +66,8 @@ index 1394679b..0d524fae 100644
// boost::this_thread::interruption_point();
}
LOG(INFO) << success + failure << " tasks ran: " << success << " success, "
@@ -108,6 +114,7 @@ bool Deployer::StartWork(bool maintenance_mode) {
}
LOG(INFO) << "starting work thread for " << pending_tasks_.size()
<< " tasks.";
+ return Run();
work_ = std::async(std::launch::async, [this] { Run(); });
return work_.valid();
}
diff --git a/src/rime/schema.cc b/src/rime/schema.cc
index 559cb7a8..9e49a039 100644
index 3026dda9..f29629f8 100644
--- a/src/rime/schema.cc
+++ b/src/rime/schema.cc
@@ -4,9 +4,17 @@
Expand Down
1 change: 1 addition & 0 deletions scripts/build_lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ emcmake cmake librime -B $librime_blddir -G Ninja \
-DCMAKE_FIND_ROOT_PATH:PATH=$root/build/sysroot/usr \
-DBUILD_TEST:BOOL=OFF \
-DBUILD_STATIC:BOOL=ON \
-DENABLE_THREADING:BOOL=OFF \
-DENABLE_LOGGING:BOOL=$ENABLE_LOGGING
cmake --build $librime_blddir
DESTDIR=$root/build/sysroot cmake --install $librime_blddir
Expand Down
2 changes: 1 addition & 1 deletion test/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ function copyLink (page: Page) {

function expectSuccessfulDeployment (page: Page) {
test.setTimeout(60000)
return expect(page.getByText('Deployment succeeded')).toBeVisible({ timeout: 30000 })
return expect(page.getByText('Deployment succeeded')).toBeVisible({ timeout: 45000 })
}

function chain (...callbacks: ((param?: any) => void)[]) {
Expand Down

0 comments on commit 31cdd08

Please sign in to comment.