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

Commit b019550

Browse files
Jørgen Lien Sellægzalox
Jørgen Lien Sellæg
authored andcommitted
no longer fails on empty modulenames
1 parent 6d8895e commit b019550

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

docs/install.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ make install
138138

139139
Install dependencies (replace `x86_64` with `i686` for 32-bit MSYS2 installs):
140140
```sh
141-
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
141+
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
142142
```
143143

144144
Note that juCi++ must be built and run in a MinGW Shell (for instance MinGW-w64 Win64 Shell).

src/python_interpreter.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ inline pybind11::module pyobject_from_gobj(gpointer ptr){
2727
Python::Interpreter::Interpreter(){
2828
#ifdef _WIN32
2929
auto root_path=Config::get().terminal.msys2_mingw_path;
30-
append_path(root_path/"include/python3.5m");
31-
append_path(root_path/"lib/python3.5");
30+
add_path(root_path/"include/python3.5m");
31+
add_path(root_path/"lib/python3.5");
3232
long long unsigned size = 0L;
3333
#else
3434
long unsigned size = 0L;
@@ -95,7 +95,7 @@ Python::Interpreter::Interpreter(){
9595
for(boost::filesystem::directory_iterator it(plugin_path);it!=end_it;it++){
9696
auto module_name=it->path().stem().string();
9797
if(module_name.empty())
98-
break;
98+
continue;
9999
auto is_directory=boost::filesystem::is_directory(it->path());
100100
auto has_py_extension=it->path().extension()==".py";
101101
auto is_pycache=module_name=="__pycache__";

0 commit comments

Comments
 (0)