From 25371933b4809e0c542fa7de795e09b1b40bb21e Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Mon, 12 Jun 2017 20:36:36 +0100 Subject: [PATCH] update Robust32.exe build files --- bin/Robust32.exe | Bin 5632 -> 5632 bytes bin/Robust32.pdb | Bin 11776 -> 11776 bytes share/32BitLaunch/README | 5 - share/32BitLaunch/Robust.32BitLaunch.exe | Bin 5632 -> 0 bytes .../32BitLaunch/Robust.32BitLaunch/Program.cs | 23 +---- .../Robust.32BitLaunch/Robust32.csproj | 92 ++++++++++++++++++ .../Robust.32BitLaunch/Robust32.csproj.user | 13 +++ .../Robust.32BitLaunch/Robust32.sln | 22 +++++ .../32BitLaunch/Robust.32BitLaunch/app.config | 72 ++++++++++++++ 9 files changed, 200 insertions(+), 27 deletions(-) delete mode 100644 share/32BitLaunch/README delete mode 100755 share/32BitLaunch/Robust.32BitLaunch.exe create mode 100644 share/32BitLaunch/Robust.32BitLaunch/Robust32.csproj create mode 100644 share/32BitLaunch/Robust.32BitLaunch/Robust32.csproj.user create mode 100644 share/32BitLaunch/Robust.32BitLaunch/Robust32.sln create mode 100644 share/32BitLaunch/Robust.32BitLaunch/app.config diff --git a/bin/Robust32.exe b/bin/Robust32.exe index 1ae2a36f90286b238382ab693b34853589a57169..e5e4674337a824c4d4d26a77621055bd3d1cc1ad 100644 GIT binary patch delta 419 zcmXAkPbh(07!+tOtrztc{>{Aq}af=H{l z(12FaA-TmYX*4D_X@fciNp)2-WqH-7#MCxXPu=jMhdG2k z<|q{AB!bLfS)VI2iX~Q-u**#0h%8Xh15=jGd6IFQGfqqn*{_?s;lNn_M=fG)CN}o z2}F?L=hJXMVl>CPZ zqPd2qH#O8`Bs4X)NmFhGIz`amn!9j+Tn>lBJ!Nm%dwL`^86q+&*=a-1ciF&Oui{{epi}U=-wQ~3Hc_Civ-qe~b zQJ;-qiRZS8`GS8u7|9l5sp3vL!&=%WADWH1WIILRYv+$vd7Ek{5LcqguCJ(g>!Pd8Z!DwT;!&0ljlDZJ2U0vNlao26RN@dB?=QWYPaQsDgo&S3<_MA diff --git a/bin/Robust32.pdb b/bin/Robust32.pdb index 2fded802b374467d50ed475cc184cfb004628e90..15a0d7544ecde28881d9babaac000bf49a1fe7c0 100644 GIT binary patch delta 91 zcmZpOX^7dt!X>fyja?)o0|UdQSu58~nElXmcB)b3|3fduHp_6m;bwjDWA)=rn|Z}p Yc_#X?u`n`jVB0LC^nwwOE|n*o0Md9SW&i*H delta 94 zcmZpOX^7dt!X@$LrClT=0|P^$ZfUS4`w5@Dwx_jSGTAFP%W%EnW<5Xsl-0(~yke|8 XTyy>dRWX2+ZkADc!H7qr$`eiixqTj1 diff --git a/share/32BitLaunch/README b/share/32BitLaunch/README deleted file mode 100644 index 443cde0ab9..0000000000 --- a/share/32BitLaunch/README +++ /dev/null @@ -1,5 +0,0 @@ -Many issues appear in the support channels because of a misunderstanding of the use of these utilities. And through discussion at OpenSimulator Office Hours it was determined that these tools probably serve no useful purpose anymore. - -Instead of removing them immediately, we move them here, for a time, in case there is a useful purpose that has escaped us during conversations. - -If a need to compile these arises, the OpenSim.32BitLaunch and Robust.32BitLaunch directories may be placed under the ./OpenSim/Tools sources subdirectory, run the prebuild script and compile. diff --git a/share/32BitLaunch/Robust.32BitLaunch.exe b/share/32BitLaunch/Robust.32BitLaunch.exe deleted file mode 100755 index affedb4bca5ae0c14a6a446a07d993e227bc2565..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5632 zcmeHLU2Ggz6+W|e94Be4#7*-cI|-nor_mXxc*H`#fl2@QN$cpKb8DgWt3>&GS72 zBk5ZjNE>wp z%-(i8npEf;kcRGl>e)}Un>^s|0rh#9=y{SYP^<@0?S78# zkHPX%UAoPE3gp@>4NdQBbqTLQrTau!PX$|pC`Ws))7T*lkHvZp!pMnP?)&M|Moatkbs1{2Epr(%S(6aDSkL4p@NJA7iE>^ufpE3&Lx)3`N zYoi;0yXpI}w}HPK;~5{u?#DW)v!$h_je1*Vq&J~YVHWpM7xf}0 z@;qOsU&IFJEqX6DMBk>r#?H|9;7uCYSK<3EDWlOIR0WNmq!Qp!3A@P#ep1p0={4YI zB>fW-X6bEE47vw+lYR^6Q(V#LGjtO03zSkWQ0qEEM7~<+EOr66FC%EKyirqVOri?1 zfxRwUFTKI3+0gzT(MB)2#fl})(t=y4_<=S!FkuE6z2X=vnphJwA6DateZ7fKwr{we zWfmw~^#ftkT;YZ=0=lT14rxZ}_{lGMQni7RdsiZ&RT}Xo^><|R7VIss+hCg0& zfFQ_KSrC@KCNaMe-a?od)&r|xT4vC+N}G2dS#Bxih#-1u;lk5Z+iGk9Y_Vt{81r3A z&=t=NM8=Lqa3v+Bjxp{UJ&ApsFZ>9F<_p zr#2=ufV>CZEy(H8S5C13O1Yko5u$VBkI7UcRtK}Nl>oY)jK`5V6*yw3dsN@~Qs+CF zJBbfZzu)u4A5i;`KAm4Yl6r6(XOHr9M~g~ItEwm+3}QO~_K!2#-hOoI_wPNo|7sUb zRHcudU1HZRyW4@uA)$`<3OD?W%^}HuUfI{?_0XbZ_}mwtiRVBWN8xgS%7)7o~;lRCa0R_Vgd$zccsB zGugkqdbQJHjmeR`Q7zpvo&1Vxi@c%xqIx55-7xaCO!bw_AYXfp^EubG{QTxb=iS1M zysT+kFtu{AKp()5sC7i&3lX9DS-bOwr0bKeH@zn0p(hVSA+(~!cRYL%Jxgj@V*eW; z#$QXMVp$L4iT$~bM^g*$bMud(uWUhQ<@F{DAsX(Z*D?5J8lNlSMK)wj5&bD-%kff6 z3eQE<=Iemdv;b@t#qAQtvw$j%CGc~B@hKG+axT8?4WCb%gs3uT^SHArbswgn;iJ&9 zZ;evRatqKYpoIIdp~-_{0x|(*V3iLN10|bV5_O?rZ&8+A_JE5$w|;0R>z(I61bNP4 zSfaT+TTM}IXI>4n@CnQ>lBPzj1{)XO6Q>h0L^pc8mp0kdfjCNJ} zHdoW-)nebGmFH2I`Tx|%7p0H$ubH6i>WdfuEu{@0qK(Czpi3O{;^E zRTZsa2S^cEhuRuv4uC0>xoBv hA5GMg0D;j&v_crj<=za`@P8cYna!;KQ~vui@K1gU%?khk diff --git a/share/32BitLaunch/Robust.32BitLaunch/Program.cs b/share/32BitLaunch/Robust.32BitLaunch/Program.cs index 490414c456..ec5943e4ca 100644 --- a/share/32BitLaunch/Robust.32BitLaunch/Program.cs +++ b/share/32BitLaunch/Robust.32BitLaunch/Program.cs @@ -26,35 +26,14 @@ */ using System; -using log4net; -namespace Robust._32BitLaunch +namespace Robust32 { class Program { static void Main(string[] args) { - log4net.Config.XmlConfigurator.Configure(); - - System.Console.WriteLine("32-bit OpenSim executor"); - System.Console.WriteLine("-----------------------"); - System.Console.WriteLine(""); - System.Console.WriteLine("This application is compiled for 32-bit CPU and will run under WOW32 or similar."); - System.Console.WriteLine("All 64-bit incompatibilities should be gone."); - System.Console.WriteLine(""); - System.Threading.Thread.Sleep(300); - try - { global::OpenSim.Server.OpenSimServer.Main(args); - } - catch (Exception ex) - { - System.Console.WriteLine("OpenSim threw an exception:"); - System.Console.WriteLine(ex.ToString()); - System.Console.WriteLine(""); - System.Console.WriteLine("Application will now terminate!"); - System.Console.WriteLine(""); - } } } } diff --git a/share/32BitLaunch/Robust.32BitLaunch/Robust32.csproj b/share/32BitLaunch/Robust.32BitLaunch/Robust32.csproj new file mode 100644 index 0000000000..a6dae90c3a --- /dev/null +++ b/share/32BitLaunch/Robust.32BitLaunch/Robust32.csproj @@ -0,0 +1,92 @@ + + + + Debug + x86 + {A159489E-6552-4734-8EFA-8E031F63C7F6} + Exe + false + Robust32 + v4.0 + + + 512 + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + + + true + full + false + ..\..\..\bin\ + DEBUG;TRACE + prompt + 4 + x86 + + + pdbonly + true + ..\..\..\bin\ + TRACE + prompt + 4 + x86 + true + Off + + + Robust32 + + + Robust32.Program + + + + + False + ..\..\..\bin\Robust.exe + + + + + + + + + + + + False + Microsoft .NET Framework 4 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 + false + + + False + Windows Installer 4.5 + true + + + + + + + \ No newline at end of file diff --git a/share/32BitLaunch/Robust.32BitLaunch/Robust32.csproj.user b/share/32BitLaunch/Robust.32BitLaunch/Robust32.csproj.user new file mode 100644 index 0000000000..8221333555 --- /dev/null +++ b/share/32BitLaunch/Robust.32BitLaunch/Robust32.csproj.user @@ -0,0 +1,13 @@ + + + + publish\ + + + + + + en-US + false + + \ No newline at end of file diff --git a/share/32BitLaunch/Robust.32BitLaunch/Robust32.sln b/share/32BitLaunch/Robust.32BitLaunch/Robust32.sln new file mode 100644 index 0000000000..368b3ca50b --- /dev/null +++ b/share/32BitLaunch/Robust.32BitLaunch/Robust32.sln @@ -0,0 +1,22 @@ + +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}") = "Robust32", "Robust32.csproj", "{A159489E-6552-4734-8EFA-8E031F63C7F6}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x86 = Debug|x86 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A159489E-6552-4734-8EFA-8E031F63C7F6}.Debug|x86.ActiveCfg = Debug|x86 + {A159489E-6552-4734-8EFA-8E031F63C7F6}.Debug|x86.Build.0 = Debug|x86 + {A159489E-6552-4734-8EFA-8E031F63C7F6}.Release|x86.ActiveCfg = Release|x86 + {A159489E-6552-4734-8EFA-8E031F63C7F6}.Release|x86.Build.0 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/share/32BitLaunch/Robust.32BitLaunch/app.config b/share/32BitLaunch/Robust.32BitLaunch/app.config new file mode 100644 index 0000000000..ca3ee0e0cf --- /dev/null +++ b/share/32BitLaunch/Robust.32BitLaunch/app.config @@ -0,0 +1,72 @@ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file