From e8ca900ef837f7d4faa7e9cc4dd9e02947a4d46f Mon Sep 17 00:00:00 2001 From: BlueWall Date: Wed, 3 Sep 2014 12:57:29 -0400 Subject: [PATCH] Move the 32 bit launchers as discussed at OpenSimulator Office Hour 9//2/14 http://opensimulator.org/wiki/Chat_log_from_the_meeting_on_2014-09-02. --- share/32BitLaunch/OpenSim.32BitLaunch.exe | Bin 0 -> 5632 bytes .../OpenSim.32BitLaunch/Program.cs | 59 ++++++++++++++++ .../Properties/AssemblyInfo.cs | 63 ++++++++++++++++++ share/32BitLaunch/README | 5 ++ share/32BitLaunch/Robust.32BitLaunch.exe | Bin 0 -> 5632 bytes .../32BitLaunch/Robust.32BitLaunch/Program.cs | 60 +++++++++++++++++ .../Properties/AssemblyInfo.cs | 63 ++++++++++++++++++ .../Robust.32BitLaunch/Robust.32BitLaunch.sln | 20 ++++++ 8 files changed, 270 insertions(+) create mode 100755 share/32BitLaunch/OpenSim.32BitLaunch.exe create mode 100644 share/32BitLaunch/OpenSim.32BitLaunch/Program.cs create mode 100644 share/32BitLaunch/OpenSim.32BitLaunch/Properties/AssemblyInfo.cs create mode 100644 share/32BitLaunch/README create mode 100755 share/32BitLaunch/Robust.32BitLaunch.exe create mode 100644 share/32BitLaunch/Robust.32BitLaunch/Program.cs create mode 100644 share/32BitLaunch/Robust.32BitLaunch/Properties/AssemblyInfo.cs create mode 100644 share/32BitLaunch/Robust.32BitLaunch/Robust.32BitLaunch.sln diff --git a/share/32BitLaunch/OpenSim.32BitLaunch.exe b/share/32BitLaunch/OpenSim.32BitLaunch.exe new file mode 100755 index 0000000000000000000000000000000000000000..62c14af416b823e435f976ca503ed51974f3c899 GIT binary patch literal 5632 zcmeHLU2Ggz6+ScmiIX%|{@Ny_NyqE7vfFreZ7)vZ*!4Qz#4&YZlifH;W0cI!Uau#a zpY6=7;{^$p&Yhjz z^-sXO0(X7SoO{l>=bn4+nRCzh>@zP@3lX)V-@8Zj2Awj0(R%4Z+6npw!YW( zhBEzLSANk7w6gD&e8bU9!*#t-D+tZ6xSHi^*_oW?ctxS_*s<+!P4(<4qG_dt#@>JK ze7xF6q$=B$4x$G@!Gl}plK>ie2AzS1hZ@-pOxn*+T0sY$TMK2rL9|o;HJ-I$Btmzd zAbOhd4AEz8HDdGQT4aU>xksAm{|?vcrc22VjL$U9(L=EuV!U@d0C;k*HM=pAO(VLd z`+;v_ByGz8X-DrwZ)zD>ulvIGAjmGGYv`~Jfz%%C z3eOKmq4`=}y4`yaN)kDhVvd`9dG#`&mb zaEk4C0Tuv%Os@jIE#V&}yer|u3e!^(J}u#bgtwHhDed%A3GYbCA0*tW{!JO9gD|6= zrqv^AJK2ES=;!JWfWNQuihor-S0C#`VWsJP~$E|vw&M(McDzuF`~ zPGEYzZ51e24MO42OyRmPLpp0%F6n0I`DFMA>WHhKuehP*2z^fYf#tb~cglk=!qdq2 z;-=@{7!UCp6e^*pPZ0|?G(wujgFrY1yPCH`TQme?a#jSUZP*xNwrIN8~sfdPSLX5zg zHO9iYGL-wx)`B2id|uebvc!UhNwwqWd0-VR+X|apzCrwv?UmB52;-+79V1iLGbLh1^kqy?I#AmX;Ji)u;rD z3k;f%u61Y#c^|x+kTayM>|zs?a@`-pL}TOk@l<24E>>YJA?EsWKd$ttpe~~C?Rsa& z+wYWS-u&iUFWtD+@-B7!;>+`M`_mu2fcr){*x90y(yA#+Cj+$&VAnXK9UTX4EHWYR+d4=ksGH_-ES&o7|@P-u5OQ)xYBuQrfM z9V6;h=*(dl7eD#S?Pt2b{R-b^6T|anwRF>R=NCOk%$r6as@Lc3>*joIi+v?4oUb`$KJR&U z5RaN~uX(R zM1QWu9TTp#qyguUr>_E@qVvF}km$}~JOy|fIJdW2KfN1O#qs3m8P!u!l@)X31OP0B z=$}I}@u4S5##2aDoQ%00rdGf_xSYTOq`pQfmjZOV^^VFqa!5`-G`L8K>ot8>%A_d% zrEv@4ZG`6im^*>h_%h%%s@Rc%k&x;ap)~|&n3DK;!1%_Bk~$}1wubL2T|%S_v{}@@ zO5KJmW&}vOY+EDkvfS!)%@yqcJ`OqIPeU(XD<%>+!Oo5*eRDDevjv>^x%Ff9RK4^1 z`ykI=jM6oyYP)Gyn_E}MI(#4Fe*>t&6+i*cvL^Oc8Ghm&m0%%%L$9Z4)C2o_NyDz# z>xg8uOVYNP+FU*@))=1`k0Q_ir#7CEKA(kN50_&FD~C-x-n_5V($}l?to8U>e`oNe zqR==_Ie?EGM3xQjXozaQEE^}qXEcO9h~5u>3;^Ty=`VjhGPdm4+EP^0k0x+iBsAfg z9#>nVi3|DDea8}75E^dLusv6dCaNMxj6Jnu+lW!C=rt&CgV99AcZUOW5yf-R=UAri z1>Qo~XL`=C5jgr%e?oH%*IE!k7~iFGHK@|Gy0WRFz*k0CU1bs9UkS~{1v{EJTWzZL zbfa8OBqI%>UkSn~cfs4FJp&0j4{Ha)tf1no*2bXt;@Jx96vbKJT0)gv62T_54#rwF zw1ysBIc9~wUZ%y8ur-_EXu=4l+$HaZ@Dp0a8aMIH05>ieb|7k-l1h>rSQDF`TxI)6 gvhD;3j3na|!ayGPdZ0!BcI|-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 literal 0 HcmV?d00001 diff --git a/share/32BitLaunch/Robust.32BitLaunch/Program.cs b/share/32BitLaunch/Robust.32BitLaunch/Program.cs new file mode 100644 index 0000000000..490414c456 --- /dev/null +++ b/share/32BitLaunch/Robust.32BitLaunch/Program.cs @@ -0,0 +1,60 @@ +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSimulator Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +using System; +using log4net; + +namespace Robust._32BitLaunch +{ + 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/Properties/AssemblyInfo.cs b/share/32BitLaunch/Robust.32BitLaunch/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..cf80f472ef --- /dev/null +++ b/share/32BitLaunch/Robust.32BitLaunch/Properties/AssemblyInfo.cs @@ -0,0 +1,63 @@ +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSimulator Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Robust.32BitLaunch")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("http://opensimulator.org")] +[assembly: AssemblyProduct("Robust.32BitLaunch")] +[assembly: AssemblyCopyright("Copyright (c) 2008")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("5072e919-46ab-47e6-8a63-08108324ccdf")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("0.6.3.*")] +[assembly: AssemblyVersion("0.6.3.*")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/share/32BitLaunch/Robust.32BitLaunch/Robust.32BitLaunch.sln b/share/32BitLaunch/Robust.32BitLaunch/Robust.32BitLaunch.sln new file mode 100644 index 0000000000..a48a2d34fc --- /dev/null +++ b/share/32BitLaunch/Robust.32BitLaunch/Robust.32BitLaunch.sln @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual C# Express 2010 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.32BitLaunch", "Robust.32BitLaunch.csproj", "{595D67F3-B413-4A43-8568-5B5930E3B31D}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {595D67F3-B413-4A43-8568-5B5930E3B31D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {595D67F3-B413-4A43-8568-5B5930E3B31D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {595D67F3-B413-4A43-8568-5B5930E3B31D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {595D67F3-B413-4A43-8568-5B5930E3B31D}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal