Merge pull request #120 from rime/test

修改構建腳本：make test 運行測試

Author: lotem

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")
 

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)
+