move elisp files in top directory and the server in its own directory

.gitignore

@@ -1,6 +1,3 @@
-/irony-server
-/tests/
-/utils/tests/
-/perso/
+/local-data/
 /build/
 /bin/

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "lib/SimpleJSON"]
-	path = lib/SimpleJSON
+[submodule "server/lib/SimpleJSON"]
+	path = server/lib/SimpleJSON
 	url = https://github.com/MJPA/SimpleJSON.git

.travis.yml

@@ -13,8 +13,8 @@ before_script:
   - cd build
 
 script:
-  - cmake ..
-  - make -k -j 4
+  - cmake ../server
+  - make -k -j4
   - ctest --output-on-failure 
 
 after_script:

CONTRIBUTING.md

@@ -88,39 +88,3 @@ private:
   std::string *ptr_;
 };
 ```
-
-## How to add a plugin
-
-Create a file named irony-PLUGIN_NAME.el
-
-This file should contain 2 methods taking no arguments:
-
-1. `irony-PLUGIN_NAME-enable` called by `irony-enable module-names` usually in
-   user configuration file. You can add a hook for on irony-mode if you need to
-   be active in each irony-mode buffer.
-
-2. `irony-PLUGIN_NAME-disable` called by `irony-disable module-names` usually in
-   user configuration file. If a hook was added during
-   `irony-PLUGIN_NAME-enable` you can remove it inside this function.
-
-
-Existing plugins such as *elisp/irony/ac.el* can serve as an example.
-
-Simplified code, just to get a basic understanding:
-
-~~~ el
-(defun irony-ac-setup ()
-  "Hook to run for `auto-complete-mode' when `irony-mode' is activated."
-  (add-to-list 'ac-sources 'ac-source-irony)
-  (define-key irony-mode-map [(control return)] 'ac-complete-irony))
-
-(defun irony-ac-enable ()
-  "Enable `auto-complete-mode' handling of `irony-mode' completion results."
-  (add-hook 'irony-mode-hook 'irony-ac-setup))
-
-(defun irony-ac-disable ()
-  "Disable `auto-complete-mode' handling of `irony-mode' completion results."
-  (remove-hook 'irony-mode-hook 'irony-ac-setup))
-~~~
-
-For more information look at the existing plugins or ask me.

server/CMakeLists.txt

@@ -1,47 +1,40 @@
-#
-# irony-server executable build file
-#
-find_package (LibClang REQUIRED)
-
-include_directories (${LIBCLANG_INCLUDE_DIRS})
-include_directories (${IRONY_UTILS_INCLUDES})
-include_directories (${CMAKE_CURRENT_SOURCE_DIR})
-
-#
-# irony-server executable
-#
-add_executable (irony-server
-  # Main sources
-  IPlugin.cpp
-  IPlugin.h
-  ClangString.cpp
-  ClangString.h
-  Server.cpp
-  Server.h
-  TUManager.cpp
-  TUManager.h
-  main.cpp
-
-  # "Built-in" plugins sources
-  plugins/CodeCompletion.cpp
-  plugins/CodeCompletion.h
-  plugins/SyntaxChecker.cpp
-  plugins/SyntaxChecker.h
-  plugins/CacheInvalidation.h
-  plugins/CacheInvalidation.cpp
-  plugins/CompileChecker.cpp
-  plugins/CompileChecker.h
-  )
+cmake_minimum_required(VERSION 2.8)
 
-add_dependencies (irony-server
-  # Dependencies
-  irony-utils
-  )
+project(IronyMode)
+
+set(CMAKE_MODULE_PATH
+  ${PROJECT_SOURCE_DIR}/cmake
+  ${PROJECT_SOURCE_DIR}/cmake/modules
+  ${CMAKE_MODULE_PATH})
+
+include(utils)
+
+check_for_in_source_build()
+release_as_default_build_type()
+enable_colored_diagnotics()
+
+if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+  add_compile_options_(-Wall -Wextra)
+endif()
+
+# libclang in non standard locations can cause some troubles.
+option(USE_RPATH "Enable rpath for shared libraries (such as libclang.so)." OFF)
+
+if (USE_RPATH)
+  set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+endif()
+
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
-target_link_libraries (irony-server
-  irony-utils
-  ${LIBCLANG_LIBRARIES}
+set(IRONY_UTILS_INCLUDES
+  ${PROJECT_SOURCE_DIR}/lib
+  ${PROJECT_SOURCE_DIR}/lib/SimpleJSON/src
   )
 
-install (TARGETS irony-server
-  RUNTIME DESTINATION ${PROJECT_SOURCE_DIR}/bin)
+add_subdirectory(lib)
+add_subdirectory(src)
+add_subdirectory(docs)
+enable_testing()
+add_subdirectory(test)

server/src/CMakeLists.txt

@@ -0,0 +1,46 @@
+#
+# irony-server executable build file
+#
+find_package (LibClang REQUIRED)
+
+include_directories (${LIBCLANG_INCLUDE_DIRS})
+include_directories (${IRONY_UTILS_INCLUDES})
+include_directories (${CMAKE_CURRENT_SOURCE_DIR})
+
+#
+# irony-server executable
+#
+add_executable (irony-server
+  # Main sources
+  IPlugin.cpp
+  IPlugin.h
+  ClangString.cpp
+  ClangString.h
+  Server.cpp
+  Server.h
+  TUManager.cpp
+  TUManager.h
+  main.cpp
+
+  # "Built-in" plugins sources
+  plugins/CodeCompletion.cpp
+  plugins/CodeCompletion.h
+  plugins/SyntaxChecker.cpp
+  plugins/SyntaxChecker.h
+  plugins/CacheInvalidation.h
+  plugins/CacheInvalidation.cpp
+  plugins/CompileChecker.cpp
+  plugins/CompileChecker.h
+  )
+
+add_dependencies (irony-server
+  # Dependencies
+  irony-utils
+  )
+
+target_link_libraries (irony-server
+  irony-utils
+  ${LIBCLANG_LIBRARIES}
+  )
+
+install (TARGETS irony-server DESTINATION bin)

test/elisp/test-config.el → server/test/elisp/test-config.el

@@ -6,7 +6,7 @@
 
 ;; load irony
 (unless (require 'irony nil t)
-  (let ((irony-dir (expand-file-name "../../elisp" test-dir)))
+  (let ((irony-dir (expand-file-name "../../.." test-dir)))
     (add-to-list 'load-path irony-dir)
     (require 'irony)))
 

test/elisp/test-irony-cdb.el → server/test/elisp/test-irony-cdb.el

@@ -4,8 +4,6 @@
 
 (require 'irony-cdb)
 
-(require 'json)
-
 (ert-deftest cdb/gen-clang-args/end-of-opts ()
   (should (not
            (irony-cdb-gen-clang-args '("--" "a.c" "b.c")))))
@@ -14,8 +12,8 @@
   "Test if the arguments are given back in the same order as they
 were given.
 
-An argument my be dependent of the previous one, we want to keep
-the order. -W"
+An argument may be dependent of the previous one, it's important
+to keep the ordering right."
   (let ((args '("-Wall" "-ferror-limit" "42" "-Wextra")))
     (should (equal
              args