From 8085dfdde40e17e44d46630224a3f4b818f92680 Mon Sep 17 00:00:00 2001 From: cxl Date: Tue, 17 Mar 2009 20:44:19 +0000 Subject: [PATCH] MakeInstall4 git-svn-id: svn://ultimatepp.org/upp/trunk@971 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppbox/MakeInstall4/Main.cpp | 224 +++++++++++++++++------------------ uppbox/Scripts/all | 2 + uppbox/Scripts/src | 2 +- uppbox/Scripts/win | 2 + uppbox/Scripts/www | 2 +- 5 files changed, 118 insertions(+), 114 deletions(-) diff --git a/uppbox/MakeInstall4/Main.cpp b/uppbox/MakeInstall4/Main.cpp index 436e2f877..b3cbe27ec 100644 --- a/uppbox/MakeInstall4/Main.cpp +++ b/uppbox/MakeInstall4/Main.cpp @@ -1,112 +1,112 @@ -#include -#include - -using namespace Upp; - -void Log(const char *txt) -{ - Cout() << txt << "\r\n"; -} - -void Error(const char *e) -{ - Log(e); - abort(); -} - -String Syx(const char *s) -{ - Log(s); - String r = Sys(s); - if(r.IsVoid()) - Error("Failed: " + String(s)); - return r; -} - -void CopyFolder(const char *src, const char *dst, bool deep = true) -{ - Cout() << Sprintf("Directory %s\n", src); - RealizeDirectory(dst); - FindFile ff(String(src) + "/*.*"); - while(ff) { - String s = AppendFileName(src, ff.GetName()); - String d = AppendFileName(dst, ff.GetName()); - if(ff.IsFile()) { - String q = LoadFile(s); - String ext = ToLower(GetFileExt(s)); - if(ext != ".aux" && ext != ".$old") - SaveFile(d, q); - } - else - if(ff.IsFolder() && *ff.GetName() != '.') { - if(deep || *GetFileExt(s)) - CopyFolder(s, d, deep); - } - ff.Next(); - } -} - -int CrLfSm(int c) -{ - return c == ';' || c == '\r' || c == '\n'; -} - -void CopyFolders(const char *src, const char *dst, const char *folders, bool deep = true) -{ - Vector folder = Split(LoadFile(folders), CrLfSm); - for(int i = 0; i < folder.GetCount(); i++) - CopyFolder(AppendFileName(src, folder[i]), AppendFileName(dst, folder[i]), deep); -} - -String tmp = "u:/upp.tmp"; -String upptmp = tmp + "/u"; -String upp = "u:/upp.src"; -String uppsrc = upp + "/uppsrc"; -String win32 = "u:/theide"; - -void CopyIdeFile(const String& fn) -{ - SaveFile(upptmp + '/' + fn, LoadFile(win32 + '/' + fn)); -} - -int NoDigit(int c) { return IsDigit(c) ? 0 : c; } -int FilterVersion(int c) { return c == ':' ? '_' : c; } - -CONSOLE_APP_MAIN -{ - if(FileExists("u:/theide/theide.exe")) - win32 = "u:/theide"; - else - win32 = "u:/Win32/theide"; - - Vector s = Split(Syx("svnversion " + upp), NoDigit); - if(s.GetCount() == 0) - Error("Invalid version"); - String version = s.Top(); - Log("version: " + version); - - DeleteFolderDeep(tmp); - RealizeDirectory(tmp); - - CopyFolders(uppsrc, upptmp + "/uppsrc", uppsrc + "/packages"); - CopyFolders(uppsrc, upptmp + "/uppsrc", uppsrc + "/packages1", false); - CopyFolders(upp, upptmp, uppsrc + "/assemblies"); - SaveFile(upptmp + "/uppsrc/ide/version.h", "#define IDE_VERSION \"" + version + "\""); - Syx(win32 + "/umk upptmp ide MSC9 -ar " + upptmp + "/theide.exe"); - Syx(win32 + "/umk upptmp umk MSC9 -ar " + upptmp + "/umk.exe"); - - CopyIdeFile("dbghelp.dll"); - CopyIdeFile("en-us.scd"); - CopyIdeFile("en-gb.scd"); - - SetCurrentDirectory(upptmp); - - SaveFile("install.upp", LoadFile(uppsrc + "/install.upp")); - SaveFile("license.chk", "1"); - - Syx(win32 + "/7za/7za.exe a " + tmp + "/upp.7z * -r -mx -m0fb=255 -mf=off"); - SetCurrentDirectory(tmp); - Syx(win32 + "/umk uppbox WinInstaller2 MSC9 -ar u:/upp-win32-" + Filter(version, FilterVersion) + ".exe"); -} - -~/googlecode_upload.py -s win32_daily_build -p upp-mirror upp-win32-962.exe +#include +#include + +using namespace Upp; + +void Log(const char *txt) +{ + Cout() << txt << "\r\n"; +} + +void Error(const char *e) +{ + Log(e); + abort(); +} + +String Syx(const char *s) +{ + Log(s); + String r = Sys(s); + if(r.IsVoid()) + Error("Failed: " + String(s)); + return r; +} + +void CopyFolder(const char *src, const char *dst, bool deep = true) +{ + Cout() << Sprintf("Directory %s\n", src); + RealizeDirectory(dst); + FindFile ff(String(src) + "/*.*"); + while(ff) { + String s = AppendFileName(src, ff.GetName()); + String d = AppendFileName(dst, ff.GetName()); + if(ff.IsFile()) { + String q = LoadFile(s); + String ext = ToLower(GetFileExt(s)); + if(ext != ".aux" && ext != ".$old") + SaveFile(d, q); + } + else + if(ff.IsFolder() && *ff.GetName() != '.') { + if(deep || *GetFileExt(s)) + CopyFolder(s, d, deep); + } + ff.Next(); + } +} + +int CrLfSm(int c) +{ + return c == ';' || c == '\r' || c == '\n'; +} + +void CopyFolders(const char *src, const char *dst, const char *folders, bool deep = true) +{ + Vector folder = Split(LoadFile(folders), CrLfSm); + for(int i = 0; i < folder.GetCount(); i++) + CopyFolder(AppendFileName(src, folder[i]), AppendFileName(dst, folder[i]), deep); +} + +String tmp = "u:/upp.tmp"; +String upptmp = tmp + "/u"; +String upp = "u:/upp.src"; +String uppsrc = upp + "/uppsrc"; +String win32 = "u:/theide"; + +void CopyIdeFile(const String& fn) +{ + SaveFile(upptmp + '/' + fn, LoadFile(win32 + '/' + fn)); +} + +int NoDigit(int c) { return IsDigit(c) ? 0 : c; } +int FilterVersion(int c) { return c == ':' ? '_' : c; } + +CONSOLE_APP_MAIN +{ + if(FileExists("u:/theide/theide.exe")) + win32 = "u:/theide"; + else + win32 = "u:/Win32/theide"; + + Vector s = Split(Syx("svnversion " + upp), NoDigit); + if(s.GetCount() == 0) + Error("Invalid version"); + String version = s.Top(); + Log("version: " + version); + + DeleteFolderDeep(tmp); + RealizeDirectory(tmp); + + CopyFolders(uppsrc, upptmp + "/uppsrc", uppsrc + "/packages"); + CopyFolders(uppsrc, upptmp + "/uppsrc", uppsrc + "/packages1", false); + CopyFolders(upp, upptmp, uppsrc + "/assemblies"); + SaveFile(upptmp + "/uppsrc/ide/version.h", "#define IDE_VERSION \"" + version + "\""); + Syx(win32 + "/umk upptmp ide MSC9 -ar " + upptmp + "/theide.exe"); + Syx(win32 + "/umk upptmp umk MSC9 -ar " + upptmp + "/umk.exe"); + + CopyIdeFile("dbghelp.dll"); + CopyIdeFile("en-us.scd"); + CopyIdeFile("en-gb.scd"); + + SetCurrentDirectory(upptmp); + + SaveFile("install.upp", LoadFile(uppsrc + "/install.upp")); + SaveFile("license.chk", "1"); + + Syx(win32 + "/7za/7za.exe a " + tmp + "/upp.7z * -r -mx -m0fb=255 -mf=off"); + SetCurrentDirectory(tmp); + Syx(win32 + "/umk uppbox WinInstaller2 MSC9 -ar u:/upload/upp-win32-" + Filter(version, FilterVersion) + ".exe"); +} + +// ~/googlecode_upload.py -s win32_daily_build -p upp-mirror upp-win32-962.exe diff --git a/uppbox/Scripts/all b/uppbox/Scripts/all index 4875680c2..8d5686b44 100644 --- a/uppbox/Scripts/all +++ b/uppbox/Scripts/all @@ -3,6 +3,8 @@ echo Path: $PATH echo Home: $HOME export WINEDEBUG=-all wine program.exe +mkdir ~/upload || true + bash ~/upp.src/uppbox/Scripts/www bash ~/upp.src/uppbox/Scripts/win diff --git a/uppbox/Scripts/src b/uppbox/Scripts/src index 01fbe33ce..bde429e9c 100644 --- a/uppbox/Scripts/src +++ b/uppbox/Scripts/src @@ -1 +1 @@ -bin/theide uppsrc ide GCC -asrxM upp.src \ No newline at end of file +bin/theide uppsrc ide GCC -asrxM upp.src diff --git a/uppbox/Scripts/win b/uppbox/Scripts/win index 48d18d3fe..ef7c98408 100644 --- a/uppbox/Scripts/win +++ b/uppbox/Scripts/win @@ -1,2 +1,4 @@ +rm ~/upload/* || true wine "u:\Win32\theide\umk" uppbox MakeInstall4 MSC9 -ar "u:\mku.exe" wine "u:\mku.exe" +upload diff --git a/uppbox/Scripts/www b/uppbox/Scripts/www index 62dc6ebc4..cf2d3bbf7 100644 --- a/uppbox/Scripts/www +++ b/uppbox/Scripts/www @@ -1,3 +1,3 @@ -rm ~/tmp/makeweb +rm ~/tmp/makeweb || true ~/bin/theide uppbox uppweb GCC -abrs ~/tmp/makeweb ~/tmp/makeweb