From cececa665cad5cda0e06d51317e71aefce0e0fed Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sun, 13 Dec 2020 15:56:21 +0000
Subject: [PATCH] ide: Developing upphub

git-svn-id: svn://ultimatepp.org/upp/trunk@15589 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/ide/Builders/Build.cpp |  7 +------
 uppsrc/ide/Builders/Build.h   |  2 +-
 uppsrc/ide/Core/Host.cpp      | 10 ++++++++++
 uppsrc/ide/Core/Host.h        |  1 +
 uppsrc/ide/Diff.cpp           |  2 +-
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/uppsrc/ide/Builders/Build.cpp b/uppsrc/ide/Builders/Build.cpp
index 4a9688db1..3f99c68fe 100644
--- a/uppsrc/ide/Builders/Build.cpp
+++ b/uppsrc/ide/Builders/Build.cpp
@@ -93,7 +93,7 @@ String NoCr(const char *s)
 	return out;
 }
 
-void MakeBuild::CreateHost(Host& host, bool darkmode, bool disable_uhd, const VectorMap<String, String>& add_to_env)
+void MakeBuild::CreateHost(Host& host, bool darkmode, bool disable_uhd)
 {
 	SetupDefaultMethod();
 	VectorMap<String, String> bm = GetMethodVars(method);
@@ -125,11 +125,6 @@ void MakeBuild::CreateHost(Host& host, bool darkmode, bool disable_uhd, const Ve
 			LDUMP(env[i]);
 			host.environment << env.GetKey(i) << '=' << env[i] << '\0';
 		}
-		for(int i = 0; i < add_to_env.GetCount(); i++) {
-			LDUMP(add_to_env.GetKey(i));
-			LDUMP(add_to_env[i]);
-			host.environment << add_to_env.GetKey(i) << '=' << add_to_env[i] << '\0';
-		}
 		host.environment.Cat(0);
 		host.cmdout = &cmdout;
 	}
diff --git a/uppsrc/ide/Builders/Build.h b/uppsrc/ide/Builders/Build.h
index c1d66a965..3fdacdd1f 100644
--- a/uppsrc/ide/Builders/Build.h
+++ b/uppsrc/ide/Builders/Build.h
@@ -67,7 +67,7 @@ public:
 	
 	bool         makefile_svn_revision = true;
 
-	void CreateHost(Host& host, bool darkmode = false, bool disable_uhd = false, const VectorMap<String, String>& add_to_env = VectorMap<String, String>());
+	void CreateHost(Host& host, bool darkmode = false, bool disable_uhd = false);
 
 	const TargetMode& GetTargetMode();
 	Index<String> PackageConfig(const Workspace& wspc, int package, const VectorMap<String, String>& bm,
diff --git a/uppsrc/ide/Core/Host.cpp b/uppsrc/ide/Core/Host.cpp
index c675d7602..b98d08f82 100644
--- a/uppsrc/ide/Core/Host.cpp
+++ b/uppsrc/ide/Core/Host.cpp
@@ -13,6 +13,16 @@ String Host::GetEnvironment()
 	return environment;
 }
 
+void Host::AddEnvironment(const char *id, const char *value)
+{
+	bool b = *environment;
+	if(b)
+		environment.Trim(environment.GetCount() - 1);
+	environment << id << '=' << value << '\0';
+	if(b)
+		environment << '\0';
+}
+
 Vector<Host::FileInfo> Host::GetFileInfo(const Vector<String>& path)
 {
 	Vector<FileInfo> fi;
diff --git a/uppsrc/ide/Core/Host.h b/uppsrc/ide/Core/Host.h
index 8abf63cf4..c119ab4fe 100644
--- a/uppsrc/ide/Core/Host.h
+++ b/uppsrc/ide/Core/Host.h
@@ -19,6 +19,7 @@ struct Host : LocalProcess {
 	Host();
 	
 	String                GetEnvironment();
+	void                  AddEnvironment(const char *id, const char *value);
 	Vector<FileInfo>      GetFileInfo(const Vector<String>& path);
 
 	void                  ChDir(const String& path);
diff --git a/uppsrc/ide/Diff.cpp b/uppsrc/ide/Diff.cpp
index 809898cb8..7bb09bb66 100644
--- a/uppsrc/ide/Diff.cpp
+++ b/uppsrc/ide/Diff.cpp
@@ -1,7 +1,7 @@
 #include "ide.h"
 
 #define IMAGECLASS UrepoImg
-#define IMAGEFILE  <urepo/urepo.iml>
+#define IMAGEFILE  <ide/urepo.iml>
 #include <Draw/iml.h>
 
 struct RepoDiff : DiffDlg {