Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

failed builds block again

Browse Source 
added some redirection to windows builder
This commit is contained in:
David Anderson 2007-08-03 17:26:57 +00:00
parent 807e6a0f9a
commit 164780363b
5 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
installer/AMXXRelease/ABuilder.cs
View File

@ -34,6 +34,7 @@ public virtual bool Build(Config cfg, Build build)
if (!BuildMod(mod)) if (!BuildMod(mod))
{ {
System.Console.WriteLine("Mod failed to build: " + mod.GetName()); System.Console.WriteLine("Mod failed to build: " + mod.GetName());
return false;
} }
if (m_Cfg.CompressPath() != null) if (m_Cfg.CompressPath() != null)
{ {

BIN
installer/AMXXRelease/AMXXRelease.exe
View File

Binary file not shown.

7
installer/AMXXRelease/LinuxBuilder.cs
View File

@ -36,7 +36,7 @@ public override void CompressDir(string target, string dir)
chmod.UseShellExecute = false; chmod.UseShellExecute = false;
Process c = Process.Start(chmod); Process c = Process.Start(chmod);
c.WaitForExit(); c.WaitForExit();
c.Close();
info.Arguments = "zcvf \"" + target + ".tar.gz\" " + file_list; info.Arguments = "zcvf \"" + target + ".tar.gz\" " + file_list;
@ -44,6 +44,7 @@ public override void CompressDir(string target, string dir)
Process p = Process.Start(info); Process p = Process.Start(info);
p.WaitForExit(); p.WaitForExit();
p.Close();
} }
public override void AmxxPc(string inpath, string args) public override void AmxxPc(string inpath, string args)
@ -59,6 +60,7 @@ public override void AmxxPc(string inpath, string args)
Process p = Process.Start(info); Process p = Process.Start(info);
p.WaitForExit(); p.WaitForExit();
p.Close();
} }
public override string GetLibExt() public override string GetLibExt()
@ -94,6 +96,7 @@ public override string BuildModule(Module module)
p = Process.Start(info); p = Process.Start(info);
p.WaitForExit(); p.WaitForExit();
p.Close();
if (!File.Exists(file)) if (!File.Exists(file))
{ {
@ -110,10 +113,10 @@ public override string BuildModule(Module module)
info.FileName = dlsym; info.FileName = dlsym;
info.Arguments = file; info.Arguments = file;
info.UseShellExecute = false; info.UseShellExecute = false;
info.RedirectStandardOutput = true;
p = Process.Start(info); p = Process.Start(info);
p.WaitForExit(); p.WaitForExit();
p.Close();
string output = p.StandardOutput.ReadToEnd(); string output = p.StandardOutput.ReadToEnd();
if (output.IndexOf("Handle:") == -1) if (output.IndexOf("Handle:") == -1)

15
installer/AMXXRelease/Main.cs
View File

@ -35,12 +35,16 @@ public void Release(string file)
file = ABuilder.PropSlashes(file); file = ABuilder.PropSlashes(file);
if (!m_Cfg.ReadFromFile(file)) if (!m_Cfg.ReadFromFile(file))
{ {
Console.WriteLine("Failed to read config, aborting!"); Console.WriteLine("Failed to read config, aborting.");
Console.WriteLine("Build failed!");
return; return;
} }
if (!ValidateConfigPaths()) if (!ValidateConfigPaths())
{
Console.WriteLine("Build failed!");
return; return;
}
ABuilder builder = null; ABuilder builder = null;
if ((int)System.Environment.OSVersion.Platform == 128) if ((int)System.Environment.OSVersion.Platform == 128)
@ -54,7 +58,14 @@ public void Release(string file)
Build build = new Build(m_Cfg); Build build = new Build(m_Cfg);
builder.Build(m_Cfg, build); if (!builder.Build(m_Cfg, build))
{
Console.WriteLine("Build failed!");
}
else
{
Console.WriteLine("Build succeeded!");
}
} }
private bool ValidateConfigPaths() private bool ValidateConfigPaths()

9
installer/AMXXRelease/Win32Builder.cs
View File

@ -37,8 +37,11 @@ public override void AmxxPc(string inpath, string args)
if (args != null) if (args != null)
info.Arguments += " " + args; info.Arguments += " " + args;
info.UseShellExecute = false; info.UseShellExecute = false;
info.RedirectStandardOutput = true;
info.RedirectStandardError = true;
Process p = Process.Start(info); Process p = Process.Start(info);
Console.WriteLine(p.StandardOutput.ReadToEnd() + "\n");
p.WaitForExit(); p.WaitForExit();
} }
@ -77,12 +80,18 @@ public override string BuildModule(Module module)
info.FileName = m_Cfg.DevenvPath(); info.FileName = m_Cfg.DevenvPath();
info.Arguments += "/rebuild " + module.build + " " + module.vcproj + ".vcproj"; info.Arguments += "/rebuild " + module.build + " " + module.vcproj + ".vcproj";
info.UseShellExecute = false; info.UseShellExecute = false;
info.RedirectStandardOutput = true;
info.RedirectStandardError = true;
Process p = Process.Start(info); Process p = Process.Start(info);
Console.WriteLine(p.StandardOutput.ReadToEnd());
p.WaitForExit(); p.WaitForExit();
p.Close();
if (!File.Exists(file)) if (!File.Exists(file))
{
return null; return null;
}
return file; return file;
} }