From 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb Mon Sep 17 00:00:00 2001 From: onefang Date: Sun, 19 May 2019 21:24:15 +1000 Subject: Dump OpenSim 0.9.0.1 into it's own branch. --- share/32BitLaunch/OpenSim.32BitLaunch.exe | Bin 5632 -> 0 bytes .../32BitLaunch/OpenSim.32BitLaunch/OpenSim32.sln | 22 ++++++ share/32BitLaunch/OpenSim.32BitLaunch/Program.cs | 24 +------ .../OpenSim.32BitLaunch/Properties/AssemblyInfo.cs | 8 +-- share/32BitLaunch/OpenSim.32BitLaunch/app.config | 75 +++++++++++++++++++++ share/32BitLaunch/README | 5 -- share/32BitLaunch/Robust.32BitLaunch.exe | Bin 5632 -> 0 bytes share/32BitLaunch/Robust.32BitLaunch/Program.cs | 23 +------ share/32BitLaunch/Robust.32BitLaunch/Robust32.sln | 22 ++++++ share/32BitLaunch/Robust.32BitLaunch/app.config | 72 ++++++++++++++++++++ 10 files changed, 198 insertions(+), 53 deletions(-) delete mode 100755 share/32BitLaunch/OpenSim.32BitLaunch.exe create mode 100644 share/32BitLaunch/OpenSim.32BitLaunch/OpenSim32.sln create mode 100644 share/32BitLaunch/OpenSim.32BitLaunch/app.config delete mode 100644 share/32BitLaunch/README delete mode 100755 share/32BitLaunch/Robust.32BitLaunch.exe create mode 100644 share/32BitLaunch/Robust.32BitLaunch/Robust32.sln create mode 100644 share/32BitLaunch/Robust.32BitLaunch/app.config (limited to 'share/32BitLaunch') diff --git a/share/32BitLaunch/OpenSim.32BitLaunch.exe b/share/32BitLaunch/OpenSim.32BitLaunch.exe deleted file mode 100755 index 62c14af..0000000 Binary files a/share/32BitLaunch/OpenSim.32BitLaunch.exe and /dev/null differ diff --git a/share/32BitLaunch/OpenSim.32BitLaunch/OpenSim32.sln b/share/32BitLaunch/OpenSim.32BitLaunch/OpenSim32.sln new file mode 100644 index 0000000..93522ea --- /dev/null +++ b/share/32BitLaunch/OpenSim.32BitLaunch/OpenSim32.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}") = "OpenSim32", "OpenSim32.csproj", "{968B4C73-280D-4FF5-9F73-DD3D10160C2E}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x86 = Debug|x86 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {968B4C73-280D-4FF5-9F73-DD3D10160C2E}.Debug|x86.ActiveCfg = Release|x86 + {968B4C73-280D-4FF5-9F73-DD3D10160C2E}.Debug|x86.Build.0 = Release|x86 + {968B4C73-280D-4FF5-9F73-DD3D10160C2E}.Release|x86.ActiveCfg = Release|x86 + {968B4C73-280D-4FF5-9F73-DD3D10160C2E}.Release|x86.Build.0 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/share/32BitLaunch/OpenSim.32BitLaunch/Program.cs b/share/32BitLaunch/OpenSim.32BitLaunch/Program.cs index 52806b8..ca6c359 100644 --- a/share/32BitLaunch/OpenSim.32BitLaunch/Program.cs +++ b/share/32BitLaunch/OpenSim.32BitLaunch/Program.cs @@ -27,33 +27,13 @@ using System; -namespace OpenSim._32BitLaunch +namespace OpenSim32 { 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.Application.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(""); - } + global::OpenSim.Application.Main(args); } } } diff --git a/share/32BitLaunch/OpenSim.32BitLaunch/Properties/AssemblyInfo.cs b/share/32BitLaunch/OpenSim.32BitLaunch/Properties/AssemblyInfo.cs index e81870f..bda1a79 100644 --- a/share/32BitLaunch/OpenSim.32BitLaunch/Properties/AssemblyInfo.cs +++ b/share/32BitLaunch/OpenSim.32BitLaunch/Properties/AssemblyInfo.cs @@ -32,11 +32,11 @@ 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("OpenSim.32BitLaunch")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyTitle("OpenSim32")] +[assembly: AssemblyDescription("OpenSim 32Bit Launcher")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("http://opensimulator.org")] -[assembly: AssemblyProduct("OpenSim.32BitLaunch")] +[assembly: AssemblyProduct("OpenSim 32BitLauncher")] [assembly: AssemblyCopyright("Copyright (c) 2008")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -59,5 +59,5 @@ using System.Runtime.InteropServices; // 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: AssemblyVersion("0.9.1.*")] [assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/share/32BitLaunch/OpenSim.32BitLaunch/app.config b/share/32BitLaunch/OpenSim.32BitLaunch/app.config new file mode 100644 index 0000000..9224240 --- /dev/null +++ b/share/32BitLaunch/OpenSim.32BitLaunch/app.config @@ -0,0 +1,75 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/share/32BitLaunch/README b/share/32BitLaunch/README deleted file mode 100644 index 443cde0..0000000 --- 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 affedb4..0000000 Binary files a/share/32BitLaunch/Robust.32BitLaunch.exe and /dev/null differ diff --git a/share/32BitLaunch/Robust.32BitLaunch/Program.cs b/share/32BitLaunch/Robust.32BitLaunch/Program.cs index 490414c..ec5943e 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.sln b/share/32BitLaunch/Robust.32BitLaunch/Robust32.sln new file mode 100644 index 0000000..368b3ca --- /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 0000000..ca3ee0e --- /dev/null +++ b/share/32BitLaunch/Robust.32BitLaunch/app.config @@ -0,0 +1,72 @@ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- cgit v1.1