Skip to content

Commit

Permalink
feat(submodules): migrate to rime/plum
Browse files Browse the repository at this point in the history
  • Loading branch information
lotem committed Apr 7, 2018
1 parent ca57cb6 commit 5808a2b
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 35 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
brise export-ignore
plum export-ignore
librime export-ignore
package export-ignore
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "librime"]
path = librime
url = https://github.com/rime/librime.git
[submodule "brise"]
path = brise
url = https://github.com/rime/brise.git
[submodule "plum"]
path = plum
url = https://github.com/rime/plum.git
21 changes: 0 additions & 21 deletions README

This file was deleted.

30 changes: 30 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# ibus-rime

Rime Input Method Engine for Linux/IBus

project home: [rime.im](http://rime.im)

code repository: https://github.com/rime/ibus-rime

license: GPLv3

## installation

Refer to https://github.com/rime/home/wiki/RimeWithIBus

build dependencies:

- pkg-config
- cmake>=2.8
- librime>=1.0 (development package)
- libibus-1.0 (development package)
- libnotify (development package)
- plum (submodule)

runtime dependencies:

- ibus
- librime>=1.0
- libibus-1.0
- libnotify
- rime-data (provided by plum)
1 change: 0 additions & 1 deletion brise
Submodule brise deleted from dd38fd
7 changes: 2 additions & 5 deletions install-static.sh
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
#!/bin/bash

if [ ! -e librime -a -e ../librime ]; then ln -s ../librime; fi
if [ ! -e brise -a -e ../brise ]; then ln -s ../brise; fi

if [ ! -e lib ]; then ln -s librime/thirdparty/lib; fi
if [ ! -e lib/libyaml-cpp.a ]; then (cd librime; make thirdparty) || exit 1; fi
(cd librime; make thirdparty) || exit 1

(cd librime; make librime-static && sudo make -C build-static install) || exit 1

(cd brise; make && sudo make install) || exit 1
(cd plum; make && sudo make install) || exit 1

make clean && make ibus-engine-rime-static && sudo make install || exit 1

Expand Down
5 changes: 1 addition & 4 deletions install.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
#!/bin/bash

if [ ! -e librime -a -e ../librime ]; then ln -s ../librime; fi
if [ ! -e brise -a -e ../brise ]; then ln -s ../brise; fi

(cd librime; make && sudo make install) || exit 1
(cd brise; make && sudo make install) || exit 1
(cd plum; make && sudo make install) || exit 1

make clean && make && sudo make install || exit 1

Expand Down
1 change: 1 addition & 0 deletions plum
Submodule plum added at fd618d

0 comments on commit 5808a2b

Please sign in to comment.