zalox
/
jucipp
mirror of https://gitlab.com/cppit/jucipp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #137 from cppit/build_dir_fixed 

Build dir fixed
merge-requests/365/head
Ole Christian Eidheim 10 years ago
parent
a0f2bbfd26 006d7890f6
commit
ad13bceade
10 changed files with 120 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 25
      docs/install.md
  2. 43
      src/cmake.cc
  3. 2
      src/cmake.h
  4. 4
      src/config.cc
  5. 1
      src/config.h
  6. 4
      src/files.h
  7. 10
      src/notebook.cc
  8. 49
      src/source_clang.cc
  9. 6
      src/terminal.cc
  10. 20
      src/window.cc

25
docs/install.md
Unescape View File

@ -10,8 +10,9 @@ sudo apt-get install clang-format-3.6 || sudo apt-get install clang-format-3.5
Get juCi++ source, compile and install: Get juCi++ source, compile and install:
```sh ```sh
git clone --recursive https://github.com/cppit/jucipp git clone --recursive https://github.com/cppit/jucipp
cd jucipp mkdir jucipp/build
cmake . cd jucipp/build
cmake ..
make make
sudo make install sudo make install
``` ```
@ -25,8 +26,9 @@ sudo apt-get install git cmake make g++ libclang-3.6-dev clang-format-3.6 pkg-co
Get juCi++ source, compile and install: Get juCi++ source, compile and install:
```sh ```sh
git clone --recursive https://github.com/cppit/jucipp git clone --recursive https://github.com/cppit/jucipp
cd jucipp mkdir jucipp/build
cmake . cd jucipp/build
cmake ..
make make
sudo make install sudo make install
``` ```
@ -41,8 +43,9 @@ pacman -S git cmake make clang gtksourceviewmm boost aspell aspell-en
Get juCi++ source, compile and install: Get juCi++ source, compile and install:
```sh ```sh
git clone --recursive https://github.com/cppit/jucipp git clone --recursive https://github.com/cppit/jucipp
cd jucipp mkdir jucipp/build
cmake . cd jucipp/build
cmake ..
make make
# as root # as root
make install make install
@ -57,8 +60,9 @@ brew install cmake --with-clang llvm pkg-config boost homebrew/x11/gtksourceview
Get juCi++ source, compile and install: Get juCi++ source, compile and install:
```sh ```sh
git clone --recursive https://github.com/cppit/jucipp git clone --recursive https://github.com/cppit/jucipp
cd jucipp mkdir jucipp/build
cmake . cd jucipp/build
cmake ..
make make
make install make install
``` ```
@ -72,8 +76,9 @@ pacman -S git mingw-w64-x86_64-cmake make mingw-w64-x86_64-toolchain mingw-w64-x
Get juCi++ source, compile and install (replace `mingw64` with `mingw32` for 32-bit MSYS2 installs): Get juCi++ source, compile and install (replace `mingw64` with `mingw32` for 32-bit MSYS2 installs):
```sh ```sh
git clone --recursive https://github.com/cppit/jucipp git clone --recursive https://github.com/cppit/jucipp
cd jucipp mkdir jucipp/build
cmake -G"MSYS Makefiles" -DCMAKE_INSTALL_PREFIX=/mingw64 . cd jucipp/build
cmake -G"MSYS Makefiles" -DCMAKE_INSTALL_PREFIX=/mingw64 ..
make make
make install make install
``` ```

43
src/cmake.cc
Unescape View File

@ -33,19 +33,52 @@ CMake::CMake(const boost::filesystem::path &path) {
} }
if(!project_path.empty()) { if(!project_path.empty()) {
if(boost::filesystem::exists(project_path/"CMakeLists.txt") && !boost::filesystem::exists(project_path/"compile_commands.json")) auto default_build_path=get_default_build_path(project_path);
if(!default_build_path.empty() && !boost::filesystem::exists(default_build_path/"compile_commands.json"))
create_compile_commands(project_path); create_compile_commands(project_path);
} }
} }
boost::filesystem::path CMake::get_default_build_path(const boost::filesystem::path &path) {
boost::filesystem::path default_build_path=Config::get().terminal.default_build_path;
const std::string path_variable_project_directory_name="<project_directory_name>";
size_t pos=0;
auto default_build_path_string=default_build_path.string();
auto path_filename_string=path.filename().string();
while((pos=default_build_path_string.find(path_variable_project_directory_name, pos))!=std::string::npos) {
default_build_path_string.replace(pos, path_variable_project_directory_name.size(), path_filename_string);
pos+=path_filename_string.size();
}
if(pos!=0)
default_build_path=default_build_path_string;
if(default_build_path.is_relative())
default_build_path=path/default_build_path;
if(!boost::filesystem::exists(default_build_path)) {
boost::system::error_code ec;
boost::filesystem::create_directories(default_build_path, ec);
if(ec) {
Terminal::get().print("Error: could not create "+default_build_path.string()+": "+ec.message()+"\n", true);
return boost::filesystem::path();
}
}
return default_build_path;
}
bool CMake::create_compile_commands(const boost::filesystem::path &path) { bool CMake::create_compile_commands(const boost::filesystem::path &path) {
Dialog::Message message("Creating "+path.string()+"/compile_commands.json"); auto default_build_path=get_default_build_path(path);
auto exit_status=Terminal::get().process(Config::get().terminal.cmake_command+" . -DCMAKE_EXPORT_COMPILE_COMMANDS=ON", path); if(default_build_path.empty())
return false;
auto compile_commands_path=default_build_path/"compile_commands.json";
Dialog::Message message("Creating "+compile_commands_path.string());
auto exit_status=Terminal::get().process(Config::get().terminal.cmake_command+" "+
path.string()+" -DCMAKE_EXPORT_COMPILE_COMMANDS=ON", default_build_path);
message.hide(); message.hide();
if(exit_status==EXIT_SUCCESS) { if(exit_status==EXIT_SUCCESS) {
#ifdef _WIN32 //Temporary fix to MSYS2's libclang #ifdef _WIN32 //Temporary fix to MSYS2's libclang
auto compile_commands_path=path;
compile_commands_path+="/compile_commands.json";
auto compile_commands_file=filesystem::read(compile_commands_path); auto compile_commands_file=filesystem::read(compile_commands_path);
size_t pos=0; size_t pos=0;
while((pos=compile_commands_file.find("-I/", pos))!=std::string::npos) { while((pos=compile_commands_file.find("-I/", pos))!=std::string::npos) {

2
src/cmake.h
Unescape View File

@ -8,6 +8,7 @@ class CMake {
public: public:
CMake(const boost::filesystem::path &path); CMake(const boost::filesystem::path &path);
std::vector<std::pair<boost::filesystem::path, std::vector<std::string> > > get_functions_parameters(const std::string &name); std::vector<std::pair<boost::filesystem::path, std::vector<std::string> > > get_functions_parameters(const std::string &name);
static boost::filesystem::path get_default_build_path(const boost::filesystem::path &path);
static bool create_compile_commands(const boost::filesystem::path &path); static bool create_compile_commands(const boost::filesystem::path &path);
std::vector<boost::filesystem::path> paths; std::vector<boost::filesystem::path> paths;
@ -15,6 +16,7 @@ public:
boost::filesystem::path project_path; boost::filesystem::path project_path;
std::unordered_map<std::string, std::string> variables; std::unordered_map<std::string, std::string> variables;
private: private:
void read_files(); void read_files();
void remove_tabs(); void remove_tabs();
void remove_comments(); void remove_comments();

4
src/config.cc
Unescape View File

@ -36,7 +36,7 @@ void Config::load() {
retrieve_config(); retrieve_config();
} }
catch(const std::exception &e) { catch(const std::exception &e) {
::Terminal::get().print("Error reading "+config_json+": "+e.what()+"\n"); ::Terminal::get().print("Error: could not parse "+config_json+": "+e.what()+"\n", true);
std::stringstream ss; std::stringstream ss;
ss << configjson; ss << configjson;
boost::property_tree::read_json(ss, cfg); boost::property_tree::read_json(ss, cfg);
@ -84,6 +84,8 @@ void Config::retrieve_config() {
window.theme_variant=cfg.get<std::string>("gtk_theme.variant"); window.theme_variant=cfg.get<std::string>("gtk_theme.variant");
window.version = cfg.get<std::string>("version"); window.version = cfg.get<std::string>("version");
window.default_size = {cfg.get<int>("default_window_size.width"), cfg.get<int>("default_window_size.height")}; window.default_size = {cfg.get<int>("default_window_size.width"), cfg.get<int>("default_window_size.height")};
terminal.default_build_path=cfg.get<std::string>("project.default_build_path");
terminal.make_command=cfg.get<std::string>("project.make_command"); terminal.make_command=cfg.get<std::string>("project.make_command");
terminal.cmake_command=cfg.get<std::string>("project.cmake_command"); terminal.cmake_command=cfg.get<std::string>("project.cmake_command");
terminal.history_size=cfg.get<int>("terminal_history_size"); terminal.history_size=cfg.get<int>("terminal_history_size");

1
src/config.h
Unescape View File

@ -24,6 +24,7 @@ public:
class Terminal { class Terminal {
public: public:
std::string default_build_path;
std::string cmake_command; std::string cmake_command;
std::string make_command; std::string make_command;
std::string clang_format_command; std::string clang_format_command;

4
src/files.h
Unescape View File

@ -2,7 +2,7 @@
#define JUCI_FILES_H_ #define JUCI_FILES_H_
#include <string> #include <string>
#define JUCI_VERSION "1.0.0" #define JUCI_VERSION "1.0.1"
const std::string configjson = const std::string configjson =
"{\n" "{\n"
@ -107,6 +107,8 @@ const std::string configjson =
" \"close_tab\": \"<primary>w\"\n" " \"close_tab\": \"<primary>w\"\n"
" },\n" " },\n"
" \"project\": {\n" " \"project\": {\n"
" \"default_build_path_comment\": \"Use <project_directory_name> to insert the project top level directory name\",\n"
" \"default_build_path\": \"./build\",\n"
#ifdef _WIN32 #ifdef _WIN32
" \"cmake_command\": \"cmake -G\\\"MSYS Makefiles\\\" -DCMAKE_INSTALL_PREFIX="+JUCI_CMAKE_INSTALL_PREFIX+"\",\n" " \"cmake_command\": \"cmake -G\\\"MSYS Makefiles\\\" -DCMAKE_INSTALL_PREFIX="+JUCI_CMAKE_INSTALL_PREFIX+"\",\n"
#else #else

10
src/notebook.cc
Unescape View File

@ -110,7 +110,7 @@ void Notebook::open(const boost::filesystem::path &file_path) {
} }
} }
if(language && (language->get_id()=="chdr" || language->get_id()=="cpphdr" || language->get_id()=="c" || language->get_id()=="cpp" || language->get_id()=="objc")) { if(language && (language->get_id()=="chdr" || language->get_id()=="cpphdr" || language->get_id()=="c" || language->get_id()=="cpp" || language->get_id()=="objc")) {
if(boost::filesystem::exists(project_path.string()+"/CMakeLists.txt") && !boost::filesystem::exists(project_path.string()+"/compile_commands.json")) if(boost::filesystem::exists(project_path.string()+"/CMakeLists.txt") && !boost::filesystem::exists(CMake::get_default_build_path(project_path)/"compile_commands.json"))
CMake::create_compile_commands(project_path); CMake::create_compile_commands(project_path);
source_views.emplace_back(new Source::ClangView(file_path, project_path, language)); source_views.emplace_back(new Source::ClangView(file_path, project_path, language));
} }
@ -248,14 +248,14 @@ bool Notebook::save(int page) {
boost::filesystem::path project_path; boost::filesystem::path project_path;
if(view->file_path.filename()=="CMakeLists.txt") { if(view->file_path.filename()=="CMakeLists.txt") {
auto &directories=Directories::get(); auto &directories=Directories::get();
if(directories.cmake && directories.cmake->project_path!="" && view->file_path.generic_string().substr(0, directories.cmake->project_path.generic_string().size()+1)==directories.cmake->project_path.generic_string()+'/' && CMake::create_compile_commands(directories.cmake->project_path)) { if(directories.cmake && directories.cmake->project_path!="" && view->file_path.generic_string().substr(0, directories.cmake->project_path.generic_string().size()+1)==directories.cmake->project_path.generic_string()+'/') {
project_path=directories.cmake->project_path; if(CMake::create_compile_commands(directories.cmake->project_path))
project_path=directories.cmake->project_path;
} }
else { else {
CMake cmake(view->file_path.parent_path()); CMake cmake(view->file_path.parent_path());
if(cmake.project_path!="" && CMake::create_compile_commands(cmake.project_path)) { if(cmake.project_path!="" && CMake::create_compile_commands(cmake.project_path))
project_path=cmake.project_path; project_path=cmake.project_path;
}
} }
if(project_path!="") { if(project_path!="") {
for(auto source_view: source_views) { for(auto source_view: source_views) {

49
src/source_clang.cc
Unescape View File

@ -1,6 +1,7 @@
#include "source_clang.h" #include "source_clang.h"
#include "config.h" #include "config.h"
#include "terminal.h" #include "terminal.h"
#include "cmake.h"
namespace sigc { namespace sigc {
#ifndef SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE #ifndef SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE
@ -178,7 +179,7 @@ void Source::ClangViewParse::soft_reparse() {
} }
std::vector<std::string> Source::ClangViewParse::get_compilation_commands() { std::vector<std::string> Source::ClangViewParse::get_compilation_commands() {
clang::CompilationDatabase db(project_path.string()); clang::CompilationDatabase db(CMake::get_default_build_path(project_path).string());
clang::CompileCommands commands(file_path.string(), db); clang::CompileCommands commands(file_path.string(), db);
std::vector<clang::CompileCommand> cmds = commands.get_commands(); std::vector<clang::CompileCommand> cmds = commands.get_commands();
std::vector<std::string> arguments; std::vector<std::string> arguments;
@ -964,26 +965,44 @@ Source::ClangViewAutocomplete(file_path, project_path, language) {
auto_indent=[this]() { auto_indent=[this]() {
auto command=Config::get().terminal.clang_format_command; auto command=Config::get().terminal.clang_format_command;
unsigned indent_width; bool use_style_file=false;
std::string tab_style;
if(tab_char=='\t') { auto style_file_search_path=this->file_path.parent_path();
indent_width=tab_size*8; while(true) {
tab_style="UseTab: Always"; auto style_file=style_file_search_path/"CMakeLists.txt";
if(boost::filesystem::exists(style_file_search_path/".clang-format") || boost::filesystem::exists(style_file_search_path/"_clang-format")) {
use_style_file=true;
break;
}
if(style_file_search_path==style_file_search_path.root_directory())
break;
style_file_search_path=style_file_search_path.parent_path();
} }
if(use_style_file)
command+=" -style=file";
else { else {
indent_width=tab_size; unsigned indent_width;
tab_style="UseTab: Never"; std::string tab_style;
if(tab_char=='\t') {
indent_width=tab_size*8;
tab_style="UseTab: Always";
}
else {
indent_width=tab_size;
tab_style="UseTab: Never";
}
command+=" -style=\"{IndentWidth: "+std::to_string(indent_width);
command+=", "+tab_style;
command+=", "+std::string("AccessModifierOffset: -")+std::to_string(indent_width);
if(Config::get().source.clang_format_style!="")
command+=", "+Config::get().source.clang_format_style;
command+="}\"";
} }
command+=" -style=\"{IndentWidth: "+std::to_string(indent_width);
command+=", "+tab_style;
command+=", "+std::string("AccessModifierOffset: -")+std::to_string(indent_width);
if(Config::get().source.clang_format_style!="")
command+=", "+Config::get().source.clang_format_style;
command+="}\"";
std::stringstream stdin_stream(get_buffer()->get_text()), stdout_stream; std::stringstream stdin_stream(get_buffer()->get_text()), stdout_stream;
auto exit_status=Terminal::get().process(stdin_stream, stdout_stream, command); auto exit_status=Terminal::get().process(stdin_stream, stdout_stream, command, this->file_path.parent_path());
if(exit_status==0) { if(exit_status==0) {
get_source_buffer()->begin_user_action(); get_source_buffer()->begin_user_action();
auto iter=get_buffer()->get_insert()->get_iter(); auto iter=get_buffer()->get_insert()->get_iter();

6
src/terminal.cc
Unescape View File

@ -79,7 +79,7 @@ int Terminal::process(const std::string &command, const boost::filesystem::path
process=std::unique_ptr<Process>(new Process(command, path.string())); process=std::unique_ptr<Process>(new Process(command, path.string()));
if(process->get_id()<=0) { if(process->get_id()<=0) {
async_print("Error: Failed to run command: " + command + "\n", true); async_print("Error: failed to run command: " + command + "\n", true);
return -1; return -1;
} }
@ -101,7 +101,7 @@ int Terminal::process(std::istream &stdin_stream, std::ostream &stdout_stream, c
}, true); }, true);
if(process.get_id()<=0) { if(process.get_id()<=0) {
async_print("Error: Failed to run command: " + command + "\n", true); async_print("Error: failed to run command: " + command + "\n", true);
return -1; return -1;
} }
@ -132,7 +132,7 @@ void Terminal::async_process(const std::string &command, const boost::filesystem
auto pid=process->get_id(); auto pid=process->get_id();
if (pid<=0) { if (pid<=0) {
processes_mutex.unlock(); processes_mutex.unlock();
async_print("Error: Failed to run command: " + command + "\n", true); async_print("Error: failed to run command: " + command + "\n", true);
if(callback) if(callback)
callback(-1); callback(-1);
return; return;

20
src/window.cc
Unescape View File

@ -539,10 +539,19 @@ void Window::set_menu_actions() {
if(cmake.project_path!="") { if(cmake.project_path!="") {
if(executable_path!="") { if(executable_path!="") {
auto project_path=cmake.project_path;
auto default_build_path=CMake::get_default_build_path(project_path);
if(default_build_path.empty())
return;
compiling=true; compiling=true;
auto executable_path_string=executable_path.string();
size_t pos=executable_path_string.find(project_path.string());
if(pos!=std::string::npos) {
executable_path_string.replace(pos, project_path.string().size(), default_build_path.string());
executable_path=executable_path_string;
}
Terminal::get().print("Compiling and running "+executable_path.string()+"\n"); Terminal::get().print("Compiling and running "+executable_path.string()+"\n");
auto project_path=cmake.project_path; Terminal::get().async_process(Config::get().terminal.make_command, default_build_path, [this, executable_path, default_build_path](int exit_status){
Terminal::get().async_process(Config::get().terminal.make_command, cmake.project_path, [this, executable_path, project_path](int exit_status){
compiling=false; compiling=false;
if(exit_status==EXIT_SUCCESS) { if(exit_status==EXIT_SUCCESS) {
auto executable_path_spaces_fixed=executable_path.string(); auto executable_path_spaces_fixed=executable_path.string();
@ -554,7 +563,7 @@ void Window::set_menu_actions() {
} }
last_char=executable_path_spaces_fixed[c]; last_char=executable_path_spaces_fixed[c];
} }
Terminal::get().async_process(executable_path_spaces_fixed, project_path, [this, executable_path](int exit_status){ Terminal::get().async_process(executable_path_spaces_fixed, default_build_path, [this, executable_path](int exit_status){
Terminal::get().async_print(executable_path.string()+" returned: "+std::to_string(exit_status)+'\n'); Terminal::get().async_print(executable_path.string()+" returned: "+std::to_string(exit_status)+'\n');
}); });
} }
@ -579,9 +588,12 @@ void Window::set_menu_actions() {
return; return;
CMake cmake(cmake_path); CMake cmake(cmake_path);
if(cmake.project_path!="") { if(cmake.project_path!="") {
auto default_build_path=CMake::get_default_build_path(cmake.project_path);
if(default_build_path.empty())
return;
compiling=true; compiling=true;
Terminal::get().print("Compiling project "+cmake.project_path.string()+"\n"); Terminal::get().print("Compiling project "+cmake.project_path.string()+"\n");
Terminal::get().async_process(Config::get().terminal.make_command, cmake.project_path, [this](int exit_status){ Terminal::get().async_process(Config::get().terminal.make_command, default_build_path, [this](int exit_status){
compiling=false; compiling=false;
}); });
} }

Write Preview
Loading…
Cancel
Save