github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: After 'Build package' errors are now correctly shown

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@12770 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2019-02-19 09:29:44 +00:00
parent 871136ad67
commit 700d4f9d8f
4 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
uppsrc/ide/Build.cpp
View file

@ -87,6 +87,7 @@ void Ide::PackageBuild()
String linkopt;
bool ok = BuildPackage(wspc, pi, 0, 1, mainconfigparam, Null, linkfile, immfile, linkopt);
EndBuilding(ok);
SetErrorEditor();
}
}

2
uppsrc/ide/Builders/Build.cpp
View file

@ -364,7 +364,7 @@ bool MakeBuild::BuildPackage(const Workspace& wspc, int pkindex, int pknumber, i
GetAllUses(wspc, pkindex, bm, mainparam, *host, *b),
GetAllLibraries(wspc, pkindex, bm, mainparam, *host, *b),
targetmode - 1);
target = b->target; // apple app bundel can change target
target = b->target; // apple app bundle can change target
Vector<String> errors = PickErrors();
host->DeleteFile(errors);
if(!ok || !errors.IsEmpty())

2
uppsrc/ide/ide.key
View file

@ -60,8 +60,6 @@ KEY(CLEAN, "Clean", 0)
KEY(REBUILDALL, "Rebuild All", 0)
KEY(CREATEMAKEFILE, "Create makefile", 0)
KEY(CLEANUPPOUT, "Clean UPPOUT", 0)
KEY(BUILDPACKAGE, "Build package", 0)
KEY(CLEANPACKAGE, "Clean package", 0)
KEY(FINDNEXTERROR, "Find next error", K_F4)
KEY(FINDPREVERROR, "Find previous error", K_SHIFT_F4)

7
uppsrc/ide/idebar.cpp
View file

@ -602,9 +602,12 @@ void Ide::BuildPackageMenu(Bar& menu)
{
int pi = GetPackageIndex();
bool b = !IdeIsDebugLock() && idestate == EDITING && pi >= 0 && pi < IdeWorkspace().GetCount();
menu.Add(b, AK_BUILDPACKAGE, THISBACK(PackageBuild))
String name;
if(b)
name = '\'' + IdeWorkspace()[pi] + '\'';
menu.Add(b, "Build package " + name, THISBACK(PackageBuild))
.Help("Build current package");
menu.Add(b, AK_CLEANPACKAGE, THISBACK(PackageClean))
menu.Add(b, "Clean package " + name, THISBACK(PackageClean))
.Help("Remove all intermediate files of the current package");
menu.MenuSeparator();
}