diff --git a/installer/AMXXRelease/ABuilder.cs b/installer/AMXXRelease/ABuilder.cs index ee4e9023..50a37960 100755 --- a/installer/AMXXRelease/ABuilder.cs +++ b/installer/AMXXRelease/ABuilder.cs @@ -34,6 +34,7 @@ public virtual bool Build(Config cfg, Build build) if (!BuildMod(mod)) { System.Console.WriteLine("Mod failed to build: " + mod.GetName()); + return false; } if (m_Cfg.CompressPath() != null) { diff --git a/installer/AMXXRelease/AMXXRelease.exe b/installer/AMXXRelease/AMXXRelease.exe index 6ce6f3f8..b65e8ddc 100755 Binary files a/installer/AMXXRelease/AMXXRelease.exe and b/installer/AMXXRelease/AMXXRelease.exe differ diff --git a/installer/AMXXRelease/LinuxBuilder.cs b/installer/AMXXRelease/LinuxBuilder.cs index afece6a7..e70578ce 100755 --- a/installer/AMXXRelease/LinuxBuilder.cs +++ b/installer/AMXXRelease/LinuxBuilder.cs @@ -36,7 +36,7 @@ public override void CompressDir(string target, string dir) chmod.UseShellExecute = false; Process c = Process.Start(chmod); c.WaitForExit(); - + c.Close(); 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); p.WaitForExit(); + p.Close(); } 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); p.WaitForExit(); + p.Close(); } public override string GetLibExt() @@ -94,6 +96,7 @@ public override string BuildModule(Module module) p = Process.Start(info); p.WaitForExit(); + p.Close(); if (!File.Exists(file)) { @@ -110,10 +113,10 @@ public override string BuildModule(Module module) info.FileName = dlsym; info.Arguments = file; info.UseShellExecute = false; - info.RedirectStandardOutput = true; p = Process.Start(info); p.WaitForExit(); + p.Close(); string output = p.StandardOutput.ReadToEnd(); if (output.IndexOf("Handle:") == -1) diff --git a/installer/AMXXRelease/Main.cs b/installer/AMXXRelease/Main.cs index 558aa081..1078b5f2 100755 --- a/installer/AMXXRelease/Main.cs +++ b/installer/AMXXRelease/Main.cs @@ -35,12 +35,16 @@ public void Release(string file) file = ABuilder.PropSlashes(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; } if (!ValidateConfigPaths()) + { + Console.WriteLine("Build failed!"); return; + } ABuilder builder = null; if ((int)System.Environment.OSVersion.Platform == 128) @@ -54,7 +58,14 @@ public void Release(string file) 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() diff --git a/installer/AMXXRelease/Win32Builder.cs b/installer/AMXXRelease/Win32Builder.cs index 7025085a..7b2caff0 100755 --- a/installer/AMXXRelease/Win32Builder.cs +++ b/installer/AMXXRelease/Win32Builder.cs @@ -37,8 +37,11 @@ public override void AmxxPc(string inpath, string args) if (args != null) info.Arguments += " " + args; info.UseShellExecute = false; + info.RedirectStandardOutput = true; + info.RedirectStandardError = true; Process p = Process.Start(info); + Console.WriteLine(p.StandardOutput.ReadToEnd() + "\n"); p.WaitForExit(); } @@ -77,12 +80,18 @@ public override string BuildModule(Module module) info.FileName = m_Cfg.DevenvPath(); info.Arguments += "/rebuild " + module.build + " " + module.vcproj + ".vcproj"; info.UseShellExecute = false; + info.RedirectStandardOutput = true; + info.RedirectStandardError = true; Process p = Process.Start(info); + Console.WriteLine(p.StandardOutput.ReadToEnd()); p.WaitForExit(); + p.Close(); if (!File.Exists(file)) + { return null; + } return file; }