From 700d4f9d8f26e188ababe29813db98ea8fa0d3df Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Tue, 19 Feb 2019 09:29:44 +0000
Subject: [PATCH] ide: After 'Build package' errors are now correctly shown

git-svn-id: svn://ultimatepp.org/upp/trunk@12770 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/ide/Build.cpp          | 1 +
 uppsrc/ide/Builders/Build.cpp | 2 +-
 uppsrc/ide/ide.key            | 2 --
 uppsrc/ide/idebar.cpp         | 7 +++++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/uppsrc/ide/Build.cpp b/uppsrc/ide/Build.cpp
index b82c53f7d..5a5dcc385 100644
--- a/uppsrc/ide/Build.cpp
+++ b/uppsrc/ide/Build.cpp
@@ -87,6 +87,7 @@ void Ide::PackageBuild()
 		String linkopt;
 		bool ok = BuildPackage(wspc, pi, 0, 1, mainconfigparam, Null, linkfile, immfile, linkopt);
 		EndBuilding(ok);
+		SetErrorEditor();
 	}
 }
 
diff --git a/uppsrc/ide/Builders/Build.cpp b/uppsrc/ide/Builders/Build.cpp
index 7108e71f0..d7a094626 100644
--- a/uppsrc/ide/Builders/Build.cpp
+++ b/uppsrc/ide/Builders/Build.cpp
@@ -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())
diff --git a/uppsrc/ide/ide.key b/uppsrc/ide/ide.key
index e18ca05b9..412dcae5e 100644
--- a/uppsrc/ide/ide.key
+++ b/uppsrc/ide/ide.key
@@ -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)
 
diff --git a/uppsrc/ide/idebar.cpp b/uppsrc/ide/idebar.cpp
index c2def08d5..36ff2b571 100644
--- a/uppsrc/ide/idebar.cpp
+++ b/uppsrc/ide/idebar.cpp
@@ -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();
 }