diff --git a/uppbox/MakeInstall4/Main.cpp b/uppbox/MakeInstall4/Main.cpp index f16edb0b1..e5704ded0 100644 --- a/uppbox/MakeInstall4/Main.cpp +++ b/uppbox/MakeInstall4/Main.cpp @@ -69,11 +69,6 @@ String ass = upptmp + "/uppsrc"; String upp = "u:/upp.src"; String uppsrc = upp + "/uppsrc"; -void CopyIdeFile(const String& fn) -{ - SaveFile(upptmp + '/' + fn, LoadFile("c:/theide/" + fn)); -} - int NoDigit(int c) { return IsDigit(c) ? 0 : c; } int FilterVersion(int c) { return c == ':' ? '_' : c; } @@ -85,7 +80,7 @@ void Make(String pkg, String exe, String method = "MSC9") CONSOLE_APP_MAIN { - Vector s = Split(Syx("svnversion " + upp), NoDigit); + Vector s = Split(Syx("svnversion " + uppsrc), NoDigit); if(s.GetCount() == 0) Error("Invalid version"); String version = s.Top(); @@ -95,6 +90,8 @@ CONSOLE_APP_MAIN RealizeDirectory(tmp); RealizeDirectory("u:/upload"); + + CopyFolder(upp + "/uppbox/win32-files", upptmp); CopyFolders(uppsrc, ass, uppsrc + "/packages"); CopyFolders(uppsrc, ass, uppsrc + "/packages1", false); @@ -106,10 +103,6 @@ CONSOLE_APP_MAIN Make("ide", "theide64.exe", "MSC9X64"); Make("umk", "umk.exe"); - CopyIdeFile("c:/theide/dbghelp.dll"); - CopyIdeFile("c:/theide/en-us.scd"); - CopyIdeFile("c:/theide/en-gb.scd"); - SetCurrentDirectory(upptmp); SaveFile("install.upp", LoadFile(uppsrc + "/install.upp")); diff --git a/uppbox/win32-files/en-gb.scd b/uppbox/win32-files/en-gb.scd new file mode 100644 index 000000000..415cfb4b6 Binary files /dev/null and b/uppbox/win32-files/en-gb.scd differ diff --git a/uppbox/win32-files/en-us.scd b/uppbox/win32-files/en-us.scd new file mode 100644 index 000000000..0d17ecaeb Binary files /dev/null and b/uppbox/win32-files/en-us.scd differ