From d9dfab64a0481e1fcf96102d6cf1f98acdd9acfc Mon Sep 17 00:00:00 2001 From: ZZYZX Date: Sat, 14 Apr 2018 18:11:19 +0300 Subject: [PATCH] Made some edits to the build scripts and auto-update routine to support 64-bit updating --- Build/Updater.exe | Bin 192512 -> 192512 bytes Build/Updater.ini | 4 +- ChangelogMaker.exe | Bin 9216 -> 9216 bytes Source/Core/Builder.csproj | 4 +- Source/Core/General/UpdateChecker.cs | 3 +- Source/Core/Properties/AssemblyInfo.cs | 4 +- .../BuilderModes/Properties/AssemblyInfo.cs | 2 +- .../ChangelogMaker/ChangelogMaker.csproj | 7 +- Source/Tools/Tools.sln | 6 +- Source/Tools/Updater/MainForm.cs | 9 +- .../Updater/Properties/Resources.Designer.cs | 4 +- Source/Tools/Updater/Updater.csproj | 5 +- Source/Tools/Updater/Updater.ini | 6 +- .../VersionFromEXE/VersionFromEXE.csproj | 7 +- .../VersionFromSVN/VersionFromGIT.csproj | 97 +++++++++--------- UpdaterConfig/Updater-x64.ini | 4 + UpdaterConfig/Updater-x86.ini | 4 + VersionFromEXE.exe | Bin 5120 -> 5632 bytes VersionFromGIT.exe | Bin 10752 -> 10240 bytes Make GIT Build.bat => build_git_generic.cmd | 47 ++++++--- build_git_x64.cmd | 2 + build_git_x86.cmd | 2 + 22 files changed, 135 insertions(+), 82 deletions(-) create mode 100755 UpdaterConfig/Updater-x64.ini create mode 100755 UpdaterConfig/Updater-x86.ini rename Make GIT Build.bat => build_git_generic.cmd (83%) create mode 100755 build_git_x64.cmd create mode 100755 build_git_x86.cmd diff --git a/Build/Updater.exe b/Build/Updater.exe index b05b7975a232800c232e0ff2a0908a573e807855..6e5ce064abc160dbcf710c629558a4dc81921d91 100755 GIT binary patch delta 17827 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 F{{b}&!1(|G diff --git a/Build/Updater.ini b/Build/Updater.ini index 8e94b5d7..981d57d0 100755 --- a/Build/Updater.ini +++ b/Build/Updater.ini @@ -1,4 +1,4 @@ URL http://devbuilds.drdteam.org/gzdbbf/ FileName Builder.exe -UpdateName GZDoom_Builder_Bugfix-r[REVNUM].7z -UpdaterName GZDB_Updater.7z \ No newline at end of file +UpdateName GZDoom_Builder_Bugfix-r[REVNUM]-[PLATFORM].7z +UpdaterName GZDB_Updater-[PLATFORM].7z \ No newline at end of file diff --git a/ChangelogMaker.exe b/ChangelogMaker.exe index 3896ea47dff3188b0af8623f10ad79ac2cc70931..5f5a3cb2f318c51760bb7eb50089889463909592 100755 GIT binary patch delta 4185 zcmZu!d2Afj8UNnQ&Un4fu06Y1AMqWNu*9*kV<)k360-4?1z)j~5Er6k>>ZpbyE~iN zagt3-*G04<60tB-R1pdRBw86NL=;MBp;h}&ODnaaEfwMrB0}OQR1~#ToTb0_cGpQN zW#MK6QX{p1LyD%jPs<}YB~#BuHPXP96{`_VrinuVP1OQcGuSs)X@QL;5RkU-^`>`a zqD%`{DXGa<@}flKiCo1YuclfUBA>OMOXWS|=+erqt06gI3`?j&tH>)v0QKfNcz*#A zCR)#D7*|cZ%p|AiLH7lU3zyN zx*~m|{%x?aeLyYFX(7>E22}nZ5L_ME4#hkgEZPCxQA8ux7dg9{_wVF>!@}TF7w2+$ zFPFgerB%~@%)Y4OvoBFckEVTH9p!nI$GA#ZEB`tbRkflBTw*_m93s2GhDxBy%n1Q>smY&q%hLD^bFOJRQDSBSRqTz0HeURW8OU!f`pTcOp+n(Sy-kIsEZ}&12)kFn3m{m`Jar@VH_V^ zI+c_E!z9WI@%zqJL2--Qi)RfvQvk>Z5BwE2vY@UO}UR#su9X z=(M0ZXc!4`{iA~Z9#o}QXq=5w?jqgCCh0xeqfFCBbc1qO@CJP5Ez?^{1?jApl`~#Om_0(d zpD48u_9%^PiC(95>>QaQ*iE1&n`W)R2iQ7xinbukQD(4fSylx8h+a@O3)^eiD^#lX z0p|l7z!cuV+Ho#?0U9DjYR3+^3bcjVKwBva+9fDXST6L7jvHwh{FFd$7Ic>4KyIT& zX_hkdfW)xAahKv##ipll-ebuv_g%wvAfx`Gm29woTaPG2Jm@$#lX< z8YxHTiUWqDn~BU08tmO1?cUtAWpmeH$Cl1b9Yce?gI!y@I(s&C^lsTT&_A?wYj=O| z=3O*rIESKB{jnHLWiyVEY>$o8)Zj#PGP-wsl9HKO%TAax#ZEU;zB)Hz>2Zpt(?%*z zlSVqB&l+?fnHaO;1{o(zXO=TbBa_kR42lhynY5MBXA%ZY&ZitRX$+Z0BEDNs#Q_bO zApKSA zxE(iBdLlNLvTUPY&lng>o(P=V*$Lgw7_M1Sw_$kRj7J@u;xqFORE(MVxjCNeB@FKO zn;CQFUjORVdrjwxF5A!@m-$2PgZ_|=A#iH~SGyWT-NS(dMiV;F)XdTP!{SaYNLZHC=$oG@rGg@MHFg3*{dV%ZKKj{JR7MED?G zLc~=>6S{MRhOh{VQ--u?)JR%(cFMUK2`6d7w&rZKJee4#T;w8{VZ-6$9~Z*Z6@pkC z7&|jbqq>W6Q-ztl(a6S9w_0LVaDRMhjOuA#rA_&acg>rLxM5TB zM7;gV;tLAJz2I)tYOC949SfHE6*^$*nAMD9&Su;f{7vr8K+|Y`<}g~=A4W!$)_(*M zc;vjeGNTznnY*$MaNWk;UGUm(B?^^fTpg>tuvm8+iL_y7Xz+xYaWZ_V&gu@0&wLYA z(^ML}787;Mw5=51guLPbYj$4ne0=-oZJXnQx3K=Xhhv5bO-bfYThQ#A9gJ6hN3cGP*?k-F+i{;%LYJBbbyE*b9Wfb2e6_Yiy5jn=nJ z|3KomSI5e)n`XfCf5rKSRzF#k#Lu7cd22V?QkzPJW={dKhfX$NVumO d`_KQO@k!=(vc^&*$v^jh+Jo{xWJ?_-{{ykViPr!C delta 4246 zcmZ8lYj7LY6+U-YTFZ*P@k+7$l5821M8UDK6X)S1BzEMNz=@s62}v6WYk6@tNLpnj z8#|E71PY}TChiV}q>}&xQ$i_^nNUb411Svc41YSMk7?;JG)xP_P#F5)Pg+R&-7DEK zS!=(0&Ueqb=iYnH-IY8uFf(xMd)KV~*61E8UKdDWiUoX z*XE)#&Ms*y)11d8JzotQe?SWa8ty)+1*)tnBCp@Ax&2iEe|2+StJ11Z_!Uj5dRSQ2 zXf=U`%_p^*qGgFz@`zczdZShnIAOuU8>s=bG;1YQ3-vn9HE%KBWnr-$-sXVaB~wOI zY#U7k^Y%s-1GMU@J^pH~TB~}*+%kFj@?|Ab2iot^JkBY3Fz?BRxLO*i=f)nZ0Zlf{ zDX&(ld96l>ACzg{l_gNFf%1O%6PYO6#7!2}h~+H(twiLCV86WnGOg5F2Ekg+wc7Q& z(52N{5okFWFn_sLUNBezsx!Zq_ZJ!AQnwzvPg>mq7gbZO>tNkdV!w*TH3y2i{cC7e zGkUC*0RQ4h3vVjE)5;sI(D;hRE1R`a`w!gVdfw~T{60C-mWOP$1BzCf-&zH28PqGQ z2(CYklxx8SQ(B@eu~x%ysXx^D5bq4xAM<_h0M}9v?aO(s589=9ZJ>ESlDNcL14C;q z<;lB}XSGPI1MBx`OEjN_YVR%UJBj0P`FcwwR&!E6{r zwm+!Uf)hwB^Ve(j$YFgUhuR`raZ#r92YC&BkxekSZUER`utL%nUrqR~B77B*&GUY~ zIX|#l=GaKroMcz?{%)w4BM&s!h4s&g3#DbHReQ@(17aOtevNfBYITKmG-wT2M?-NP zwFQ$WxJji}TQCW0VVH!ACZ&qC6%kA9bC^RU3ejJwRcec@9*AX;UZDLabZM2&r%G-9 zHJtTD$mm;W%h2)*1xe=t=g=NT^;dEd7w205e%xKIZ}R_x{{irc1^lRF|ASAW4>85* zjPyfVCSO-CMex}1qR5?lOWNCK6r!eh&NkEISstec6AHS)?TXWF6-4+@Q~$0QRzMjj zr=5>VHkR@S7lKl`v%=Gu_X-)$Ej-Y=fwQPJg-#3nmB7CX{90gu@!ocUg97hk22<#9 zfj<$L(z$aur=o!H)E*_@QCBg{#ppY{_FFCG$*-JkLD)f%)RhO483Z}u`FXt8N zb919xpeS?!vO>!hjzbC$Wf&-moCs0cnJ6oO#{!-J+wpm4dovsUHUy{a!C3M9j6DR4~6_O zJtgGl=vnD=)OUg|g4bl3%~F+I1`Ns{g1=6#V8>~-Tn%Q69AfW^q2Hsd+{E6aBXWd& z2&NVM3Auy)i=LOyVI)2Y#`q+(JiFHwWh>aTu5GNH{m~U?o$PO}y^z0f-2%SCt+N=r z-aQU^le>)VU_7qN~T zmGg9njVNbXsR(?W_9<@&-?Qu%oQn3dr5?M~Iw3=2(t(2wvfqrTN)(LD9*u0Sz zgIXkTqo8gQ7^gn)3CaNPpd(U(n%D-$P?mUw(%bCcG#qv=Eehl};MsxC{KW`w1YFb7snDjiqyjZDrzyJ!vM4EJdxkNIZ}cIGxb3H)5+= zV?)$u!mD@6%;vJxW7=4`WltBaG0Ti@8@BUCc~!pX619@W?a8+G8)?Hf6YvxJrQ6fD zt)f`(p$R={=BDSoZ)@iXwTolMGw2)2@cqq_P%uX`MX~JmiDYuf?oDNK)08!G`(r$r zI}LrTJDD6Y@>4k|nWUbW-`qW^B;oF{5)&ySJ-?_C1E#%c

ip8plZ8@n|eY{YGx< zbPk)p%}8O5*boB+Rcr<=eT-r~W;SDGb)*Gr;^N%CZJo%Q$uYyGO~bZ1sppJXDw8yL zRGqJ+$H<|&vYYQ(v!=7RbKRR zGM{oOopoNSsLS&`jZWA$-*h2cm;)bZzI^9h(uD-for|mpr>6`NVVj=eS=r8Yk!?Ph z*a7Onwv6E92>0#Qom8j`5hFi$$fC$#Zovr}v5HmB%cn3-{OaL(FtRfH=c-f$h^0}; zqHb_LkjixSCS$tL!;4T<;}w%eD?Mr0IU2F%XSvOqG`91)>&|41^qBMV;=uR;%g*s7 z6z9~No-}PMEh?3-bGvb;IHv^HQ27X$l--VE#`&ufSG?XKy#@SvoqGfz4%2Y%%IGT?2%*8@*T z#n%Fl>XF05Tw%sk4iX2CkgA|=D5I<7%Yg}BebWK zFii4~Vt%B}JSVglR1YT~#Rs!SAPg({34MOdKp_T0&S7d8M}mzS3_|xEQSn;gE5+P^ zm}gH(BVy{G45=R8b+YhLebf9;%i?9V92O#{;z{ZA>-%2^FruO zHsCC+?`I=Usy@z!ozLrsSeJ7{!}HFU4P9r}hJVJSaxeZL@IWa%_>Y8&&NJFIU$EJ> GlK%rj2e@1S diff --git a/Source/Core/Builder.csproj b/Source/Core/Builder.csproj index d79cbe63..a5ddca16 100644 --- a/Source/Core/Builder.csproj +++ b/Source/Core/Builder.csproj @@ -1504,7 +1504,9 @@ echo Current Output Directory: %25cd%25 echo Copying platform-appropriate DevIL.dll file. -copy /Y ..\DevIL\$(PlatformName)\DevIL.dll .\ +copy /Y ..\DevIL\$(PlatformName)\DevIL.dll .\ +echo Copying platform-appropriate Updater.ini. +copy /Y ..\UpdaterConfig\Updater-$(PlatformName).ini Updater.ini if exist "%25VS140COMNTOOLS%25" goto tools140 if exist "%25VS120COMNTOOLS%25" goto tools120 if exist "%25VS110COMNTOOLS%25" goto tools110 diff --git a/Source/Core/General/UpdateChecker.cs b/Source/Core/General/UpdateChecker.cs index ce37293c..0f8251f0 100755 --- a/Source/Core/General/UpdateChecker.cs +++ b/Source/Core/General/UpdateChecker.cs @@ -79,8 +79,9 @@ namespace CodeImp.DoomBuilder string[] inilines = File.ReadAllLines(inipath); foreach(string line in inilines) { + string cplatform = (Environment.Is64BitProcess ? "x64" : "x86"); if(line.StartsWith("URL")) url = line.Substring(3).Trim(); - else if(line.StartsWith("UpdaterName")) updaterpackname = line.Substring(11).Trim(); + else if(line.StartsWith("UpdaterName")) updaterpackname = line.Substring(11).Trim().Replace("[PLATFORM]", cplatform); } if(string.IsNullOrEmpty(url)) diff --git a/Source/Core/Properties/AssemblyInfo.cs b/Source/Core/Properties/AssemblyInfo.cs index ebb329b1..aaca6cf9 100755 --- a/Source/Core/Properties/AssemblyInfo.cs +++ b/Source/Core/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using CodeImp.DoomBuilder; // Build Number // Revision // -[assembly: AssemblyVersion("2.3.0.3011")] +[assembly: AssemblyVersion("2.3.0.3013")] [assembly: NeutralResourcesLanguageAttribute("en")] -[assembly: AssemblyHash("5344700")] +[assembly: AssemblyHash("0b14bde")] diff --git a/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs b/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs index f2f4b468..dfe96e92 100755 --- a/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs +++ b/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Resources; // Build Number // Revision // -[assembly: AssemblyVersion("2.3.0.3011")] +[assembly: AssemblyVersion("2.3.0.3013")] [assembly: NeutralResourcesLanguageAttribute("en")] diff --git a/Source/Tools/ChangelogMaker/ChangelogMaker.csproj b/Source/Tools/ChangelogMaker/ChangelogMaker.csproj index a624d41c..cf55c5e8 100755 --- a/Source/Tools/ChangelogMaker/ChangelogMaker.csproj +++ b/Source/Tools/ChangelogMaker/ChangelogMaker.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -12,6 +12,11 @@ ChangelogMaker v3.5 512 + + + + + 3.5 false diff --git a/Source/Tools/Tools.sln b/Source/Tools/Tools.sln index 043ada48..00c38bfa 100755 --- a/Source/Tools/Tools.sln +++ b/Source/Tools/Tools.sln @@ -1,6 +1,8 @@  -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Updater", "Updater\Updater.csproj", "{2A0BA1B2-A0F1-479F-9083-2EC11D6B70DF}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersionFromEXE", "VersionFromEXE\VersionFromEXE.csproj", "{72734EB9-2733-4C05-A091-7FA591AF53C3}" diff --git a/Source/Tools/Updater/MainForm.cs b/Source/Tools/Updater/MainForm.cs index 9bdc7051..8b2aa7a9 100755 --- a/Source/Tools/Updater/MainForm.cs +++ b/Source/Tools/Updater/MainForm.cs @@ -24,7 +24,9 @@ namespace mxd.GZDBUpdater private string processToEnd = string.Empty; private string downloadFile = string.Empty; + private string platform = string.Empty; private const string revisionwildcard = "[REVNUM]"; + private const string platformwildcard = "[PLATFORM]"; private string URL = string.Empty; private readonly string updateFolder = Application.StartupPath + @"\_update\"; private string appFileName = string.Empty; @@ -272,8 +274,9 @@ namespace mxd.GZDBUpdater // Replace wildcard with remoterev downloadFile = downloadFile.Replace(revisionwildcard, remoterev.ToString()); + downloadFile = downloadFile.Replace(platformwildcard, platform.ToString()); - if(remoterev > 0 && remoterev <= localrev) + if (remoterev > 0 && remoterev <= localrev) { URL = string.Empty; ErrorDescription = "Your version is up to date!"; @@ -299,6 +302,10 @@ namespace mxd.GZDBUpdater { downloadFile = line.Substring(10).Trim(); } + else if(line.StartsWith("Platform")) + { + platform = line.Substring(9).Trim(); + } } // Sanity cheks diff --git a/Source/Tools/Updater/Properties/Resources.Designer.cs b/Source/Tools/Updater/Properties/Resources.Designer.cs index 7a6ddd99..e7becf1f 100755 --- a/Source/Tools/Updater/Properties/Resources.Designer.cs +++ b/Source/Tools/Updater/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.5466 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace mxd.GZDBUpdater.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/Source/Tools/Updater/Updater.csproj b/Source/Tools/Updater/Updater.csproj index b2a963d9..5e6f14f6 100755 --- a/Source/Tools/Updater/Updater.csproj +++ b/Source/Tools/Updater/Updater.csproj @@ -1,4 +1,5 @@ - + + Debug AnyCPU @@ -11,7 +12,7 @@ Updater - 2.0 + 3.5 v3.5 diff --git a/Source/Tools/Updater/Updater.ini b/Source/Tools/Updater/Updater.ini index a7f4e810..d9b74203 100755 --- a/Source/Tools/Updater/Updater.ini +++ b/Source/Tools/Updater/Updater.ini @@ -1,4 +1,4 @@ -URL http://devbuilds.drdteam.org/doombuilder2-gzdb/ +URL http://devbuilds.drdteam.org/gzdbbf/ FileName Builder.exe -UpdateName GZDoom_Builder-r[REVNUM].7z -UpdaterName GZDB_Updater.7z \ No newline at end of file +UpdateName GZDoom_Builder_Bugfix-r[REVNUM].7z +UpdaterName GZDB_Updater-[PLATFORM].7z \ No newline at end of file diff --git a/Source/Tools/VersionFromEXE/VersionFromEXE.csproj b/Source/Tools/VersionFromEXE/VersionFromEXE.csproj index d5df366d..9316d48b 100755 --- a/Source/Tools/VersionFromEXE/VersionFromEXE.csproj +++ b/Source/Tools/VersionFromEXE/VersionFromEXE.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -12,6 +12,11 @@ VersionFromEXE v3.5 512 + + + + + 3.5 false diff --git a/Source/Tools/VersionFromSVN/VersionFromGIT.csproj b/Source/Tools/VersionFromSVN/VersionFromGIT.csproj index 8b8b98cb..3763fd74 100755 --- a/Source/Tools/VersionFromSVN/VersionFromGIT.csproj +++ b/Source/Tools/VersionFromSVN/VersionFromGIT.csproj @@ -1,53 +1,58 @@ - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {58D7AB05-5FA0-47EE-8F74-463AC2AED47C} - Exe - Properties - mxd.VersionFromGIT - VersionFromGIT - v3.5 - 512 - - - false - none - false - ..\..\..\ - DEBUG;TRACE - prompt - 4 - AnyCPU - - - none - true - ..\..\..\ - TRACE - prompt - 4 - AnyCPU - - - - - 3.5 - - - - - - - + + + + Debug + AnyCPU + 9.0.30729 + 2.0 + {58D7AB05-5FA0-47EE-8F74-463AC2AED47C} + Exe + Properties + mxd.VersionFromGIT + VersionFromGIT + v3.5 + 512 + + + + + 3.5 + + + false + none + false + ..\..\..\ + DEBUG;TRACE + prompt + 4 + AnyCPU + + + none + true + ..\..\..\ + TRACE + prompt + 4 + AnyCPU + + + + + 3.5 + + + + + + + + --> \ No newline at end of file diff --git a/UpdaterConfig/Updater-x64.ini b/UpdaterConfig/Updater-x64.ini new file mode 100755 index 00000000..981d57d0 --- /dev/null +++ b/UpdaterConfig/Updater-x64.ini @@ -0,0 +1,4 @@ +URL http://devbuilds.drdteam.org/gzdbbf/ +FileName Builder.exe +UpdateName GZDoom_Builder_Bugfix-r[REVNUM]-[PLATFORM].7z +UpdaterName GZDB_Updater-[PLATFORM].7z \ No newline at end of file diff --git a/UpdaterConfig/Updater-x86.ini b/UpdaterConfig/Updater-x86.ini new file mode 100755 index 00000000..d9b74203 --- /dev/null +++ b/UpdaterConfig/Updater-x86.ini @@ -0,0 +1,4 @@ +URL http://devbuilds.drdteam.org/gzdbbf/ +FileName Builder.exe +UpdateName GZDoom_Builder_Bugfix-r[REVNUM].7z +UpdaterName GZDB_Updater-[PLATFORM].7z \ No newline at end of file diff --git a/VersionFromEXE.exe b/VersionFromEXE.exe index 191086df30945fa3aec96ef8bbff004fc0aa1906..ef8dbec4f2a14b6b206d9f045309fd6ec96ae3d7 100755 GIT binary patch delta 1386 zcmY+ET}&KR6vzK}*qvR5Wk1RSi^Mvx(Qf(JEKqeDDg{A4QoaRz zpfy06nARA>dJ_}Th4T9M8_(QXOgzc`-E;o; z^US?-*Awde|!Px{b5L3K9qp?jBVIKfy{PDRN6lnJ}BjO`-V?$J5q*&$0s~%m8QdCQ&vSmuc zv3HphQw9jKlqBO-!SlGsLYSs5GA`jeCgZN)ZNV&al%(K@;Fi!0L}-Qy!7qejN_*7v z5yT;{p%;5h!B6ZSNsN3M*V&#}ojxQP6I%;omxb||h^AFXFXJW~rT8-uy&gNDkPf+Kf*E2xbm6}!xPe9KD6U|Tc3j3CmLRT5 zNnFJRsT&*ElulxmdQ$eN!6dN`^TcMnM2usN*bYwY!A)YX;GmVbCa92G#SXZfoOuNyEspzBpjhmC7#L8ius&az3BQ7PS8~zAe}D z8{P-_oZQTRCI1)iG5)=`p2vJDZ<0@OzZ~IdUq@F`ThZWNPE4Cd-pmx??gJAUy;Sj& zPifB=w4ALQCBE%bW67Ltn1^jcdL~~oEL+c6d|g)gfvhInEzymq{4@(0ldk>~E4pP{ zPByuWjj8MlG$H@S7Yhw6Eor62fkI(cTd{%NzkTOeN6i~wTl;5Mr{2DMqoMs;UoSi= zWBw`?%u7xr;)Fp5Qk9QyRL4X9FJF1~>82C=SG-{U`-6N`NmTn;JOa%>|*6% za8BkO{+iM(yHCaLmSQvB&tg0n2=Wtw7)$esKs!$bJbXM5t517?&3<5~${Fd}4!;`M zmi$%x@!D4Q8`o+tJ=iM#gFzT5VhI_P==x1kU4(Wx3d8(P?aOSKXM*o_wu%1Z)S9PW z18<#~eF*^mSLpO^clcAb8#(d=t5$&k O4cJLj_$Mo;eE$MHTo!Tw delta 1341 zcmY+EO>7%Q6vzKFvDc2{ICkTNgs5dxtE%%+%V~-lAe317hJ?7}yQ+vBdx;ioZ@RmN zgiF#?ic&;Tqd}-D5)B6w5GYdd0S*;#=phmkCvJT87?2R+f{omV} zH@h>t-nkyXzSa6u?yp%K+C6Yq!~8&i1nQ)HvHj6(XgLl%C%r!4z`NaAFIw3GyDKiU zlYs+oMTaInWgYB@_>mpgcjy6WBh)y&*w=v%eE=h$nkH@sk|NDL{n?5T0e{PE>JIS6 zoAEkYzk@Xf{ij-BQ}S{=EGx429}FL<=}5}V2%LOewC7s_s0o8S`qKQ8X1V5szV&7{+Dv@EERQn8#^xm!BeD;oW#2yZkIg_xL$f ztIPyy@GKIj$BV=kTqDL5JCxoHLCRB7S)xuJ_#FfAtlxhRv^8aq z(k3e(sp2#AsKLWpcE+e$ClnF0zcxx~Y9 z6r8MO=gmb-t~#z!z{KLqM%Kl6#w;R{buAkio6cD!ns~u@DNkXVU+j5xaYAbl|9Ve~ zceIGOp!JGxye;AWQr<1uM#`lVx>#}z(d*OO`>n!^>6nZ8|8)$P%-n-4q#Va6Eaq3m zuij?yv$sK9^y%VBO&7abr+D65lN>Vh1_oD5$92$e6&;J*S=)4tF|%mguW!K2EEO%s zHM5TJ`1GD7!(E`==So>OZJV!VTqB*aU5pmp?$fB;Avsw#<07@ZY!q{;e16JUam!!( z=2_R&eEt5n!SS)(_RgUFSu~^;P-( zT$HQd6C2g>+8c*I4*Bu+L?+O}cjD!ZfXhTE7!qfKQIQOKJZWHEq=TJeEEsK*sn@CP z^wG_(l3vCB><50S+!iIwiS6Jm{y7(?Ymc+H#dPfzHX{D1eT`TOz01<#>ADHlC$80f hEJnh;<<0OXjMoN47kjK)ulxM2K}zp?G4?>{@)5GDWs diff --git a/VersionFromGIT.exe b/VersionFromGIT.exe index afa91661a7e4ad7af2f397c097ef42387ba46009..88dbc579ce24b7cd0a5a2e22cf9318cbd8b45c21 100755 GIT binary patch delta 4030 zcmZ8keQX@n5ue@LJKu+W_Pe$3&fjM{4u>5ZI|(5sB*fT`bH!iDISwf(aJHB8mGkX+ zcQ1)4={eB!1Boc^qP9c=DWO78L?k}cLIoA@5BUSpQmII;AP}k|wL+q_R0_0${@&X= zCt=zqc8Z7~U59VW}l}*$r|xUJu@w{Tt~zX`_8nYL9K$2?3tHcx7_a z+nq!kB195+ydL{ftk0g3mE!A)5U_|p5(rlsn9ElQRF!x&kzcO?#2G+!J93X1;#`Gn zs(kb^cf1zFz$utETv*TC2E6Cvb&$rxfM^%<>TvE?eavSJVlEPog6(NwMXz2DD%@XL zQmG0Dy7xx>-4oCpy`ou%X-BcUY|GOfgUufO2b0)qWtDW{JZ)y7y)|Yn`3acs$#Rs6J)`r!(?NLm!T2^;P4YRPQ zvGE=ZMdCN}Fm?boEwivusZc(w+&8O>+@aPXlG;<5TR-^v zn{Sx9sfUGFsAvo$nD}n&Bt8g$tTuj|Ag-F>rvo|Xt#b22SpDs8F{Zf@evHFigJ=<) zblL~N5uyh$1~Kx7%iGapKSY_H!o?RPoPYkPeG=&oNya^8V}|K2H}=2Rsg{beZ0kC; zcb($bkqE@ly=Cf*uS~tLPDuerCi(3K-{$^d+~XZd%gE%?CJ$rEN7NU9>_C!MaJ%9X zrjF4AiD8VV!9Qvr_wDfA1`a!+p#6rgu6S1FH2)NQC4J%YP+I0VD!u8dCR7}9UAhU9 z4+Q>R;DpR24Fb0a{E?8~Dg7Dp0fA?QL{k(n-8U66aY^0= zM#6-LUYEJ*&xzxME{?0T4a;VfH(h>Oa&bIQZ*mtl(RUZP!!k6v|2#DE^E z2m0xHU=8&P91u7tFd=ZCz(WF4z&gqZdP(33poh*^V!{zYv?=}Wo{(dY8lz?bC;=@oiOt^&R#*9vR^9#;6yn%qwU`;=BGNDAE`#mJ;n zaxVqw6RDR}`V81eK}b3%0_>)4;1+>91P%%L?bHu>Qb>w-ieZipLUbRUkQ?YuN+I3K zigQY6{o$vG_e1&FC?y4XtxOROhl#{UuCS;XsoAV{Pe1J|XazowWlRf0B4=&cOt*~d z(fLAF+eM>^>AMpXdnPHlY+Bl4Z(`COtLjMh4(ZvfHfLq@oY_072Sw5(=n zl$;)%UN8`w{ai45Ui;IkR{IZCb#`NQ%x((aVh4iE-cjAs$oF=@)RGHYHal`mo8y*;wI!ZoyT7Wo zIF>T4L~dR?HhC{O_ah|>v!=KyMPfz_LpO#qsjQx+sg$)KwmGKd(jb#o%CO9X8IZ_X z+DI*ys)Fri7HK?{$vNu!T#8qwT(i-vKAXyB?oV08tEBt2drK9hdL=GIM5Gw7-zEGK*R-8d5X#d{Q%xWY8w|SHZSkr+)ajjO+87DSB=&o8?_%It{bV zrHr&`udv#gQs}%1ksO+w{T`Z(lKE`LqJyc7wMREbj)CSI9x51ymMhUZ;&3uA=CJqN ze9D-gELi!1WnZXiDvs+%vHxJ)@*Xw}@hWEt~@?vQdy3_k2Y9x+$UPPy0 zKjnr)nE7Srpym)lrSd>+3ch-vY5A)`AzWRv!R|q@zo1|yzle_$?v?hJU(-| z_|QdCVv^)_#Yl34V2rat4)W%Tc3GB#cT3 z0(glLcde3JM1XH@Xfd>8&$iwi@c#DxyJqUQe)Q9or|q=*bd~IZ1IgPQ#C0awQ?axi6-o` w8z!Y)_U9X(^?C6P_y^y){aEMFi+|}nFX123YaT>e3BmBr7g_u>X|=E7|DOgoEC2ui delta 4325 zcmai2eQ+Dq5#M(@$&xHx{B*Kp*_JJTBvEke*hwhHgkZ&X91n5qM9x>6mdN(SJ|gLq zcc;b*Uzj*`f9v9rqX(dTy#o@dCSHI93UJ`pAGe- z6(G&oet=W%(=DpqLhkZkYC=hZ-}bjilXA+9WIx^>yj$(($Xb%LuaMTn(`e1F9e7LN zhQ_r3hoS%kdAvRL?&fZLT#`#NTB3kL)E}*m1Q^nVpg>hl)&TeoijWK;sBTB@F;&i0 zNoJUjUg}QPA`!Vp)E3&(nE>WOC)CYu#~~TPsU)uKhdMRU`+W?!_c(mRGRFNrVJAW`z4IOTbx}yXgv*=>@MlKRJaN%=S_NyM~*ib^t z(HmKMAyOR;KnE^ZMSVsC-$2AK!Y+rzH`{m1;^LyG5?n1LC0>eTBWkaS;C6o@15}l# z`|ifv0>hdXoP1!0eo*3E9Mx4n^|O~ahZXjN+013D=qe+DM8s&}!ZH^%TCd~UR&dmB zw6A2{#%hOEt7)~d2I)08Vl()SB!|*EL^Xi2n~(tNPj-kg5Iu0szk5Jn9L3m5slUi>`Um#_us2W(ak1w1JomY2<3X}VZRdE z?~28f8_;L68}si6Z>2(Spb;>yt5PAS-)pc1j2=`}+d7&;ZOM(Cq_l=jpdzIV+r1#% zsWmveiO=%q;4fEJh1#w~FpvggGhgN{;1ypgc!-8*O{rY&o4Hk(hH0o=zi`C(95GI}#pTY*N?7tQwYJ}D%`%qDhM%23A6mM@DrFCc27>yac zvDlmFE}FcJ$F&8alIL&mJkuBp$R#L53_K_NYQ5kwq4m)Nj-&x4H8M&X@Kb-#z$4AC zHquyxHloTMoQu;KZ7}*d*+k<$+9aA#Z5CnB=A|P=6eJ*`qs@;-RZK_kgFJ>(InXe! z^VvWz-53(p&r6v2ep||V1vc%gG*aY_|4rx5KI)El_N@2_L z)=6Oh;-dm%IIhBxU!tY(WcwXf{2e^dD{@yifqNVk^m%y6Co|m@_w4F2*;ECEw6iMP zjC7gYu}t!lxhyrjOXL~f68Y>hNvbPS`?ac#Jqs9DTiRlJe#Yb>J>&!Eu14A3G`xuK zEqt{>+wk6zK^$L4{*>M6z0HSN6tBpjeau^nx#2C%PxKv-Li`#O5PvN2MS*`6__4qs z;j>AB0|M_MhlmHhE$|T`c~0O}@@JH*632dtdrnK-_I~MJ$pbG)XC*)URytck=J&{W z;7y_Qk-%0LH%PheMWrLIw95~9fiEI@pi1U0)(V`Ex#mHEUqu{)GgvhADI_iK0H(;< zE=L0Qks64@YW%jqx!nt;F>J2!1Xnr@2jF=Weiz>$ockiYB)WhAJ|XZ!co|{>TLi8X z*dy>(fhmC_0(T?60tW@15vU71hWH1VN4x;{aV)_Da7en0cucy2i=LF;g@Bk2BVL7P z;BDzs#P=kLya4}}d?XCAOCirdz@;J`cGZ&rG`X5^w#U^@PQ$IPb>vmp?%F^u3O^U2 zZ4OgnWmPT%+62fR#r<{cos|+Ee*P+EQ2jg4r=BU(+k|dCQ8^o7mV9o3bj89 zZn2L98)^oMS*ysF&Fv>vC3*&o+&1F6z_Ei&WMwZ_qY^Ywg!pCG0nX3HuJE zY2Ec3hx9~hVwP!{&w8-mu8EdrH0!RN##BaZtGv;XF&NKSvoNe#gF3@48*F}8CZ|;r zF<@lNi7>l{wYbVF@GVu3|Pj#)fhQYaRxS z{8Xl7@zFH08tiAfrR~)78VqX3xEq|w6*5c%9^-&f%v+F}p04QMsm+TD?ZK@f&6Ov) z@pir9E0xVoXmeI2>Onm-lQ&FDpE7wTOlc;L(+-igGRzY0_*%=HiQHaOOV4WA?9iMx z#f!{kd$ehh7}U&9XV~;u(JB67_ zr$@`=_(n8lAFBzMc-RgLe3&qX^3yQE^c?KZ=+<_F4bABmrYWmoJOi^CR?cv`kkzd* z(Q(+doDsR(spV&|oFjQ_(?)bNKb~Qx2B|_p%THI5RIV5A-{F#Gtzbp=i;QWQ|54-1 z+Af~ckwM)o7$&bTIHa@H0o;kD?J}Gch}{n{W-v^C)|e5y!4-LxmmaI(tTCC%>L;8Q zi{;Si;-o2F#n=Fad8dh%R)F&jw5K`_ zJ!{|pO3c{xGx_S@2iW<0!2A4(L;GTz-+4gtDE5Q##|H4d!LKF@X2d^uE zBL1qz*IQ@^IYkDdDDK+ODB-x9C_dDy4ehmGYwX&Saf77bH2(Bf&baV74e3-@_Il9U>67076ypckm63l9(#JYrNlKtg&bXYYvj-M*!2wS?MuiFL)Y ziW1V5xZ*`bG8f7z=-I1yy$*yD-y_Rd5Yf573_7`)H*1AHQJ&biLvx0-+Q^pvkp zB>Ovwv*eK7)6y2}MMVPLOP|d!i8TIkU_aS%ob0eyw?0nB?N3|BNWVSW_P8y#_n+V1 c{sfVNe*6#NxDRy$sD5GVdAjBUa=N?fKcpXki~s-t diff --git a/Make GIT Build.bat b/build_git_generic.cmd similarity index 83% rename from Make GIT Build.bat rename to build_git_generic.cmd index 1e2c9f47..0731b600 100755 --- a/Make GIT Build.bat +++ b/build_git_generic.cmd @@ -17,7 +17,12 @@ SET STUDIODIR=c:\Program Files (x86)\Microsoft Visual Studio 14.0 SET HHWDIR=c:\Program Files (x86)\HTML Help Workshop SET SEVENZIPDIR=c:\Program Files (x86)\7-Zip -CALL "%STUDIODIR%\Common7\Tools\vsvars32.bat" +IF NOT DEFINED PLATFORM SET PLATFORM=x86 + +CALL "%STUDIODIR%\Common7\Tools\vsdevcmd.bat" %PLATFORM% +ECHO. +ECHO Building for platform %PLATFORM% +ECHO. MKDIR "GIT_Build" @@ -63,12 +68,17 @@ IF NOT EXIST "setenv.bat" GOTO FILEFAIL CALL "setenv.bat" DEL /F /Q "setenv.bat" +ECHO. +ECHO Cleaning solution... +ECHO. +msbuild.exe Builder.sln /t:Clean + ECHO. ECHO Compiling GZDoom Builder core... ECHO. IF EXIST "Build\Builder.exe" DEL /F /Q "Build\Builder.exe" > NUL IF EXIST "Source\Core\obj" RD /S /Q "Source\Core\obj" -msbuild "Source\Core\Builder.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal +msbuild "Source\Core\Builder.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=%PLATFORM% /v:minimal IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL IF NOT EXIST "Build\Builder.exe" GOTO FILEFAIL @@ -77,7 +87,7 @@ ECHO Compiling Automap Mode plugin... ECHO. IF EXIST "Build\Plugins\AutomapMode.dll" DEL /F /Q "Build\Plugins\AutomapMode.dll" > NUL IF EXIST "Source\Plugins\AutomapMode\obj" RD /S /Q "Source\Plugins\AutomapMode\obj" -msbuild "Source\Plugins\AutomapMode\AutomapMode.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal +msbuild "Source\Plugins\AutomapMode\AutomapMode.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=%PLATFORM% /v:minimal IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL IF NOT EXIST "Build\Plugins\AutomapMode.dll" GOTO FILEFAIL @@ -86,7 +96,7 @@ ECHO Compiling Builder Effects plugin... ECHO. IF EXIST "Build\Plugins\BuilderEffects.dll" DEL /F /Q "Build\Plugins\BuilderEffects.dll" > NUL IF EXIST "Source\Plugins\BuilderEffects\obj" RD /S /Q "Source\Plugins\BuilderEffects\obj" -msbuild "Source\Plugins\BuilderEffects\BuilderEffects.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal +msbuild "Source\Plugins\BuilderEffects\BuilderEffects.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=%PLATFORM% /v:minimal IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL IF NOT EXIST "Build\Plugins\BuilderEffects.dll" GOTO FILEFAIL @@ -95,7 +105,7 @@ ECHO Compiling Builder Modes plugin... ECHO. IF EXIST "Build\Plugins\BuilderModes.dll" DEL /F /Q "Build\Plugins\BuilderModes.dll" > NUL IF EXIST "Source\Plugins\BuilderModes\obj" RD /S /Q "Source\Plugins\BuilderModes\obj" -msbuild "Source\Plugins\BuilderModes\BuilderModes.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal +msbuild "Source\Plugins\BuilderModes\BuilderModes.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=%PLATFORM% /v:minimal IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL IF NOT EXIST "Build\Plugins\BuilderModes.dll" GOTO FILEFAIL @@ -104,7 +114,7 @@ ECHO Compiling Color Picker plugin... ECHO. IF EXIST "Build\Plugins\ColorPicker.dll" DEL /F /Q "Build\Plugins\ColorPicker.dll" > NUL IF EXIST "Source\Plugins\ColorPicker\obj" RD /S /Q "Source\Plugins\ColorPicker\obj" -msbuild "Source\Plugins\ColorPicker\ColorPicker.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal +msbuild "Source\Plugins\ColorPicker\ColorPicker.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=%PLATFORM% /v:minimal IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL IF NOT EXIST "Build\Plugins\ColorPicker.dll" GOTO FILEFAIL @@ -113,7 +123,7 @@ ECHO Compiling Comments Panel plugin... ECHO. IF EXIST "Build\Plugins\CommentsPanel.dll" DEL /F /Q "Build\Plugins\CommentsPanel.dll" > NUL IF EXIST "Source\Plugins\CommentsPanel\obj" RD /S /Q "Source\Plugins\CommentsPanel\obj" -msbuild "Source\Plugins\CommentsPanel\CommentsPanel.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal +msbuild "Source\Plugins\CommentsPanel\CommentsPanel.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=%PLATFORM% /v:minimal IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL IF NOT EXIST "Build\Plugins\CommentsPanel.dll" GOTO FILEFAIL @@ -122,7 +132,7 @@ ECHO Compiling Nodes Viewer plugin... ECHO. IF EXIST "Build\Plugins\NodesViewer.dll" DEL /F /Q "Build\Plugins\NodesViewer.dll" > NUL IF EXIST "Source\Plugins\NodesViewer\obj" RD /S /Q "Source\Plugins\NodesViewer\obj" -msbuild "Source\Plugins\NodesViewer\NodesViewer.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal +msbuild "Source\Plugins\NodesViewer\NodesViewer.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=%PLATFORM% /v:minimal IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL IF NOT EXIST "Build\Plugins\NodesViewer.dll" GOTO FILEFAIL @@ -131,7 +141,7 @@ ECHO Compiling Sound Propagation Mode plugin... ECHO. IF EXIST "Build\Plugins\SoundPropagationMode.dll" DEL /F /Q "Build\Plugins\SoundPropagationMode.dll" > NUL IF EXIST "Source\Plugins\SoundPropagationMode\obj" RD /S /Q "Source\Plugins\SoundPropagationMode\obj" -msbuild "Source\Plugins\SoundPropagationMode\SoundPropagation.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal +msbuild "Source\Plugins\SoundPropagationMode\SoundPropagation.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=%PLATFORM% /v:minimal IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL IF NOT EXIST "Build\Plugins\SoundPropagationMode.dll" GOTO FILEFAIL @@ -140,7 +150,7 @@ ECHO Compiling Stair Sector Builder plugin... ECHO. IF EXIST "Build\Plugins\StairSectorBuilder.dll" DEL /F /Q "Build\Plugins\StairSectorBuilder.dll" > NUL IF EXIST "Source\Plugins\StairSectorBuilder\obj" RD /S /Q "Source\Plugins\StairSectorBuilder\obj" -msbuild "Source\Plugins\StairSectorBuilder\StairSectorBuilder.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal +msbuild "Source\Plugins\StairSectorBuilder\StairSectorBuilder.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=%PLATFORM% /v:minimal IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL IF NOT EXIST "Build\Plugins\StairSectorBuilder.dll" GOTO FILEFAIL @@ -149,7 +159,7 @@ ECHO Compiling Tag Explorer plugin... ECHO. IF EXIST "Build\Plugins\TagExplorer.dll" DEL /F /Q "Build\Plugins\TagExplorer.dll" > NUL IF EXIST "Source\Plugins\TagExplorer\obj" RD /S /Q "Source\Plugins\TagExplorer\obj" -msbuild "Source\Plugins\TagExplorer\TagExplorer.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal +msbuild "Source\Plugins\TagExplorer\TagExplorer.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=%PLATFORM% /v:minimal IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL IF NOT EXIST "Build\Plugins\TagExplorer.dll" GOTO FILEFAIL @@ -158,7 +168,7 @@ ECHO Compiling Tag Range plugin... ECHO. IF EXIST "Build\Plugins\TagRange.dll" DEL /F /Q "Build\Plugins\TagRange.dll" > NUL IF EXIST "Source\Plugins\TagRange\obj" RD /S /Q "Source\Plugins\TagRange\obj" -msbuild "Source\Plugins\TagRange\TagRange.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal +msbuild "Source\Plugins\TagRange\TagRange.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=%PLATFORM% /v:minimal IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL IF NOT EXIST "Build\Plugins\TagRange.dll" GOTO FILEFAIL @@ -167,7 +177,7 @@ ECHO Compiling Visplane Explorer plugin... ECHO. IF EXIST "Build\Plugins\VisplaneExplorer.dll" DEL /F /Q "Build\Plugins\VisplaneExplorer.dll" > NUL IF EXIST "Source\Plugins\VisplaneExplorer\obj" RD /S /Q "Source\Plugins\VisplaneExplorer\obj" -msbuild "Source\Plugins\VisplaneExplorer\VisplaneExplorer.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal +msbuild "Source\Plugins\VisplaneExplorer\VisplaneExplorer.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=%PLATFORM% /v:minimal IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL IF NOT EXIST "Build\Plugins\VisplaneExplorer.dll" GOTO FILEFAIL @@ -180,14 +190,17 @@ IF %ERRORLEVEL% NEQ 0 GOTO LOGFAIL ECHO. ECHO Packing release... ECHO. -IF EXIST "GIT_Build\*.7z" DEL /F /Q "GIT_Build\*.7z" > NUL +IF NOT "%PLATFORM%" == "x86" (SET DEL_PATHSPEC="GIT_Build\GZDoom_Builder*-%PLATFORM%.7z") ELSE (SET DEL_PATHSPEC="GIT_Build\GZDoom_Builder*.7z") +IF EXIST %DEL_PATHSPEC% DEL /F /Q %DEL_PATHSPEC% > NUL +IF EXIST "GIT_Build\GZDB_Updater-%PLATFORM%.7z" DEL /F /Q "GIT_Build\GZDB_Updater-%PLATFORM%.7z" > NUL "%SEVENZIPDIR%\7z" a .\GIT_Build\gzdb.7z .\Build\* -xr!*.xml -xr!JetBrains.Profiler.Core.Api.dll -xr!ScintillaNET.3.5.pdb -x!Setup -"%SEVENZIPDIR%\7z" a .\GIT_Build\GZDB_Updater.7z .\Build\Updater.exe .\Build\Updater.ini +"%SEVENZIPDIR%\7z" a .\GIT_Build\GZDB_Updater-%PLATFORM%.7z .\Build\Updater.exe .\Build\Updater.ini IF %ERRORLEVEL% NEQ 0 GOTO PACKFAIL IF NOT EXIST .\GIT_Build\gzdb.7z GOTO FILEFAIL -IF NOT EXIST .\GIT_Build\GZDB_Updater.7z GOTO FILEFAIL +IF NOT EXIST .\GIT_Build\GZDB_Updater-%PLATFORM%.7z GOTO FILEFAIL + +IF NOT "%PLATFORM%" == "x86" (REN "GIT_Build\gzdb.7z" GZDoom_Builder_Bugfix-r%REVISIONNUMBER%-%PLATFORM%.7z) ELSE (REN "GIT_Build\gzdb.7z" GZDoom_Builder_Bugfix-r%REVISIONNUMBER%.7z) -REN "GIT_Build\gzdb.7z" GZDoom_Builder_Bugfix-r%REVISIONNUMBER%.7z IF EXIST "Build\Changelog.txt" DEL /F /Q "Build\Changelog.txt" > NUL @ECHO %REVISIONNUMBER%> .\GIT_Build\Version.txt diff --git a/build_git_x64.cmd b/build_git_x64.cmd new file mode 100755 index 00000000..2de6884a --- /dev/null +++ b/build_git_x64.cmd @@ -0,0 +1,2 @@ +SET PLATFORM=x64 +build_git_generic.cmd \ No newline at end of file diff --git a/build_git_x86.cmd b/build_git_x86.cmd new file mode 100755 index 00000000..ab726dbf --- /dev/null +++ b/build_git_x86.cmd @@ -0,0 +1,2 @@ +SET PLATFORM=x86 +build_git_generic.cmd \ No newline at end of file