Browse Source

Minor cleanup of build valid checks

pipelines/235045657
eidheim 5 years ago
parent
commit
7be97ad465
  1. 12
      src/project.cpp

12
src/project.cpp

@ -362,12 +362,12 @@ void Project::LLDB::debug_start() {
auto view = Notebook::get().get_current_view(); auto view = Notebook::get().get_current_view();
*run_arguments = build->get_executable(view ? view->file_path : Directories::get().path).string(); *run_arguments = build->get_executable(view ? view->file_path : Directories::get().path).string();
if(run_arguments->empty()) { if(run_arguments->empty()) {
if(build->is_valid()) { if(!build->is_valid())
Terminal::get().print("\e[31mError\e[m: build folder no longer valid, please rebuild project.\n", true);
else {
Terminal::get().print("\e[33mWarning\e[m: could not find executable.\n"); Terminal::get().print("\e[33mWarning\e[m: could not find executable.\n");
Terminal::get().print("\e[32mSolution\e[m: either use Project Set Run Arguments, or open a source file within a directory where an executable is defined.\n"); Terminal::get().print("\e[32mSolution\e[m: either use Project Set Run Arguments, or open a source file within a directory where an executable is defined.\n");
} }
else
Terminal::get().print("\e[31mError\e[m: build folder no longer valid, please rebuild project.\n", true);
return; return;
} }
size_t pos = run_arguments->find(default_build_path.string()); size_t pos = run_arguments->find(default_build_path.string());
@ -874,12 +874,12 @@ void Project::Clang::compile_and_run() {
auto view = Notebook::get().get_current_view(); auto view = Notebook::get().get_current_view();
auto executable = build->get_executable(view ? view->file_path : Directories::get().path); auto executable = build->get_executable(view ? view->file_path : Directories::get().path);
if(executable.empty()) { if(executable.empty()) {
if(build->is_valid()) { if(!build->is_valid())
Terminal::get().print("\e[31mError\e[m: build folder no longer valid, please rebuild project.\n", true);
else {
Terminal::get().print("\e[33mWarning\e[m: could not find executable.\n"); Terminal::get().print("\e[33mWarning\e[m: could not find executable.\n");
Terminal::get().print("\e[32mSolution\e[m: either use Project Set Run Arguments, or open a source file within a directory where an executable is defined.\n"); Terminal::get().print("\e[32mSolution\e[m: either use Project Set Run Arguments, or open a source file within a directory where an executable is defined.\n");
} }
else
Terminal::get().print("\e[31mError\e[m: build folder no longer valid, please rebuild project.\n", true);
return; return;
} }
arguments = filesystem::escape_argument(filesystem::get_short_path(executable).string()); arguments = filesystem::escape_argument(filesystem::get_short_path(executable).string());

Loading…
Cancel
Save