github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

MakeInstall4 improvement

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@962 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2009-03-15 22:05:53 +00:00
parent 5db96519b5
commit ee38d51070
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppbox/MakeInstall3/MakeInstall4.upp → uppbox/MakeInstall3/MakeInstall3.upp
View file

@ -1,5 +1,3 @@
description "Install creator - Wine version for nightly builds";
uses
plugin\bz2,
Core,

11
uppbox/MakeInstall4/Main.cpp
View file

@ -74,6 +74,11 @@ 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<String> s = Split(Syx("svnversion " + upp), NoDigit);
if(s.GetCount() == 0)
Error("Invalid version");
@ -87,8 +92,8 @@ CONSOLE_APP_MAIN
CopyFolders(uppsrc, upptmp + "/uppsrc", uppsrc + "/packages1", false);
CopyFolders(upp, upptmp, uppsrc + "/assemblies");
SaveFile(upptmp + "/uppsrc/ide/version.h", "#define IDE_VERSION \"" + version + "\"");
Syx("umk upptmp ide MSC9 -ar " + upptmp + "/theide.exe");
Syx("umk upptmp umk MSC9 -ar " + upptmp + "/umk.exe");
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");
@ -101,5 +106,5 @@ CONSOLE_APP_MAIN
Syx(win32 + "/7za/7za.exe a " + tmp + "/upp.7z * -r -mx -m0fb=255 -mf=off");
SetCurrentDirectory(tmp);
Syx("umk uppbox WinInstaller2 MSC9 -ar u:/upp-win32-" + Filter(version, FilterVersion) + ".exe");
Syx(win32 + "/umk uppbox WinInstaller2 MSC9 -ar u:/upp-win32-" + Filter(version, FilterVersion) + ".exe");
}