Browse Source

fixing bugs config term

master
oyvang 11 years ago
parent
commit
2e59a5f294
  1. 4
      juci/config.json
  2. 10
      juci/terminal.cc

4
juci/config.json

@ -58,9 +58,9 @@
}, },
"project": { "project": {
"compile_commands": [ "compile_commands": [
"rm -rf ./build", "rm -rf ./.build",
"mkdir build", "mkdir build",
"cmake -B./build -H.", "cmake -B./.build -H.",
"cd ./.build/; make" "cd ./.build/; make"
] ]
}, },

10
juci/terminal.cc

@ -38,6 +38,7 @@ void Terminal::Controller::SetFolderCommand( boost::filesystem::path
void Terminal::Controller::Compile(){ void Terminal::Controller::Compile(){
INFO("Terminal: Compile"); INFO("Terminal: Compile");
Terminal().get_buffer()->set_text(""); Terminal().get_buffer()->set_text("");
DEBUG("Terminal: Compile: running cmake command"); DEBUG("Terminal: Compile: running cmake command");
std::vector<std::string> commands = config().compile_commands(); std::vector<std::string> commands = config().compile_commands();
@ -45,13 +46,6 @@ void Terminal::Controller::Compile(){
ExecuteCommand(commands.at(it), "r"); ExecuteCommand(commands.at(it), "r");
} }
// ExecuteCommand("rm -rf ./.build", "r");
// ExecuteCommand("mkdir ./.build", "r");
// ExecuteCommand("cmake -B./build -H.", "r");
// if (ExistInConsole(cmake_sucsess)){
// DEBUG("Terminal: Compile: running make command");
// ExecuteCommand("cd ./.build/; make", "r");
// }
PrintMessage("\n"); PrintMessage("\n");
DEBUG("Terminal: Compile: compile done"); DEBUG("Terminal: Compile: compile done");
} }
@ -61,7 +55,7 @@ void Terminal::Controller::Run(std::string executable) {
PrintMessage("juCi++ execute: " + executable + "\n"); PrintMessage("juCi++ execute: " + executable + "\n");
DEBUG("Terminal: Compile: running run command: "); DEBUG("Terminal: Compile: running run command: ");
DEBUG_VAR(executable); DEBUG_VAR(executable);
ExecuteCommand("cd ./build/; ./"+executable, "r"); ExecuteCommand("cd ./.build/; ./"+executable, "r");
PrintMessage("\n"); PrintMessage("\n");
} }

Loading…
Cancel
Save