Skip to content
This repository has been archived by the owner on Jun 25, 2020. It is now read-only.

Commit

Permalink
feature: wip
Browse files Browse the repository at this point in the history
  • Loading branch information
Jørgen Lien Sellæg authored and zalox committed Feb 18, 2017
1 parent 16cf198 commit b285d3d
Show file tree
Hide file tree
Showing 8 changed files with 480 additions and 173 deletions.
2 changes: 1 addition & 1 deletion docs/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ make install

Install dependencies (replace `x86_64` with `i686` for 32-bit MSYS2 installs):
```sh
pacman -S git mingw-w64-x86_64-cmake make mingw-w64-x86_64-toolchain mingw-w64-x86_64-clang mingw-w64-x86_64-gtkmm3 mingw-w64-x86_64-gtksourceviewmm3 mingw-w64-x86_64-boost mingw-w64-x86_64-aspell mingw-w64-x86_64-aspell-en mingw-w64-x86_64-libgit2 mingw-w64-x86_64-universal-ctags-git
pacman -S git mingw-w64-x86_64-cmake make mingw-w64-x86_64-toolchain mingw-w64-x86_64-clang mingw-w64-x86_64-gtkmm3 mingw-w64-x86_64-gtksourceviewmm3 mingw-w64-x86_64-boost mingw-w64-x86_64-aspell mingw-w64-x86_64-aspell-en mingw-w64-x86_64-gobject-introspection mingw-w64-x86_64-pygobject-devel mingw-w64-x86_64-python3-gobject mingw-w64-x86_64-libgit2 mingw-w64-x86_64-universal-ctags-git
```

Note that juCi++ must be built and run in a MinGW Shell (for instance MinGW-w64 Win64 Shell).
Expand Down
2 changes: 1 addition & 1 deletion pybind11
Submodule pybind11 updated 184 files
6 changes: 3 additions & 3 deletions src/config.cc
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ void Config::find_or_create_config_files() {
auto config_json = config_dir/"config.json";

boost::filesystem::create_directories(config_dir); // io exp captured by calling method
boost::filesystem::create_directories(home/"plugins");
boost::filesystem::create_directories(home_juci_path/"plugins");

if (!boost::filesystem::exists(config_json))
filesystem::write(config_json, default_config_file);
Expand Down Expand Up @@ -118,8 +118,8 @@ void Config::retrieve_config() {
}
}
#endif
python.plugin_directory=cfg.get<std::string>("python.plugin_directory",(home/"plugins").string());
python.site_packages=cfg.get<std::string>("python.site_packages","/usr/lib/python3.5/site-packages");
python.plugin_directory=cfg.get<std::string>("python.plugin_directory",(home_juci_path/"plugins").string());
python.site_packages=cfg.get<std::string>("python.site_packages","");
}

bool Config::add_missing_nodes(const boost::property_tree::ptree &default_cfg, std::string parent_path) {
Expand Down
Loading

0 comments on commit b285d3d

Please sign in to comment.