From 2e59a5f294579f3c6efe8829ff707a61927024fd Mon Sep 17 00:00:00 2001 From: oyvang Date: Mon, 18 May 2015 11:53:14 +0200 Subject: [PATCH] fixing bugs config term --- juci/config.json | 4 ++-- juci/terminal.cc | 10 ++-------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/juci/config.json b/juci/config.json index e4dc14b..a9553f6 100644 --- a/juci/config.json +++ b/juci/config.json @@ -58,9 +58,9 @@ }, "project": { "compile_commands": [ - "rm -rf ./build", + "rm -rf ./.build", "mkdir build", - "cmake -B./build -H.", + "cmake -B./.build -H.", "cd ./.build/; make" ] }, diff --git a/juci/terminal.cc b/juci/terminal.cc index 52cdcdc..85f9047 100644 --- a/juci/terminal.cc +++ b/juci/terminal.cc @@ -38,6 +38,7 @@ void Terminal::Controller::SetFolderCommand( boost::filesystem::path void Terminal::Controller::Compile(){ INFO("Terminal: Compile"); + Terminal().get_buffer()->set_text(""); DEBUG("Terminal: Compile: running cmake command"); std::vector commands = config().compile_commands(); @@ -45,13 +46,6 @@ void Terminal::Controller::Compile(){ 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"); DEBUG("Terminal: Compile: compile done"); } @@ -61,7 +55,7 @@ void Terminal::Controller::Run(std::string executable) { PrintMessage("juCi++ execute: " + executable + "\n"); DEBUG("Terminal: Compile: running run command: "); DEBUG_VAR(executable); - ExecuteCommand("cd ./build/; ./"+executable, "r"); + ExecuteCommand("cd ./.build/; ./"+executable, "r"); PrintMessage("\n"); }