From 37147ffc5e09fe778654e77e982a6dc02cd4f8bc Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Fri, 24 Apr 2020 16:48:57 +0000
Subject: [PATCH] uppbox: MakeInstall6

git-svn-id: svn://ultimatepp.org/upp/trunk@14373 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppbox/MakeInstall6/Main.cpp         | 11 ++++++++---
 uppbox/MakeInstall6/MakeInstall6.upp |  1 -
 uppbox/MakeInstall6/README           |  5 -----
 3 files changed, 8 insertions(+), 9 deletions(-)
 delete mode 100644 uppbox/MakeInstall6/README

diff --git a/uppbox/MakeInstall6/Main.cpp b/uppbox/MakeInstall6/Main.cpp
index 4a896e6fa..6bb19027f 100644
--- a/uppbox/MakeInstall6/Main.cpp
+++ b/uppbox/MakeInstall6/Main.cpp
@@ -93,9 +93,14 @@ CONSOLE_APP_MAIN
 	RealizeDirectory("u:/upload");
 
 	CopyFolder(bin, upptmp, false);
-	CopyFolder(bin + "/win32", upptmp + "/bin");
-	SaveFile(upptmp + "/dbghelp.dll", LoadFile(bin + "/win32/clang/x86_64-w64-mingw32/bin/dbghelp.dll"));
-	SaveFile(upptmp + "/README", LoadDataFile("README"));
+	CopyFolder(bin + "/win32", upptmp + "/bin");mc
+	SaveFile(upptmp + "/dbghelp.dll", LoadFile(bin + "/win32.dlls/dbghelp.dll"));
+	SaveFile(upptmp + "/README",
+R"--(Ultimate++ Windows releases
+
+Windows release a simple archive .7z archive. Unpack to directory of your
+preference, then just run theide.exe. U++ does not write anything to registry
+or outside its directory.)--");
 	
 	CopyFolders(uppsrc, ass, uppsrc + "/packages");
 	CopyFolders(uppsrc, ass, uppsrc + "/packages1", false);
diff --git a/uppbox/MakeInstall6/MakeInstall6.upp b/uppbox/MakeInstall6/MakeInstall6.upp
index 33a92c963..2a48bd4f8 100644
--- a/uppbox/MakeInstall6/MakeInstall6.upp
+++ b/uppbox/MakeInstall6/MakeInstall6.upp
@@ -6,7 +6,6 @@ uses
 	plugin\ftp;
 
 file
-	README,
 	Main.cpp;
 
 mainconfig
diff --git a/uppbox/MakeInstall6/README b/uppbox/MakeInstall6/README
deleted file mode 100644
index df1e6439c..000000000
--- a/uppbox/MakeInstall6/README
+++ /dev/null
@@ -1,5 +0,0 @@
-Ultimate++ Windows releases
-
-Windows release a simple archive .7z archive. Unpack to directory of your
-preference, then just run theide.exe. U++ does not write anything to registry
-or outside its directory.