From 164780363b072279d40ed2b53ab1b61fbcf0b388 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Fri, 3 Aug 2007 17:26:57 +0000 Subject: [PATCH] failed builds block again added some redirection to windows builder --- installer/AMXXRelease/ABuilder.cs | 1 + installer/AMXXRelease/AMXXRelease.exe | Bin 28672 -> 32768 bytes installer/AMXXRelease/LinuxBuilder.cs | 7 +++++-- installer/AMXXRelease/Main.cs | 15 +++++++++++++-- installer/AMXXRelease/Win32Builder.cs | 9 +++++++++ 5 files changed, 28 insertions(+), 4 deletions(-) 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 6ce6f3f8121625f4a3828f945a3110007e4457fd..b65e8ddc9c938392cf60ad4b0db63000d59d63b8 100755 GIT binary patch delta 2881 zcmZ{me{5UT7018#*?InzIC0!MX%k{6j^mdX$2Dn4T1dMzq)n-;Hfd7|Xi#^xDOIyL zdI?j<*pi^Cl&OeCx0*VMNfDHdO+^&BuvCE5GL&WQq_HAUVW{e~Q4s3Jn8qJNuVmer#1GWkE6p-=FG=|-?Kso=6b@F?e;p?TI7`=o1$1LufB8fa9$6sMl z->jms(q$G8MstMpY^GPEw|*Tpae&chEufRj3?HmA*m?f_s)p1rNbU9(o2VzCd5V;j z-dO1WKDj{gv!X{$%WT?vP$w&4(H@6(LV? zHJO^>j2n;f`^^kL(`eEZ=FFr|bpgD*skZDf3K8O8nF+qNY0l-N@vitd|Dvf}%7^0# zelot9{gQtkPa4auXT2DcNmw5`lBpSYh-3qcDxPT`s9mZsE#^}LP5y)CWH9bv#MG^y z^Ha_3>_vXLImKS(fkczm?dPi!TerXA#~95poY62$yO(c$o$lR}69RdEwL}z&qsbo3b)-11VX^6ieY{It9d6Iuf8^~>m=u#W-Sl9Sq z%g|(`{6;=vRqcElNa^Hrr@kmJ&COh5)91)CAqrMT!Dyj043JM+>X0=|CQd#NkZkAk zNQI-OgpQQ+p_U{cP9`GHlUh}&f;@;vvrh4+lDD(B`1$0TmG6>)li{@`vR1+CjTL0n zWejN56@1c&c6?LTOJ}*VLiw{x`j)X=OI7fXj7^hW)T2`Ap)~%#K;PuP=O&k5Ta+xB zI7JyI*)Gb6qotZ0WEE7D1i#o?!;bM!TKoL3QLoFIr8F@2_r=ZIirs_$zCHu zZM(M2^iqNOcxvt16Mni+enb~gfG!{p$vY;j{iFNF#ReFwrcFgRMttWEOvLO+v?Is?Ju#N*+$`Jp1p%8U67|0T}A?B=%-5x z_$fX?8x1}#X`X#fmOhL$+kIthHT-x}(mV^XC<1tm|9#cQwY4p_#oc5PM!%#(wclYu z+WYrNI!shebo>Sdu^fNk2Qqb&siYV^&;H7?h@e-Jun!WAsJ>6xE}};j{g>^=3LI7B z*RoiNSw%Hko@h={llBnNB}FOftHVDPb+0sm5JfFB2nKMo>wGl7{fy;i1=3_3fzd3?ZW9a z!mc2i@nzbk21(zhV?@h@-$L{qRkVfm5*?%CB>LKkTF^|JTu?6sG_XcdC)-4{Ks%qN zE7NYp2SgNq20gAP(28<8YN8e!T-7jfR?;-?ay>=6a*B?sGq4TEZlcqY?AfgqnpD}OaY>nqBBpUonTlGZ(c3NDI0KJKvS*RTDM@ztG~QH} z_P8rISz?Xw;#e+|G-+p=#)!llAtX5=PTw?eL0Q@%>glJ)Vru=8oN;+cPQZi8(jIr# zrfsSi%jkY|);EoQMPhx^cv_KI-wd*Jg*xloft(_-z8&zcD{bw}YhCAXLJ#5$eywM5 z4s-f%*h{!T^6w!I_MhPPyv^RjEuKs43``Fv%Z=3X54sL&2X>Y2?tWhn-#JnoFJNC` zV)q7X-^1T6j82U6d)ANh_3P_ajFWbIA-~@$?48&#v1c^D$I5TCtfEyqzy5FDb+mEo z`tUIJV+48H<_}_zlnX?SK;zQBakAS>e+Bx>i?{T`z^iV}<>wD(Tj0mkpA$8(p9gaEjm2QS=u2>4k1PE^m8 z#{q*m1bCkSuvfsz#!@{bey?Xqr3Fk_Lrr=e>J?(Rt#4Kd^!3V QOJm0}rBLqE%9)Jke<2kPB>(^b delta 2725 zcma);drVVT7{I@CDYx`Np%lt%qlFfFX=zii8{%*jr=ku=GljV&8|W~o*=W7g#0Lr{ z#Iemx*&)V1_`^m2aEUs!d%3twr(qhi#Hm}{W)_^zEXMdq*y0kEedpX$C|OK)liq&6 z?|r^=&u#nrrT%fUdvJ;4&BQ_w*Em>+iO2w9R5&$dce{`~7>6}|Hh_*HUdeCRH*_&z zDM0UKOx*zxGz^v6bo~HkdY^>ot3)w0pv8%wFny1>3>_$8CWz3_iGv;{MTxs4$KqfG z@mho*2|t7N0K3Zo2+DN;GA0YsNVY=G(oNYV-UF!CWkk_IHc9#@wj=xVRCJE%qqzu* z1;D6e;fz5Ka(+kKOZ^#M09#N8z4Rk*ke(~`l3Dbjx0q&? znTx!(AORc+ztpS@hzaMdbZ*%->UPDl^P?e5FDun}&oo49=zdo@)%)}4Rab~?rB=5m z*QD;pNZy85Ql4W?658Qz(p6wK`ikpG6^wX$-~vwhuO2bc^&SsB zQBm1<1s(Y8B)+#=x8tZxcKd=nEvI&VJHrf*a%GCB3BvnNvZ;0+v3h9KWkbFoj%Iu=ONj;ABNQ!*MOgj|jv{`BD zyF8tdJ-*r!|Ie~g$8a^7{Xa`A#GJSdR`m|LXiJo~m~j9yd;X0TG+bHT_h7mQJUOC= z)cj8x?c*obo!W0pX0ooV+ELa<8%Sz#vUBLY%DJSC2E6l(+fbjT4&t3YDlIYKsHaZZ zYttu;zUV7V@4*9Wr;TOh^aI~G+M-qYWQ4v`RZd3f;i>{WiRpPZomCgD!F6URcD(zg zTyKUK&skmFUL$~O8_vOmuNFPZ%i`+V?yepz2=j9QPU7~uT9<*&sl9MqO|6UPqb-+i z@;8t=dffks?UwAqWB!QW4SFVf5?caCN$a9gmS&9n2o8MNjSBh=${`)XICg+Na0`4G zFwAL;{DqzdSmV}g>0}ld;UuRqVkHhR!IyMOL2G#BAi$=o8f7IO3m|iOj7~{ zf>ulYNV7R|;rHz%`B|!gz<%sGvuj&Ippz+A(Rw z$K&{%oDk!56Mn@RI$=N%n~W2N1+n=$;ea4ELnm}r0jqx#*nmsnpr0k(4z@H4xZy!S zqY_Rlf{e!CG%(wspd}=XG=RSt%;ra`05d+@jKWw@0jHo4S%`FK7PDz{s)UnBSbqrW z)857D-qVcGn3e-x=*1r+*39CxUHDYiKQkTZgUAeuane@rg8@$3B7AT|*w_Mn;Cxog z$(9s=IHNw%O#p_uQA-nmgTj@~A^;C(1V(D7n+d>MoRV?HalT$J-#3@;?SEClthH-(Tw!gUXb6A=& zVEY?@6@u9Q24P$f+us_P5XAPk2IBRJ-$R{}_c$Doo8dSdlPR2n@8vJZQ5Z+fIba9- z2Po8EB0oco{tBVJwHu|bw#47HzsQ+gtK;pBYS)IhS9iyIXsjVmZrKozZHUwB&-WzW zZ@8Y3IJD?19bLE7o!xdSbZ_TqOUuz?*3paG;@>9rE$x+Z!tJbY?RtaB&Y@Df9N}8J zFmje!I?h*j0{kf@y#U6$02DIK8EXOf8&IeUR#M~2dB(1`OZa*wfW5Y@+)L7`p*nGY g)n{CwA9pU$6rI^7Lj?aSVr;A-VU69*8Vc(F1zTJ7Hvj+t 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; }