From bdc03dbff958459d0e2fd96045a859455293bf37 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Wed, 14 Apr 2010 10:36:03 -0700 Subject: [PATCH] * Added 32bitLauncher for Robust. Still need to test it on a 64 bit machine. * PrimitiveBaseShape wants to be be committed too -- EOF. --- OpenSim/Framework/PrimitiveBaseShape.cs | 6 +- OpenSim/Server/ServerMain.cs | 2 +- OpenSim/Tools/Robust.32BitLaunch/Program.cs | 60 +++++++++++++++++ .../Properties/AssemblyInfo.cs | 63 ++++++++++++++++++ .../Robust.32BitLaunch/Robust.32BitLaunch.sln | 20 ++++++ bin/Robust.32BitLaunch.exe | Bin 0 -> 5632 bytes bin/Robust.32BitLaunch.exe.config | 32 +++++++++ 7 files changed, 179 insertions(+), 4 deletions(-) create mode 100644 OpenSim/Tools/Robust.32BitLaunch/Program.cs create mode 100644 OpenSim/Tools/Robust.32BitLaunch/Properties/AssemblyInfo.cs create mode 100644 OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.sln create mode 100644 bin/Robust.32BitLaunch.exe create mode 100644 bin/Robust.32BitLaunch.exe.config diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs index 9d294801e2..1208b97300 100644 --- a/OpenSim/Framework/PrimitiveBaseShape.cs +++ b/OpenSim/Framework/PrimitiveBaseShape.cs @@ -188,9 +188,9 @@ namespace OpenSim.Framework m_textureEntry = DEFAULT_TEXTURE; } - /// - /// Construct a PrimitiveBaseShape object from a OpenMetaverse.Primitive object - /// + /// + /// Construct a PrimitiveBaseShape object from a OpenMetaverse.Primitive object + /// /// public PrimitiveBaseShape(Primitive prim) { diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs index 10cd9c5b89..d3e65a4bdd 100644 --- a/OpenSim/Server/ServerMain.cs +++ b/OpenSim/Server/ServerMain.cs @@ -47,7 +47,7 @@ namespace OpenSim.Server protected static List m_ServiceConnectors = new List(); - static int Main(string[] args) + public static int Main(string[] args) { m_Server = new HttpServerBase("R.O.B.U.S.T.", args); diff --git a/OpenSim/Tools/Robust.32BitLaunch/Program.cs b/OpenSim/Tools/Robust.32BitLaunch/Program.cs new file mode 100644 index 0000000000..490414c456 --- /dev/null +++ b/OpenSim/Tools/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/OpenSim/Tools/Robust.32BitLaunch/Properties/AssemblyInfo.cs b/OpenSim/Tools/Robust.32BitLaunch/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..cf80f472ef --- /dev/null +++ b/OpenSim/Tools/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/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.sln b/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.sln new file mode 100644 index 0000000000..c7c97b1d93 --- /dev/null +++ b/OpenSim/Tools/Robust.32BitLaunch/Robust.32BitLaunch.sln @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual C# Express 2008 +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 diff --git a/bin/Robust.32BitLaunch.exe b/bin/Robust.32BitLaunch.exe new file mode 100644 index 0000000000000000000000000000000000000000..3119dc966e43aa93a26ae3c205b4675143755cdb GIT binary patch literal 5632 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 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +