github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-21 22:04:56 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: gnome-terminal now has --window flag, umk: fixed to compile

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@14253 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2020-04-06 09:10:54 +00:00
parent cda282c80a
commit 866e4588c5
4 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
uppsrc/ide/Builders/Builders.h
View file

@ -163,9 +163,10 @@ void DeletePCHFile(const String& pch_file);
#ifdef PLATFORM_POSIX
void CreateBuildMethods();
String GetDefaultUppOut();
#endif
String GetDefaultUppOut();
INITIALIZE(GccBuilder)
INITIALIZE(MscBuilder)
INITIALIZE(JavaBuilder)

4
uppsrc/ide/Console.cpp
View file

@ -391,8 +391,8 @@ void Console::CheckEndGroup()
if(p < 0) {
if(group.count > 0) {
int duration = msecs(group.start_time);
String msg = NFormat("%s: %d file(s) built in %s, %d msecs / file, duration = %d msecs",
gname, group.count, PrintTime(duration), duration / group.count, duration);
String msg = NFormat("%s: %d file(s) built in %s, %d msecs / file",
gname, group.count, PrintTime(duration), duration / group.count);
msg << '\n';
spooled_output.Cat(msg);
if(console_lock < 0) {

2
uppsrc/ide/Core/Host.cpp
View file

@ -233,7 +233,7 @@ void LocalHost::Launch(const char *_cmdline, bool console)
String lc;
static const char *term[] = {
"/usr/bin/mate-terminal -x",
"/usr/bin/gnome-terminal -x",
"/usr/bin/gnome-terminal --window -x",
"/usr/bin/konsole -e",
"/usr/bin/xterm -e",
};

8
uppsrc/umk/Console.cpp
View file

@ -282,12 +282,8 @@ void Console::CheckEndGroup()
if(p < 0) {
if(group.count > 0) {
int duration = msecs(group.start_time);
String msg = NFormat("%s: %d file(s) built in %s, %d msecs / file, duration = %d msecs",
gname, group.count, PrintTime(group.msecs), group.msecs / group.count, duration);
if(processes.GetCount() > 1) {
int k = 100 * processes.GetCount() / (processes.GetCount() - 1);
msg << NFormat(", parallelization %d%%", minmax(k - group.msecs * k / max(group.raw_msecs, 1), 0, 100));
}
String msg = NFormat("%s: %d file(s) built in %s, %d msecs / file",
gname, group.count, PrintTime(group.msecs), group.msecs / group.count);
msg << '\n';
spooled_output.Cat(msg);
if(console_lock < 0) {