From a7ddb22018de8ee3bfbacee3ed2dd0e4e8e8709d Mon Sep 17 00:00:00 2001 From: cxl Date: Sat, 28 Jan 2012 17:37:51 +0000 Subject: [PATCH] .uppbox: Scripts git-svn-id: svn://ultimatepp.org/upp/trunk@4483 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppbox/MakeInstall4/Main.cpp | 228 +++++++++++++++++------------------ uppbox/Scripts/src | 60 ++++----- uppbox/Scripts/win | 6 +- 3 files changed, 147 insertions(+), 147 deletions(-) diff --git a/uppbox/MakeInstall4/Main.cpp b/uppbox/MakeInstall4/Main.cpp index bfc2db0cb..6e29525f2 100644 --- a/uppbox/MakeInstall4/Main.cpp +++ b/uppbox/MakeInstall4/Main.cpp @@ -1,114 +1,114 @@ -#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; - int q = Sys(s, r); - if(q) - Error(String().Cat() << "Failed: " << s << "\r\n" << - "Exit code: " << q << "\r\n" << - "Output: " << r); - 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/guiplatform.h", ""); - SaveFile(upptmp + "/uppsrc/ide/version.h", "#define IDE_VERSION \"" + version + "\"\r\n"); - 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"); -} +#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; + int q = Sys(s, r); + if(q) + Error(String().Cat() << "Failed: " << s << "\r\n" << + "Exit code: " << q << "\r\n" << + "Output: " << r); + 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:/upp/umk.exe")) + win32 = "u:/upp"; + 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/guiplatform.h", ""); + SaveFile(upptmp + "/uppsrc/ide/version.h", "#define IDE_VERSION \"" + version + "\"\r\n"); + 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"); +} diff --git a/uppbox/Scripts/src b/uppbox/Scripts/src index 64a65c206..2c864c1aa 100644 --- a/uppbox/Scripts/src +++ b/uppbox/Scripts/src @@ -1,30 +1,30 @@ -set -e - -rm ~/upload/* || true - -#remove Win32 specific files -rm ~/upp.tmp/u/*.exe || true -rm ~/upp.tmp/u/*.map || true -rm ~/upp.tmp/u/*.dll || true -rm ~/upp.tmp/u/*.upp || true -rm ~/upp.tmp/u/*.chk || true - -rm ~/upp.tmp/u/*.scd || true - -cp ~/Scripts/GCCMK.bm ~/.upp/theide - -~/bin/theide uppsrc ide GCCMK -asrxM ~/upp.tmp/u/uppsrc - -cp ~/Scripts/Makefile ~/upp.tmp/u -cp ~/Scripts/domake ~/upp.tmp/u -cp ~/Scripts/doinstall ~/upp.tmp/u -cp ~/Scripts/readme ~/upp.tmp/u -cp ~/Scripts/upp.spec ~/upp.tmp/u - -cp ~/Scripts/GCCMK.bm ~/upp.tmp/u/GCC.bm - -cd ~/upp.tmp -mv u upp-x11-src-`svnversion ~/upp.src` -tar -cvvzf ~/upload/upp-x11-src-`svnversion ~/upp.src`.tar.gz upp-x11-src-`svnversion ~/upp.src` -mv upp-x11-src-`svnversion ~/upp.src` u -~/bin/upload +set -e + +rm ~/upload/* || true + +#remove Win32 specific files +rm ~/upp.tmp/u/*.exe || true +rm ~/upp.tmp/u/*.map || true +rm ~/upp.tmp/u/*.dll || true +rm ~/upp.tmp/u/*.upp || true +rm ~/upp.tmp/u/*.chk || true + +rm ~/upp.tmp/u/*.scd || true + +cp ~/Scripts/GCCMK.bm ~/.upp/theide + +~/bin/theide uppsrc ide GCCMK -asrxM ~/upp.tmp/u/uppsrc + +cp ~/Scripts/Makefile ~/upp.tmp/u +cp ~/Scripts/domake ~/upp.tmp/u +cp ~/Scripts/doinstall ~/upp.tmp/u +cp ~/Scripts/readme ~/upp.tmp/u +cp ~/Scripts/upp.spec ~/upp.tmp/u + +cp ~/Scripts/GCCMK.bm ~/upp.tmp/u/GCC.bm + +cd ~/upp.tmp +mv u upp-x11-src-`svnversion ~/upp.src` +tar -cvvzf ~/upload/upp-x11-src-`svnversion ~/upp.src`.tar.gz upp-x11-src-`svnversion ~/upp.src` +mv upp-x11-src-`svnversion ~/upp.src` u +#~/bin/upload diff --git a/uppbox/Scripts/win b/uppbox/Scripts/win index fe4dfd7ea..f08948599 100644 --- a/uppbox/Scripts/win +++ b/uppbox/Scripts/win @@ -1,6 +1,6 @@ set -e rm ~/upload/* || true -wine "u:\Win32\theide\umk" uppbox MakeInstall4 MSC9 -ar "u:\mku.exe" -wine "u:\mku.exe" -~/bin/upload +wine u:/Win32/theide/umk u:/upp.src/uppbox,u:/upp.src/uppsrc MakeInstall4 u:/Win32/theide/MSC9.bm -ar u:/mku.exe +wine u:/mku.exe +#~/bin/upload