From 953872510f1c375c2a65a8115e549485814fc0c4 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sun, 11 Jun 2017 22:36:08 +0100 Subject: [PATCH] add/replace sources of OpenSim32.exe --- share/32BitLaunch/OpenSim.32BitLaunch.exe | Bin 5632 -> 0 bytes .../OpenSim.32BitLaunch/OpenSim32.csproj | 94 ++++++++++++++++++ .../OpenSim.32BitLaunch/OpenSim32.csproj.user | 16 +++ .../OpenSim.32BitLaunch/OpenSim32.sln | 22 ++++ .../OpenSim.32BitLaunch/Program.cs | 24 +---- .../Properties/AssemblyInfo.cs | 8 +- .../OpenSim.32BitLaunch/app.config | 75 ++++++++++++++ 7 files changed, 213 insertions(+), 26 deletions(-) delete mode 100755 share/32BitLaunch/OpenSim.32BitLaunch.exe create mode 100644 share/32BitLaunch/OpenSim.32BitLaunch/OpenSim32.csproj create mode 100644 share/32BitLaunch/OpenSim.32BitLaunch/OpenSim32.csproj.user create mode 100644 share/32BitLaunch/OpenSim.32BitLaunch/OpenSim32.sln create mode 100644 share/32BitLaunch/OpenSim.32BitLaunch/app.config diff --git a/share/32BitLaunch/OpenSim.32BitLaunch.exe b/share/32BitLaunch/OpenSim.32BitLaunch.exe deleted file mode 100755 index 62c14af416b823e435f976ca503ed51974f3c899..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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!B + + + Debug + x86 + {968B4C73-280D-4FF5-9F73-DD3D10160C2E} + Exe + false + OpenSim32 + v4.0 + + + 512 + false + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + x86 + + + pdbonly + true + ..\..\..\bin\ + TRACE + prompt + 4 + x86 + true + false + + + OpenSim32 + + + + ..\..\..\bin\log4net.dll + + + + ..\..\..\bin\OpenSim.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/OpenSim.32BitLaunch/OpenSim32.csproj.user b/share/32BitLaunch/OpenSim.32BitLaunch/OpenSim32.csproj.user new file mode 100644 index 0000000000..2f100f7ba6 --- /dev/null +++ b/share/32BitLaunch/OpenSim.32BitLaunch/OpenSim32.csproj.user @@ -0,0 +1,16 @@ + + + + publish\ + + + + + + en-US + false + + + C:\Avination\testsim\bin\ + + \ No newline at end of file diff --git a/share/32BitLaunch/OpenSim.32BitLaunch/OpenSim32.sln b/share/32BitLaunch/OpenSim.32BitLaunch/OpenSim32.sln new file mode 100644 index 0000000000..93522eabdc --- /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 52806b81bf..ca6c359d40 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 e81870f92f..bda1a79493 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 0000000000..92242406f1 --- /dev/null +++ b/share/32BitLaunch/OpenSim.32BitLaunch/app.config @@ -0,0 +1,75 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file