Merge pull request #120 from rime/test

修改構建腳本：make test 運行測試
rime · Jan 12, 2017 · 9c4fa8a · 9c4fa8a
2 parents 63f2efb + c8b1e67
commit 9c4fa8a
Show file tree

Hide file tree

Showing 189 changed files with 37 additions and 41 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,7 +12,7 @@ add_definitions(-DRIME_VERSION="${LIBRIME_VERSION}")
 option(BUILD_SHARED_LIBS "Build Rime as shared library" ON)
 option(BUILD_STATIC "Build with dependencies as static libraries" OFF)
 option(BUILD_DATA "Build data for Rime" OFF)
-option(BUILD_TEST "Build and run tests" OFF)
+option(BUILD_TEST "Build and run tests" ON)
 option(BUILD_SEPARATE_LIBS "Build a separate rime-gears library" OFF)
 option(ENABLE_LOGGING "Enable logging with google-glog library" ON)
 option(BOOST_USE_CXX11 "Boost has been built with C++11 support" OFF)
@@ -110,7 +110,7 @@ else(X11Keysym)
   message(WARNING "X11/keysym.h not found.")
 endif(X11Keysym)
 
-include_directories(${PROJECT_SOURCE_DIR}/include)
+include_directories(${PROJECT_SOURCE_DIR}/src)
 include_directories(${PROJECT_SOURCE_DIR}/thirdparty/include)
 link_directories(${PROJECT_SOURCE_DIR}/thirdparty/lib)
 if(MSVC)
@@ -157,17 +157,12 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
       ${PROJECT_SOURCE_DIR}/rime.pc.in
       ${PROJECT_BINARY_DIR}/rime.pc
       @ONLY)
-  install(FILES include/rime_api.h DESTINATION include)
+  install(FILES src/rime_api.h DESTINATION include)
   install(FILES ${PROJECT_BINARY_DIR}/rime.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
   install(FILES cmake/RimeConfig.cmake DESTINATION share/cmake/rime)
   if(BUILD_DATA)
-    install(FILES ${PROJECT_SOURCE_DIR}/data/default.yaml DESTINATION ${pkgdatadir})
-    install(FILES ${PROJECT_SOURCE_DIR}/data/symbols.yaml DESTINATION ${pkgdatadir})
-    install(FILES ${PROJECT_SOURCE_DIR}/data/essay.txt DESTINATION ${pkgdatadir})
-    file(GLOB preset_schema ${PROJECT_SOURCE_DIR}/data/preset/*.yaml)
-    install(FILES ${preset_schema} DESTINATION ${pkgdatadir})
-    file(GLOB supplement_schema ${PROJECT_SOURCE_DIR}/data/supplement/*.yaml)
-    install(FILES ${supplement_schema} DESTINATION ${pkgdatadir})
+    file(GLOB preset_data_files ${PROJECT_SOURCE_DIR}/data/preset/*.yaml)
+    install(FILES ${preset_data_files} DESTINATION ${pkgdatadir})
   endif(BUILD_DATA)
 endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 

diff --git a/Makefile b/Makefile
@@ -3,16 +3,9 @@ RIME_ROOT = $(CURDIR)
 sharedir = $(DESTDIR)/usr/share
 bindir = $(DESTDIR)/usr/bin
 
-.PHONY: all install uninstall thirdparty clean librime-static librime debug
+.PHONY: all thirdparty clean librime librime-static install-librime uninstall-librime release install uninstall debug install-debug uninstall-debug test
 
-all: librime
-	@echo ':)'
-
-install: install-librime
-	@echo ':)'
-
-uninstall: uninstall-librime
-	@echo ':)'
+all: release
 
 thirdparty:
 	make -f Makefile.thirdparty
@@ -23,26 +16,34 @@ thirdparty/%:
 clean:
 	rm -Rf build build-static debug-build
 
+librime: release
+install-librime: install
+uninstall-librime: uninstall
+
 librime-static:
 	cmake . -Bbuild-static -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC=ON -DBUILD_SHARED_LIBS=OFF
 	cmake --build build-static
 
-librime:
+release:
 	cmake . -Bbuild -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
 	cmake --build build
 
-install-librime:
+install:
 	cmake --build build --target install
 
-uninstall-librime:
+uninstall:
 	cmake --build build --target uninstall
 
 debug:
-	cmake . -Bdebug-build -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Debug -DBUILD_TEST=ON
+	cmake . -Bdebug-build -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Debug
 	cmake --build debug-build
 
 install-debug:
 	cmake --build debug-build --target install
 
 uninstall-debug:
 	cmake --build debug-build --target uninstall
+
+test: release
+	(cd build/test; ./rime_test)
+
diff --git a/Makefile.xcode b/Makefile.xcode
@@ -1,7 +1,7 @@
 RIME_ROOT = $(CURDIR)
 RIME_COMPILER_OPTIONS = CC=clang CXX=clang++ CXXFLAGS="-stdlib=libc++" LDFLAGS="-stdlib=libc++"
 
-.PHONY: all release debug clean thirdparty
+.PHONY: all release debug clean test thirdparty
 
 all: release
 
@@ -10,7 +10,7 @@ release:
 	cmake --build xbuild --config Release | grep -v setenv | tee build.log
 
 debug:
-	cmake . -Bxdebug -GXcode -DBUILD_STATIC=ON -DBUILD_TEST=ON -DBUILD_SEPARATE_LIBS=ON
+	cmake . -Bxdebug -GXcode -DBUILD_STATIC=ON -DBUILD_SEPARATE_LIBS=ON
 	cmake --build xdebug --config Debug | grep -v setenv | tee build.log
 
 clean:
@@ -20,6 +20,9 @@ clean:
 	rm -f thirdparty/lib/* > /dev/null 2>&1 || true
 	make -f Makefile.thirdparty clean-src
 
+test: release
+	(cd xbuild/test; LD_LIBRARY_PATH=../lib/Release Release/rime_test)
+
 thirdparty:
 	$(RIME_COMPILER_OPTIONS) make -f Makefile.thirdparty
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -30,7 +30,9 @@ build_script:
   - .\build.bat test
 
 after_build:
-  - 7z a rime.zip build\bin build\lib include thirdparty\data\opencc
+  - md build\include
+  - copy /y src\*.h build\include
+  - 7z a rime.zip build\bin build\lib build\include thirdparty\data\opencc
   - dir build /s
 
 before_test:

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,16 +1,17 @@
 set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
 
-aux_source_directory(. LIBRIME_SRC_BASE)
-aux_source_directory(algo LIBRIME_SRC_ALGO)
-aux_source_directory(dict LIBRIME_SRC_DICT)
-aux_source_directory(gear LIBRIME_SRC_GEAR)
-aux_source_directory(lever LIBRIME_SRC_LEVER)
+aux_source_directory(. LIBRIME_SRC_API)
+aux_source_directory(rime LIBRIME_SRC_BASE)
+aux_source_directory(rime/algo LIBRIME_SRC_ALGO)
+aux_source_directory(rime/dict LIBRIME_SRC_DICT)
+aux_source_directory(rime/gear LIBRIME_SRC_GEAR)
+aux_source_directory(rime/lever LIBRIME_SRC_LEVER)
 
 if(BUILD_SEPARATE_LIBS)
-  set(LIBRIME_SRC ${LIBRIME_SRC_BASE})
+  set(LIBRIME_SRC ${LIBRIME_SRC_API} ${LIBRIME_SRC_BASE})
   set(LIBRIME_GEARS_SRC ${LIBRIME_SRC_ALGO} ${LIBRIME_SRC_DICT} ${LIBRIME_SRC_GEAR} ${LIBRIME_SRC_LEVER})
 else(BUILD_SEPARATE_LIBS)
-  set(LIBRIME_SRC ${LIBRIME_SRC_BASE} ${LIBRIME_SRC_ALGO} ${LIBRIME_SRC_DICT} ${LIBRIME_SRC_GEAR} ${LIBRIME_SRC_LEVER})
+  set(LIBRIME_SRC ${LIBRIME_SRC_API} ${LIBRIME_SRC_BASE} ${LIBRIME_SRC_ALGO} ${LIBRIME_SRC_DICT} ${LIBRIME_SRC_GEAR} ${LIBRIME_SRC_LEVER})
 endif(BUILD_SEPARATE_LIBS)
 
 set(RIME_OPTIONAL_DEPS "")

diff --git a/src/algo/algebra.cc → src/rime/algo/algebra.cc b/src/algo/algebra.cc → src/rime/algo/algebra.cc
diff --git a/include/rime/algo/algebra.h → src/rime/algo/algebra.h b/include/rime/algo/algebra.h → src/rime/algo/algebra.h
diff --git a/src/algo/calculus.cc → src/rime/algo/calculus.cc b/src/algo/calculus.cc → src/rime/algo/calculus.cc
diff --git a/include/rime/algo/calculus.h → src/rime/algo/calculus.h b/include/rime/algo/calculus.h → src/rime/algo/calculus.h
diff --git a/include/rime/algo/dynamics.h → src/rime/algo/dynamics.h b/include/rime/algo/dynamics.h → src/rime/algo/dynamics.h
diff --git a/src/algo/encoder.cc → src/rime/algo/encoder.cc b/src/algo/encoder.cc → src/rime/algo/encoder.cc
diff --git a/include/rime/algo/encoder.h → src/rime/algo/encoder.h b/include/rime/algo/encoder.h → src/rime/algo/encoder.h
diff --git a/include/rime/algo/spelling.h → src/rime/algo/spelling.h b/include/rime/algo/spelling.h → src/rime/algo/spelling.h
diff --git a/src/algo/syllabifier.cc → src/rime/algo/syllabifier.cc b/src/algo/syllabifier.cc → src/rime/algo/syllabifier.cc
diff --git a/include/rime/algo/syllabifier.h → src/rime/algo/syllabifier.h b/include/rime/algo/syllabifier.h → src/rime/algo/syllabifier.h
diff --git a/src/algo/utilities.cc → src/rime/algo/utilities.cc b/src/algo/utilities.cc → src/rime/algo/utilities.cc
diff --git a/include/rime/algo/utilities.h → src/rime/algo/utilities.h b/include/rime/algo/utilities.h → src/rime/algo/utilities.h
diff --git a/src/candidate.cc → src/rime/candidate.cc b/src/candidate.cc → src/rime/candidate.cc
diff --git a/include/rime/candidate.h → src/rime/candidate.h b/include/rime/candidate.h → src/rime/candidate.h
diff --git a/src/commit_history.cc → src/rime/commit_history.cc b/src/commit_history.cc → src/rime/commit_history.cc
diff --git a/include/rime/commit_history.h → src/rime/commit_history.h b/include/rime/commit_history.h → src/rime/commit_history.h
diff --git a/include/rime/common.h → src/rime/common.h b/include/rime/common.h → src/rime/common.h
diff --git a/include/rime/component.h → src/rime/component.h b/include/rime/component.h → src/rime/component.h
diff --git a/src/composition.cc → src/rime/composition.cc b/src/composition.cc → src/rime/composition.cc
diff --git a/include/rime/composition.h → src/rime/composition.h b/include/rime/composition.h → src/rime/composition.h
diff --git a/src/config.cc → src/rime/config.cc b/src/config.cc → src/rime/config.cc
diff --git a/include/rime/config.h → src/rime/config.h b/include/rime/config.h → src/rime/config.h
diff --git a/src/context.cc → src/rime/context.cc b/src/context.cc → src/rime/context.cc
diff --git a/include/rime/context.h → src/rime/context.h b/include/rime/context.h → src/rime/context.h
diff --git a/src/core_module.cc → src/rime/core_module.cc b/src/core_module.cc → src/rime/core_module.cc
diff --git a/src/deployer.cc → src/rime/deployer.cc b/src/deployer.cc → src/rime/deployer.cc
diff --git a/include/rime/deployer.h → src/rime/deployer.h b/include/rime/deployer.h → src/rime/deployer.h
diff --git a/src/dict/db.cc → src/rime/dict/db.cc b/src/dict/db.cc → src/rime/dict/db.cc
diff --git a/include/rime/dict/db.h → src/rime/dict/db.h b/include/rime/dict/db.h → src/rime/dict/db.h
diff --git a/src/dict/db_utils.cc → src/rime/dict/db_utils.cc b/src/dict/db_utils.cc → src/rime/dict/db_utils.cc
diff --git a/include/rime/dict/db_utils.h → src/rime/dict/db_utils.h b/include/rime/dict/db_utils.h → src/rime/dict/db_utils.h
diff --git a/src/dict/dict_compiler.cc → src/rime/dict/dict_compiler.cc b/src/dict/dict_compiler.cc → src/rime/dict/dict_compiler.cc
diff --git a/include/rime/dict/dict_compiler.h → src/rime/dict/dict_compiler.h b/include/rime/dict/dict_compiler.h → src/rime/dict/dict_compiler.h
diff --git a/src/dict/dict_module.cc → src/rime/dict/dict_module.cc b/src/dict/dict_module.cc → src/rime/dict/dict_module.cc
diff --git a/src/dict/dict_settings.cc → src/rime/dict/dict_settings.cc b/src/dict/dict_settings.cc → src/rime/dict/dict_settings.cc
diff --git a/include/rime/dict/dict_settings.h → src/rime/dict/dict_settings.h b/include/rime/dict/dict_settings.h → src/rime/dict/dict_settings.h
diff --git a/src/dict/dictionary.cc → src/rime/dict/dictionary.cc b/src/dict/dictionary.cc → src/rime/dict/dictionary.cc
diff --git a/include/rime/dict/dictionary.h → src/rime/dict/dictionary.h b/include/rime/dict/dictionary.h → src/rime/dict/dictionary.h
diff --git a/src/dict/entry_collector.cc → src/rime/dict/entry_collector.cc b/src/dict/entry_collector.cc → src/rime/dict/entry_collector.cc
diff --git a/include/rime/dict/entry_collector.h → src/rime/dict/entry_collector.h b/include/rime/dict/entry_collector.h → src/rime/dict/entry_collector.h
diff --git a/src/dict/level_db.cc → src/rime/dict/level_db.cc b/src/dict/level_db.cc → src/rime/dict/level_db.cc
diff --git a/include/rime/dict/level_db.h → src/rime/dict/level_db.h b/include/rime/dict/level_db.h → src/rime/dict/level_db.h
diff --git a/src/dict/mapped_file.cc → src/rime/dict/mapped_file.cc b/src/dict/mapped_file.cc → src/rime/dict/mapped_file.cc
diff --git a/include/rime/dict/mapped_file.h → src/rime/dict/mapped_file.h b/include/rime/dict/mapped_file.h → src/rime/dict/mapped_file.h
diff --git a/src/dict/preset_vocabulary.cc → src/rime/dict/preset_vocabulary.cc b/src/dict/preset_vocabulary.cc → src/rime/dict/preset_vocabulary.cc
diff --git a/include/rime/dict/preset_vocabulary.h → src/rime/dict/preset_vocabulary.h b/include/rime/dict/preset_vocabulary.h → src/rime/dict/preset_vocabulary.h
diff --git a/src/dict/prism.cc → src/rime/dict/prism.cc b/src/dict/prism.cc → src/rime/dict/prism.cc
diff --git a/include/rime/dict/prism.h → src/rime/dict/prism.h b/include/rime/dict/prism.h → src/rime/dict/prism.h
diff --git a/src/dict/reverse_lookup_dictionary.cc → src/rime/dict/reverse_lookup_dictionary.cc b/src/dict/reverse_lookup_dictionary.cc → src/rime/dict/reverse_lookup_dictionary.cc
diff --git a/...ude/rime/dict/reverse_lookup_dictionary.h → src/rime/dict/reverse_lookup_dictionary.h b/...ude/rime/dict/reverse_lookup_dictionary.h → src/rime/dict/reverse_lookup_dictionary.h
diff --git a/src/dict/string_table.cc → src/rime/dict/string_table.cc b/src/dict/string_table.cc → src/rime/dict/string_table.cc
diff --git a/include/rime/dict/string_table.h → src/rime/dict/string_table.h b/include/rime/dict/string_table.h → src/rime/dict/string_table.h
diff --git a/src/dict/table.cc → src/rime/dict/table.cc b/src/dict/table.cc → src/rime/dict/table.cc
diff --git a/include/rime/dict/table.h → src/rime/dict/table.h b/include/rime/dict/table.h → src/rime/dict/table.h
diff --git a/src/dict/table_db.cc → src/rime/dict/table_db.cc b/src/dict/table_db.cc → src/rime/dict/table_db.cc
diff --git a/include/rime/dict/table_db.h → src/rime/dict/table_db.h b/include/rime/dict/table_db.h → src/rime/dict/table_db.h
diff --git a/src/dict/text_db.cc → src/rime/dict/text_db.cc b/src/dict/text_db.cc → src/rime/dict/text_db.cc
diff --git a/include/rime/dict/text_db.h → src/rime/dict/text_db.h b/include/rime/dict/text_db.h → src/rime/dict/text_db.h
diff --git a/src/dict/tsv.cc → src/rime/dict/tsv.cc b/src/dict/tsv.cc → src/rime/dict/tsv.cc
diff --git a/include/rime/dict/tsv.h → src/rime/dict/tsv.h b/include/rime/dict/tsv.h → src/rime/dict/tsv.h
diff --git a/src/dict/user_db.cc → src/rime/dict/user_db.cc b/src/dict/user_db.cc → src/rime/dict/user_db.cc
diff --git a/include/rime/dict/user_db.h → src/rime/dict/user_db.h b/include/rime/dict/user_db.h → src/rime/dict/user_db.h
diff --git a/src/dict/user_db_recovery_task.cc → src/rime/dict/user_db_recovery_task.cc b/src/dict/user_db_recovery_task.cc → src/rime/dict/user_db_recovery_task.cc
diff --git a/include/rime/dict/user_db_recovery_task.h → src/rime/dict/user_db_recovery_task.h b/include/rime/dict/user_db_recovery_task.h → src/rime/dict/user_db_recovery_task.h
diff --git a/src/dict/user_dictionary.cc → src/rime/dict/user_dictionary.cc b/src/dict/user_dictionary.cc → src/rime/dict/user_dictionary.cc
diff --git a/include/rime/dict/user_dictionary.h → src/rime/dict/user_dictionary.h b/include/rime/dict/user_dictionary.h → src/rime/dict/user_dictionary.h
diff --git a/src/dict/vocabulary.cc → src/rime/dict/vocabulary.cc b/src/dict/vocabulary.cc → src/rime/dict/vocabulary.cc
diff --git a/include/rime/dict/vocabulary.h → src/rime/dict/vocabulary.h b/include/rime/dict/vocabulary.h → src/rime/dict/vocabulary.h
diff --git a/src/engine.cc → src/rime/engine.cc b/src/engine.cc → src/rime/engine.cc
diff --git a/include/rime/engine.h → src/rime/engine.h b/include/rime/engine.h → src/rime/engine.h
diff --git a/include/rime/filter.h → src/rime/filter.h b/include/rime/filter.h → src/rime/filter.h
diff --git a/include/rime/formatter.h → src/rime/formatter.h b/include/rime/formatter.h → src/rime/formatter.h
diff --git a/src/gear/abc_segmentor.cc → src/rime/gear/abc_segmentor.cc b/src/gear/abc_segmentor.cc → src/rime/gear/abc_segmentor.cc
diff --git a/include/rime/gear/abc_segmentor.h → src/rime/gear/abc_segmentor.h b/include/rime/gear/abc_segmentor.h → src/rime/gear/abc_segmentor.h
diff --git a/src/gear/affix_segmentor.cc → src/rime/gear/affix_segmentor.cc b/src/gear/affix_segmentor.cc → src/rime/gear/affix_segmentor.cc
diff --git a/include/rime/gear/affix_segmentor.h → src/rime/gear/affix_segmentor.h b/include/rime/gear/affix_segmentor.h → src/rime/gear/affix_segmentor.h
diff --git a/src/gear/ascii_composer.cc → src/rime/gear/ascii_composer.cc b/src/gear/ascii_composer.cc → src/rime/gear/ascii_composer.cc
diff --git a/include/rime/gear/ascii_composer.h → src/rime/gear/ascii_composer.h b/include/rime/gear/ascii_composer.h → src/rime/gear/ascii_composer.h
diff --git a/src/gear/ascii_segmentor.cc → src/rime/gear/ascii_segmentor.cc b/src/gear/ascii_segmentor.cc → src/rime/gear/ascii_segmentor.cc
diff --git a/include/rime/gear/ascii_segmentor.h → src/rime/gear/ascii_segmentor.h b/include/rime/gear/ascii_segmentor.h → src/rime/gear/ascii_segmentor.h
diff --git a/src/gear/charset_filter.cc → src/rime/gear/charset_filter.cc b/src/gear/charset_filter.cc → src/rime/gear/charset_filter.cc
diff --git a/include/rime/gear/charset_filter.h → src/rime/gear/charset_filter.h b/include/rime/gear/charset_filter.h → src/rime/gear/charset_filter.h
diff --git a/src/gear/chord_composer.cc → src/rime/gear/chord_composer.cc b/src/gear/chord_composer.cc → src/rime/gear/chord_composer.cc
diff --git a/include/rime/gear/chord_composer.h → src/rime/gear/chord_composer.h b/include/rime/gear/chord_composer.h → src/rime/gear/chord_composer.h
diff --git a/src/gear/codepoint_translator.cc → src/rime/gear/codepoint_translator.cc b/src/gear/codepoint_translator.cc → src/rime/gear/codepoint_translator.cc
diff --git a/include/rime/gear/codepoint_translator.h → src/rime/gear/codepoint_translator.h b/include/rime/gear/codepoint_translator.h → src/rime/gear/codepoint_translator.h
diff --git a/src/gear/echo_translator.cc → src/rime/gear/echo_translator.cc b/src/gear/echo_translator.cc → src/rime/gear/echo_translator.cc
diff --git a/include/rime/gear/echo_translator.h → src/rime/gear/echo_translator.h b/include/rime/gear/echo_translator.h → src/rime/gear/echo_translator.h
diff --git a/src/gear/editor.cc → src/rime/gear/editor.cc b/src/gear/editor.cc → src/rime/gear/editor.cc
diff --git a/include/rime/gear/editor.h → src/rime/gear/editor.h b/include/rime/gear/editor.h → src/rime/gear/editor.h
diff --git a/src/gear/fallback_segmentor.cc → src/rime/gear/fallback_segmentor.cc b/src/gear/fallback_segmentor.cc → src/rime/gear/fallback_segmentor.cc
diff --git a/include/rime/gear/fallback_segmentor.h → src/rime/gear/fallback_segmentor.h b/include/rime/gear/fallback_segmentor.h → src/rime/gear/fallback_segmentor.h
diff --git a/src/gear/filter_commons.cc → src/rime/gear/filter_commons.cc b/src/gear/filter_commons.cc → src/rime/gear/filter_commons.cc
diff --git a/include/rime/gear/filter_commons.h → src/rime/gear/filter_commons.h b/include/rime/gear/filter_commons.h → src/rime/gear/filter_commons.h
diff --git a/src/gear/gears_module.cc → src/rime/gear/gears_module.cc b/src/gear/gears_module.cc → src/rime/gear/gears_module.cc
diff --git a/src/gear/history_translator.cc → src/rime/gear/history_translator.cc b/src/gear/history_translator.cc → src/rime/gear/history_translator.cc
diff --git a/include/rime/gear/history_translator.h → src/rime/gear/history_translator.h b/include/rime/gear/history_translator.h → src/rime/gear/history_translator.h
diff --git a/src/gear/key_binder.cc → src/rime/gear/key_binder.cc b/src/gear/key_binder.cc → src/rime/gear/key_binder.cc
diff --git a/include/rime/gear/key_binder.h → src/rime/gear/key_binder.h b/include/rime/gear/key_binder.h → src/rime/gear/key_binder.h
diff --git a/src/gear/matcher.cc → src/rime/gear/matcher.cc b/src/gear/matcher.cc → src/rime/gear/matcher.cc
diff --git a/include/rime/gear/matcher.h → src/rime/gear/matcher.h b/include/rime/gear/matcher.h → src/rime/gear/matcher.h
diff --git a/src/gear/memory.cc → src/rime/gear/memory.cc b/src/gear/memory.cc → src/rime/gear/memory.cc
diff --git a/include/rime/gear/memory.h → src/rime/gear/memory.h b/include/rime/gear/memory.h → src/rime/gear/memory.h
diff --git a/src/gear/navigator.cc → src/rime/gear/navigator.cc b/src/gear/navigator.cc → src/rime/gear/navigator.cc
diff --git a/include/rime/gear/navigator.h → src/rime/gear/navigator.h b/include/rime/gear/navigator.h → src/rime/gear/navigator.h
diff --git a/src/gear/poet.cc → src/rime/gear/poet.cc b/src/gear/poet.cc → src/rime/gear/poet.cc
diff --git a/include/rime/gear/poet.h → src/rime/gear/poet.h b/include/rime/gear/poet.h → src/rime/gear/poet.h
diff --git a/src/gear/punctuator.cc → src/rime/gear/punctuator.cc b/src/gear/punctuator.cc → src/rime/gear/punctuator.cc
diff --git a/include/rime/gear/punctuator.h → src/rime/gear/punctuator.h b/include/rime/gear/punctuator.h → src/rime/gear/punctuator.h
diff --git a/src/gear/recognizer.cc → src/rime/gear/recognizer.cc b/src/gear/recognizer.cc → src/rime/gear/recognizer.cc
diff --git a/include/rime/gear/recognizer.h → src/rime/gear/recognizer.h b/include/rime/gear/recognizer.h → src/rime/gear/recognizer.h
diff --git a/src/gear/reverse_lookup_filter.cc → src/rime/gear/reverse_lookup_filter.cc b/src/gear/reverse_lookup_filter.cc → src/rime/gear/reverse_lookup_filter.cc
diff --git a/include/rime/gear/reverse_lookup_filter.h → src/rime/gear/reverse_lookup_filter.h b/include/rime/gear/reverse_lookup_filter.h → src/rime/gear/reverse_lookup_filter.h
diff --git a/src/gear/reverse_lookup_translator.cc → src/rime/gear/reverse_lookup_translator.cc b/src/gear/reverse_lookup_translator.cc → src/rime/gear/reverse_lookup_translator.cc
diff --git a/...ude/rime/gear/reverse_lookup_translator.h → src/rime/gear/reverse_lookup_translator.h b/...ude/rime/gear/reverse_lookup_translator.h → src/rime/gear/reverse_lookup_translator.h
diff --git a/src/gear/schema_list_translator.cc → src/rime/gear/schema_list_translator.cc b/src/gear/schema_list_translator.cc → src/rime/gear/schema_list_translator.cc
diff --git a/include/rime/gear/schema_list_translator.h → src/rime/gear/schema_list_translator.h b/include/rime/gear/schema_list_translator.h → src/rime/gear/schema_list_translator.h
diff --git a/src/gear/script_translator.cc → src/rime/gear/script_translator.cc b/src/gear/script_translator.cc → src/rime/gear/script_translator.cc
diff --git a/include/rime/gear/script_translator.h → src/rime/gear/script_translator.h b/include/rime/gear/script_translator.h → src/rime/gear/script_translator.h
diff --git a/src/gear/selector.cc → src/rime/gear/selector.cc b/src/gear/selector.cc → src/rime/gear/selector.cc
diff --git a/include/rime/gear/selector.h → src/rime/gear/selector.h b/include/rime/gear/selector.h → src/rime/gear/selector.h
diff --git a/src/gear/shape.cc → src/rime/gear/shape.cc b/src/gear/shape.cc → src/rime/gear/shape.cc
diff --git a/include/rime/gear/shape.h → src/rime/gear/shape.h b/include/rime/gear/shape.h → src/rime/gear/shape.h
diff --git a/src/gear/simplifier.cc → src/rime/gear/simplifier.cc b/src/gear/simplifier.cc → src/rime/gear/simplifier.cc
diff --git a/include/rime/gear/simplifier.h → src/rime/gear/simplifier.h b/include/rime/gear/simplifier.h → src/rime/gear/simplifier.h
diff --git a/src/gear/single_char_filter.cc → src/rime/gear/single_char_filter.cc b/src/gear/single_char_filter.cc → src/rime/gear/single_char_filter.cc
diff --git a/include/rime/gear/single_char_filter.h → src/rime/gear/single_char_filter.h b/include/rime/gear/single_char_filter.h → src/rime/gear/single_char_filter.h
diff --git a/src/gear/speller.cc → src/rime/gear/speller.cc b/src/gear/speller.cc → src/rime/gear/speller.cc
diff --git a/include/rime/gear/speller.h → src/rime/gear/speller.h b/include/rime/gear/speller.h → src/rime/gear/speller.h
diff --git a/src/gear/switch_translator.cc → src/rime/gear/switch_translator.cc b/src/gear/switch_translator.cc → src/rime/gear/switch_translator.cc
diff --git a/include/rime/gear/switch_translator.h → src/rime/gear/switch_translator.h b/include/rime/gear/switch_translator.h → src/rime/gear/switch_translator.h
diff --git a/src/gear/table_translator.cc → src/rime/gear/table_translator.cc b/src/gear/table_translator.cc → src/rime/gear/table_translator.cc
diff --git a/include/rime/gear/table_translator.h → src/rime/gear/table_translator.h b/include/rime/gear/table_translator.h → src/rime/gear/table_translator.h
diff --git a/src/gear/translator_commons.cc → src/rime/gear/translator_commons.cc b/src/gear/translator_commons.cc → src/rime/gear/translator_commons.cc
diff --git a/include/rime/gear/translator_commons.h → src/rime/gear/translator_commons.h b/include/rime/gear/translator_commons.h → src/rime/gear/translator_commons.h
diff --git a/src/gear/uniquifier.cc → src/rime/gear/uniquifier.cc b/src/gear/uniquifier.cc → src/rime/gear/uniquifier.cc
diff --git a/include/rime/gear/uniquifier.h → src/rime/gear/uniquifier.h b/include/rime/gear/uniquifier.h → src/rime/gear/uniquifier.h
diff --git a/src/gear/unity_table_encoder.cc → src/rime/gear/unity_table_encoder.cc b/src/gear/unity_table_encoder.cc → src/rime/gear/unity_table_encoder.cc
diff --git a/include/rime/gear/unity_table_encoder.h → src/rime/gear/unity_table_encoder.h b/include/rime/gear/unity_table_encoder.h → src/rime/gear/unity_table_encoder.h
diff --git a/src/key_event.cc → src/rime/key_event.cc b/src/key_event.cc → src/rime/key_event.cc
diff --git a/include/rime/key_event.h → src/rime/key_event.h b/include/rime/key_event.h → src/rime/key_event.h
diff --git a/src/key_table.cc → src/rime/key_table.cc b/src/key_table.cc → src/rime/key_table.cc
diff --git a/include/rime/key_table.h → src/rime/key_table.h b/include/rime/key_table.h → src/rime/key_table.h
diff --git a/src/lever/custom_settings.cc → src/rime/lever/custom_settings.cc b/src/lever/custom_settings.cc → src/rime/lever/custom_settings.cc
diff --git a/include/rime/lever/custom_settings.h → src/rime/lever/custom_settings.h b/include/rime/lever/custom_settings.h → src/rime/lever/custom_settings.h
diff --git a/src/lever/customizer.cc → src/rime/lever/customizer.cc b/src/lever/customizer.cc → src/rime/lever/customizer.cc
diff --git a/include/rime/lever/customizer.h → src/rime/lever/customizer.h b/include/rime/lever/customizer.h → src/rime/lever/customizer.h
diff --git a/src/lever/deployment_tasks.cc → src/rime/lever/deployment_tasks.cc b/src/lever/deployment_tasks.cc → src/rime/lever/deployment_tasks.cc
diff --git a/include/rime/lever/deployment_tasks.h → src/rime/lever/deployment_tasks.h b/include/rime/lever/deployment_tasks.h → src/rime/lever/deployment_tasks.h
diff --git a/src/lever/levers_module.cc → src/rime/lever/levers_module.cc b/src/lever/levers_module.cc → src/rime/lever/levers_module.cc
diff --git a/src/lever/switcher_settings.cc → src/rime/lever/switcher_settings.cc b/src/lever/switcher_settings.cc → src/rime/lever/switcher_settings.cc
diff --git a/include/rime/lever/switcher_settings.h → src/rime/lever/switcher_settings.h b/include/rime/lever/switcher_settings.h → src/rime/lever/switcher_settings.h
diff --git a/src/lever/user_dict_manager.cc → src/rime/lever/user_dict_manager.cc b/src/lever/user_dict_manager.cc → src/rime/lever/user_dict_manager.cc
diff --git a/include/rime/lever/user_dict_manager.h → src/rime/lever/user_dict_manager.h b/include/rime/lever/user_dict_manager.h → src/rime/lever/user_dict_manager.h
diff --git a/src/menu.cc → src/rime/menu.cc b/src/menu.cc → src/rime/menu.cc
diff --git a/include/rime/menu.h → src/rime/menu.h b/include/rime/menu.h → src/rime/menu.h
diff --git a/include/rime/messenger.h → src/rime/messenger.h b/include/rime/messenger.h → src/rime/messenger.h
diff --git a/src/module.cc → src/rime/module.cc b/src/module.cc → src/rime/module.cc
diff --git a/include/rime/module.h → src/rime/module.h b/include/rime/module.h → src/rime/module.h
diff --git a/include/rime/no_logging.h → src/rime/no_logging.h b/include/rime/no_logging.h → src/rime/no_logging.h
diff --git a/include/rime/processor.h → src/rime/processor.h b/include/rime/processor.h → src/rime/processor.h
diff --git a/src/registry.cc → src/rime/registry.cc b/src/registry.cc → src/rime/registry.cc
diff --git a/include/rime/registry.h → src/rime/registry.h b/include/rime/registry.h → src/rime/registry.h
diff --git a/src/schema.cc → src/rime/schema.cc b/src/schema.cc → src/rime/schema.cc
diff --git a/include/rime/schema.h → src/rime/schema.h b/include/rime/schema.h → src/rime/schema.h
diff --git a/src/segmentation.cc → src/rime/segmentation.cc b/src/segmentation.cc → src/rime/segmentation.cc
diff --git a/include/rime/segmentation.h → src/rime/segmentation.h b/include/rime/segmentation.h → src/rime/segmentation.h
diff --git a/include/rime/segmentor.h → src/rime/segmentor.h b/include/rime/segmentor.h → src/rime/segmentor.h
diff --git a/src/service.cc → src/rime/service.cc b/src/service.cc → src/rime/service.cc
diff --git a/include/rime/service.h → src/rime/service.h b/include/rime/service.h → src/rime/service.h
diff --git a/src/setup.cc → src/rime/setup.cc b/src/setup.cc → src/rime/setup.cc
diff --git a/include/rime/setup.h → src/rime/setup.h b/include/rime/setup.h → src/rime/setup.h
diff --git a/src/signature.cc → src/rime/signature.cc b/src/signature.cc → src/rime/signature.cc
diff --git a/include/rime/signature.h → src/rime/signature.h b/include/rime/signature.h → src/rime/signature.h
diff --git a/src/switcher.cc → src/rime/switcher.cc b/src/switcher.cc → src/rime/switcher.cc
diff --git a/include/rime/switcher.h → src/rime/switcher.h b/include/rime/switcher.h → src/rime/switcher.h
diff --git a/src/ticket.cc → src/rime/ticket.cc b/src/ticket.cc → src/rime/ticket.cc
diff --git a/include/rime/ticket.h → src/rime/ticket.h b/include/rime/ticket.h → src/rime/ticket.h
diff --git a/src/translation.cc → src/rime/translation.cc b/src/translation.cc → src/rime/translation.cc
diff --git a/include/rime/translation.h → src/rime/translation.h b/include/rime/translation.h → src/rime/translation.h
diff --git a/include/rime/translator.h → src/rime/translator.h b/include/rime/translator.h → src/rime/translator.h
diff --git a/include/rime_api.h → src/rime_api.h b/include/rime_api.h → src/rime_api.h
diff --git a/include/rime_levers_api.h → src/rime_levers_api.h b/include/rime_levers_api.h → src/rime_levers_api.h
diff --git a/travis-script.sh b/travis-script.sh
@@ -1,13 +1,7 @@
 #!/bin/bash
 
 if [[ "$TRAVIS_OS_NAME" == linux ]]; then
-  make debug
-  pushd debug-build/test
-  ./rime_test
-  popd
+  make test
 elif [[ "$TRAVIS_OS_NAME" == osx ]]; then
-  make -f Makefile.xcode debug
-  pushd xdebug/test
-  ./Debug/rime_test
-  popd
+  make -f Makefile.xcode test
 fi