diff --git a/.gitignore b/.gitignore index 7e82d7229..001d6bbaa 100644 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,3 @@ package/test-* *~ .*.swp .DS_Store -rime-with-plugins-1.7.3-osx.zip diff --git a/.gitmodules b/.gitmodules index 1ebd84b73..ec8d933eb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,6 +2,7 @@ path = librime url = https://github.com/groverlynn/librime.git branch = test + ignore = dirty [submodule "plum"] path = plum url = https://github.com/groverlynn/plum.git diff --git a/autobuild.sh b/autobuild.sh index 9691c4f9e..a971e9d06 100644 --- a/autobuild.sh +++ b/autobuild.sh @@ -4,14 +4,13 @@ make clean clean-deps bash librime/install-plugins.sh rime/librime-sample lotem/librime-octagram hchunhui/librime-lua +export CMAKE_GENERATOR=Ninja export BUILD_UNIVERSAL=1 bash librime/install-boost.sh export BOOST_ROOT="$(pwd)/librime/deps/boost_1_83_0" -export CMAKE_GENERATOR=Ninja -export PATH="/opt/homebrew/opt/llvm/bin:/usr/local/opt/llvm/bin:$PATH" -make -C librime ARCHS="arm64;x86_64" test -make -C librime ARCHS="arm64;x86_64" install +# export PATH="/opt/homebrew/opt/llvm/bin:/usr/local/opt/llvm/bin:$PATH" +make -C librime make deps -make ARCHS="arm64;x86_64" install +make install diff --git a/librime b/librime index 8d842922e..d5cfc101c 160000 --- a/librime +++ b/librime @@ -1 +1 @@ -Subproject commit 8d842922e5dcc0c4dcfd492696ec6ab1c4c5e2c1 +Subproject commit d5cfc101cc513ff09466b46f2e16d235619760a5