Merge branch 'master' of github.com:cppit/jucipp into python-refactor

Author: zalox

.gitmodules

@@ -4,7 +4,8 @@
 	branch = v1.0.3
 [submodule "libclangmm"]
 	path = libclangmm
-	url = https://github.com/cppit/libclangmm.git
+	url = https://github.com/cppit/libclangmm
+	branch = v0.9.5
 [submodule "pybind11"]
 	path = pybind11
-	url = https://github.com/pybind/pybind11.git
+	url = https://github.com/pybind/pybind11.git

CMakeLists.txt

@@ -1,10 +1,6 @@
 cmake_minimum_required (VERSION 2.8.4)
 
 set(project_name juci)
-#set(module juci_to_python_api)
-
-#set(lib_install_path "/usr/local/lib/python2.7/dist-packages/")
-
 project (${project_name})
 
 add_subdirectory("src")

docs/install.md

@@ -6,6 +6,7 @@
     - [Debian stable/Linux Mint Debian Edition](#debian-stablelinux-mint-debian-edition)
     - [Arch Linux](#arch-linux)
     - [Fedora 23](#fedora-23)
+    - [Mageia 5](#mageia-5)
   - OS X
     - [Homebrew](#os-x-with-homebrew-httpbrewsh)
   - Windows
@@ -89,6 +90,33 @@ make
 sudo make install
 ```
 
+## Mageia 5
+
+**Mageia doesn't support LLDB, but you can compile without debug support.**
+
+Install dependencies:
+
+32-bit:
+
+```sh
+sudo urpmi git cmake make gcc-c++ clang libclang-devel libboost-devel libgtkmm3.0-devel libgtksourceviewmm3.0-devel libaspell-devel aspell-en
+```
+
+64-bit:
+```sh
+sudo urpmi git cmake make gcc-c++ clang lib64clang-devel lib64boost-devel lib64gtkmm3.0-devel lib64gtksourceviewmm3.0-devel lib64aspell-devel aspell-en
+```
+
+Get juCi++ source, compile and install:
+```sh
+git clone --recursive https://github.com/cppit/jucipp
+mkdir jucipp/build
+cd jucipp/build
+cmake -DCMAKE_CXX_COMPILER=g++ ..
+make
+sudo make install
+```
+
 ## OS X with Homebrew (http://brew.sh/)
 **Installing llvm may take some time, and you need to follow the lldb code signing instructions. For an easier dependency install, but without debug support, remove `--with-lldb` below.**
 

src/CMakeLists.txt

@@ -25,9 +25,12 @@ if(MSYS)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMSYS_PROCESS_USE_SH")
 endif()
 
-INCLUDE(FindPkgConfig)
-
 find_package(LibClang REQUIRED)
+find_package(Boost 1.54 COMPONENTS thread log regex system filesystem REQUIRED)
+find_package(ASPELL REQUIRED)
+set(LIBCLANGMM_INCLUDE_DIR ../libclangmm/src)
+set(TINY_PROCESS_INCLUDE_DIR ../tiny-process-library)
+
 string(REPLACE libclang liblldb LIBLLDB_LIBRARIES "${LIBCLANG_LIBRARIES}")
 if(EXISTS "${LIBLLDB_LIBRARIES}")
   set(LIBLLDB_FOUND TRUE)
@@ -41,129 +44,101 @@ else()
   set(LIBLLDB_LIBRARIES "")
   message("liblldb not found. Building juCi++ without debugging support")
 endif()
-#find_package(PythonLibs 2.7)
-
-#find_package(Boost 1.55 COMPONENTS python thread log system filesystem REQUIRED)
-find_package(Boost 1.54 COMPONENTS thread log system filesystem regex REQUIRED)
-
-pkg_check_modules(GTKMM gtkmm-3.0 REQUIRED) # The name GTKMM is set here for the variables abouve
 
+include(FindPkgConfig)
+pkg_check_modules(GTKMM gtkmm-3.0 REQUIRED)
 pkg_check_modules(GTKSVMM gtksourceviewmm-3.0 REQUIRED)
 
-find_package(ASPELL REQUIRED)
+set(global_includes
+   ${Boost_INCLUDE_DIRS}
+   ${GTKMM_INCLUDE_DIRS}
+   ${GTKSVMM_INCLUDE_DIRS}
+   ${LIBCLANG_INCLUDE_DIRS}
+   ${LIBCLANGMM_INCLUDE_DIR}
+   ${ASPELL_INCLUDE_DIR}
+   ${TINY_PROCESS_INCLUDE_DIR}
+)
 
-set(source_files juci.h
-    juci.cc	
-    menu.h
-    menu.cc
-    source.h
-    source.cc
-    source_clang.h
-    source_clang.cc
-    selectiondialog.h
-    selectiondialog.cc
-    config.h
+set(global_libraries
+  ${LIBCLANG_LIBRARIES}
+  ${GTKMM_LIBRARIES}
+  ${GTKSVMM_LIBRARIES}
+  ${Boost_LIBRARIES}
+  ${ASPELL_LIBRARIES}
+  ${LIBLLDB_LIBRARIES}
+)
+
+set(project_files
+    cmake.cc
+    cmake.h
     config.cc
-    filesystem.h
-    filesystem.cc
-    window.cc
-    window.h
+    config.h
+    dialogs.cc
     dialogs.h
-#    api.h
-#    api.cc
+    directories.cc
+    directories.h
+    dispatcher.cc
+    dispatcher.h
+    entrybox.cc
+    entrybox.h
+    files.h
+    filesystem.cc
+    filesystem.h
+    juci.cc
+    juci.h
+    logging.h
+    menu.cc
+    menu.h
     notebook.cc
     notebook.h
-    entrybox.h
-    entrybox.cc
-    directories.h
-    directories.cc
-    terminal.h
-    terminal.cc
-    tooltips.h
-    tooltips.cc
-    cmake.h
-    cmake.cc
-    dialogs.cc
-    project.h
     project.cc
+    project.h
     project_build.h
     project_build.cc
-    dispatcher.h
-    dispatcher.cc
-    
+    selectiondialog.cc
+    selectiondialog.h
+    source.cc
+    source.h
+    source_clang.cc
+    source_clang.h
+    terminal.cc
+    terminal.h
+    tooltips.cc
+    tooltips.h
+    window.cc
+    window.h
+
     ../libclangmm/src/CodeCompleteResults.cc
     ../libclangmm/src/CompilationDatabase.cc
     ../libclangmm/src/CompileCommand.cc     
     ../libclangmm/src/CompileCommands.cc    
     ../libclangmm/src/CompletionString.cc   
     ../libclangmm/src/Cursor.cc
+    ../libclangmm/src/Diagnostic.cc
     ../libclangmm/src/Index.cc
     ../libclangmm/src/SourceLocation.cc
     ../libclangmm/src/SourceRange.cc
     ../libclangmm/src/Token.cc
     ../libclangmm/src/Tokens.cc
     ../libclangmm/src/TranslationUnit.cc
-    ../libclangmm/src/Diagnostic.cc
     ../libclangmm/src/Utility.cc
-    
+
     ../tiny-process-library/process.cpp)
 
 if(LIBLLDB_FOUND)
-  list(APPEND source_files debug_clang.h debug_clang.cc)
+  list(APPEND project_files debug_clang.h debug_clang.cc)
 endif()
 
 if(MSYS)
-  list(APPEND source_files dialogs_unix.cc) #dialogs_win.cc does not work any more because of missing SHCreateItemFromParsingName
-  list(APPEND source_files ../tiny-process-library/process_win.cpp)
+  list(APPEND project_files dialogs_unix.cc ../tiny-process-library/process_win.cpp)
 else()
-  list(APPEND source_files dialogs_unix.cc)
-  list(APPEND source_files ../tiny-process-library/process_unix.cpp)
+  list(APPEND project_files dialogs_unix.cc ../tiny-process-library/process_unix.cpp)
 endif()
 
-add_executable(${project_name} ${source_files})
-
-#  add_library(${module} SHARED
-#    api
-#    api_ext)
-
-include_directories(
-  ${Boost_INCLUDE_DIRS}
-#    ${PYTHON_INCLUDE_DIRS}
-  ${GTKMM_INCLUDE_DIRS}
-  ${GTKSVMM_INCLUDE_DIRS}
-  ${LIBCLANG_INCLUDE_DIRS}
-  ${ASPELL_INCLUDE_DIR}
-  ../libclangmm/src
-  ../tiny-process-library
-)
-
-link_directories(
-  ${GTKMM_LIBRARY_DIRS}
-  ${GTKSVMM_LIBRARY_DIRS}
-  ${Boost_LIBRARY_DIRS}
-#    ${PYTHON_INCLUDE_DIRS}
-  ${LIBCLANG_LIBRARY_DIRS}
-)
-
-#  set_target_properties(${module}
-#    PROPERTIES PREFIX ""
-#    LIBRARY_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/lib/")
-
-#  target_link_libraries(${module} ${PYTHON_LIBRARIES} ${Boost_LIBRARIES})
-#  target_link_libraries(${module} ${Boost_LIBRARIES})
-
-target_link_libraries(${project_name}
-  ${LIBCLANG_LIBRARIES}
-  ${GTKMM_LIBRARIES}
-  ${GTKSVMM_LIBRARIES}
-  ${Boost_LIBRARIES}
-  ${ASPELL_LIBRARIES}
-  ${LIBLLDB_LIBRARIES}
-  #${PYTHON_LIBRARIES}
-)
+include_directories(${global_includes})
+add_executable(${project_name} ${project_files})
+target_link_libraries(${project_name} ${global_libraries})
 
-#  install(TARGETS ${project_name} ${module}
 install(TARGETS ${project_name}
   RUNTIME DESTINATION bin
-#    LIBRARY DESTINATION ${lib_install_path}
 )

src/config.cc

@@ -94,18 +94,22 @@ void Config::retrieve_config() {
   window.version = cfg.get<std::string>("version");
   window.default_size = {cfg.get<int>("default_window_size.width"), cfg.get<int>("default_window_size.height")};
 
-  project.save_on_compile_or_run=cfg.get<bool>("project.save_on_compile_or_run");
   project.default_build_path=cfg.get<std::string>("project.default_build_path");
   project.debug_build_path=cfg.get<std::string>("project.debug_build_path");
   project.make_command=cfg.get<std::string>("project.make_command");
   project.cmake_command=cfg.get<std::string>("project.cmake_command");
+  project.save_on_compile_or_run=cfg.get<bool>("project.save_on_compile_or_run");
+  project.clear_terminal_on_compile=cfg.get<bool>("project.clear_terminal_on_compile");
 
-  terminal.history_size=cfg.get<int>("terminal_history_size");
+  terminal.history_size=cfg.get<int>("terminal.history_size");
+  terminal.font=cfg.get<std::string>("terminal.font");
   terminal.clang_format_command="clang-format";
 #ifdef __linux
   if(terminal.clang_format_command=="clang-format" &&
      !boost::filesystem::exists("/usr/bin/clang-format") && !boost::filesystem::exists("/usr/local/bin/clang-format")) {
-    if(boost::filesystem::exists("/usr/bin/clang-format-3.7"))
+    if(boost::filesystem::exists("/usr/bin/clang-format-3.8"))
+      terminal.clang_format_command="/usr/bin/clang-format-3.8";
+    else if(boost::filesystem::exists("/usr/bin/clang-format-3.7"))
       terminal.clang_format_command="/usr/bin/clang-format-3.7";
     else if(boost::filesystem::exists("/usr/bin/clang-format-3.6"))
       terminal.clang_format_command="/usr/bin/clang-format-3.6";
@@ -115,26 +119,40 @@ void Config::retrieve_config() {
 #endif
 }
 
-bool Config::check_config_file(const boost::property_tree::ptree &default_cfg, std::string parent_path) {
+bool Config::add_missing_nodes(const boost::property_tree::ptree &default_cfg, std::string parent_path) {
   if(parent_path.size()>0)
     parent_path+=".";
-  bool exists=true;
+  bool unchanged=true;
   for(auto &node: default_cfg) {
     auto path=parent_path+node.first;
     try {
       cfg.get<std::string>(path);
     }
     catch(const std::exception &e) {
       cfg.add(path, node.second.data());
-      exists=false;
+      unchanged=false;
     }
+    unchanged&=add_missing_nodes(node.second, path);
+  }
+  return unchanged;
+}
+
+bool Config::remove_deprecated_nodes(const boost::property_tree::ptree &default_cfg, boost::property_tree::ptree &config_cfg, std::string parent_path) {
+  if(parent_path.size()>0)
+    parent_path+=".";
+  bool unchanged=true;
+  for(auto &node: config_cfg) {
+    auto path=parent_path+node.first;
     try {
-      exists&=check_config_file(node.second, path);
+      default_cfg.get<std::string>(path);
+      unchanged&=remove_deprecated_nodes(default_cfg, node.second, path);
     }
     catch(const std::exception &e) {
+      config_cfg.erase(node.first);
+      unchanged=false;
     }
   }
-  return exists;
+  return unchanged;
 }
 
 void Config::update_config_file() {
@@ -156,10 +174,10 @@ void Config::update_config_file() {
     std::cerr << "Error reading json-file: " << e.what() << std::endl;
     cfg_ok=false;
   }
-  cfg_ok&=check_config_file(default_cfg);
-  if(!cfg_ok) {
+  cfg_ok&=add_missing_nodes(default_cfg);
+  cfg_ok&=remove_deprecated_nodes(default_cfg, cfg);
+  if(!cfg_ok)
     boost::property_tree::write_json((home/"config"/"config.json").string(), cfg);
-  }
 }
 
 void Config::get_source() {

src/config.h

@@ -26,6 +26,7 @@ class Config {
   public:
     std::string clang_format_command;
     int history_size;
+    std::string font;
 
 #ifdef _WIN32
     boost::filesystem::path msys2_mingw_path;
@@ -39,6 +40,7 @@ class Config {
     std::string cmake_command;
     std::string make_command;
     bool save_on_compile_or_run;
+    bool clear_terminal_on_compile;
   };
 
   class Source {
@@ -90,7 +92,8 @@ class Config {
 private:
   void find_or_create_config_files();
   void retrieve_config();
-  bool check_config_file(const boost::property_tree::ptree &default_cfg, std::string parent_path="");
+  bool add_missing_nodes(const boost::property_tree::ptree &default_cfg, std::string parent_path="");
+  bool remove_deprecated_nodes(const boost::property_tree::ptree &default_cfg, boost::property_tree::ptree &config_cfg, std::string parent_path="");
   void update_config_file();
   void get_source();