aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/share/32BitLaunch/OpenSim.32BitLaunch
diff options
context:
space:
mode:
authorUbitUmarov2017-06-11 22:36:08 +0100
committerUbitUmarov2017-06-11 22:36:08 +0100
commit953872510f1c375c2a65a8115e549485814fc0c4 (patch)
tree899ec25e871336e3d325707de381a2f45e4be964 /share/32BitLaunch/OpenSim.32BitLaunch
parentfix a error message (diff)
downloadopensim-SC_OLD-953872510f1c375c2a65a8115e549485814fc0c4.zip
opensim-SC_OLD-953872510f1c375c2a65a8115e549485814fc0c4.tar.gz
opensim-SC_OLD-953872510f1c375c2a65a8115e549485814fc0c4.tar.bz2
opensim-SC_OLD-953872510f1c375c2a65a8115e549485814fc0c4.tar.xz
add/replace sources of OpenSim32.exe
Diffstat (limited to 'share/32BitLaunch/OpenSim.32BitLaunch')
-rw-r--r--share/32BitLaunch/OpenSim.32BitLaunch/OpenSim32.csproj94
-rw-r--r--share/32BitLaunch/OpenSim.32BitLaunch/OpenSim32.csproj.user16
-rw-r--r--share/32BitLaunch/OpenSim.32BitLaunch/OpenSim32.sln22
-rw-r--r--share/32BitLaunch/OpenSim.32BitLaunch/Program.cs24
-rw-r--r--share/32BitLaunch/OpenSim.32BitLaunch/Properties/AssemblyInfo.cs8
-rw-r--r--share/32BitLaunch/OpenSim.32BitLaunch/app.config75
6 files changed, 213 insertions, 26 deletions
diff --git a/share/32BitLaunch/OpenSim.32BitLaunch/OpenSim32.csproj b/share/32BitLaunch/OpenSim.32BitLaunch/OpenSim32.csproj
new file mode 100644
index 0000000..c9a03e1
--- /dev/null
+++ b/share/32BitLaunch/OpenSim.32BitLaunch/OpenSim32.csproj
@@ -0,0 +1,94 @@
1<?xml version="1.0" encoding="utf-8"?>
2<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 <PropertyGroup>
4 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5 <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
6 <ProjectGuid>{968B4C73-280D-4FF5-9F73-DD3D10160C2E}</ProjectGuid>
7 <OutputType>Exe</OutputType>
8 <NoStandardLibraries>false</NoStandardLibraries>
9 <AssemblyName>OpenSim32</AssemblyName>
10 <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
11 <TargetFrameworkProfile>
12 </TargetFrameworkProfile>
13 <FileAlignment>512</FileAlignment>
14 <IsWebBootstrapper>false</IsWebBootstrapper>
15 <PublishUrl>publish\</PublishUrl>
16 <Install>true</Install>
17 <InstallFrom>Disk</InstallFrom>
18 <UpdateEnabled>false</UpdateEnabled>
19 <UpdateMode>Foreground</UpdateMode>
20 <UpdateInterval>7</UpdateInterval>
21 <UpdateIntervalUnits>Days</UpdateIntervalUnits>
22 <UpdatePeriodically>false</UpdatePeriodically>
23 <UpdateRequired>false</UpdateRequired>
24 <MapFileExtensions>true</MapFileExtensions>
25 <ApplicationRevision>0</ApplicationRevision>
26 <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
27 <UseApplicationTrust>false</UseApplicationTrust>
28 <BootstrapperEnabled>true</BootstrapperEnabled>
29 </PropertyGroup>
30 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
31 <DebugSymbols>true</DebugSymbols>
32 <DebugType>full</DebugType>
33 <Optimize>false</Optimize>
34 <OutputPath>bin\Debug\</OutputPath>
35 <DefineConstants>DEBUG;TRACE</DefineConstants>
36 <ErrorReport>prompt</ErrorReport>
37 <WarningLevel>4</WarningLevel>
38 <PlatformTarget>x86</PlatformTarget>
39 </PropertyGroup>
40 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
41 <DebugType>pdbonly</DebugType>
42 <Optimize>true</Optimize>
43 <OutputPath>..\..\..\bin\</OutputPath>
44 <DefineConstants>TRACE</DefineConstants>
45 <ErrorReport>prompt</ErrorReport>
46 <WarningLevel>4</WarningLevel>
47 <PlatformTarget>x86</PlatformTarget>
48 <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
49 <UseVSHostingProcess>false</UseVSHostingProcess>
50 </PropertyGroup>
51 <PropertyGroup>
52 <RootNamespace>OpenSim32</RootNamespace>
53 </PropertyGroup>
54 <ItemGroup>
55 <Reference Include="log4net">
56 <HintPath>..\..\..\bin\log4net.dll</HintPath>
57 </Reference>
58 <Reference Include="Microsoft.CSharp" />
59 <Reference Include="OpenSim">
60 <HintPath>..\..\..\bin\OpenSim.exe</HintPath>
61 </Reference>
62 <Reference Include="System" />
63 <Reference Include="System.Core" />
64 <Reference Include="System.Data" />
65 </ItemGroup>
66 <ItemGroup>
67 <Compile Include="Program.cs" />
68 <Compile Include="Properties\AssemblyInfo.cs" />
69 </ItemGroup>
70 <ItemGroup>
71 <None Include="app.config" />
72 </ItemGroup>
73 <ItemGroup>
74 <BootstrapperPackage Include=".NETFramework,Version=v4.0">
75 <Visible>False</Visible>
76 <ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
77 <Install>true</Install>
78 </BootstrapperPackage>
79 <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
80 <Visible>False</Visible>
81 <ProductName>.NET Framework 3.5 SP1</ProductName>
82 <Install>false</Install>
83 </BootstrapperPackage>
84 <BootstrapperPackage Include="Microsoft.Windows.Installer.4.5">
85 <Visible>False</Visible>
86 <ProductName>Windows Installer 4.5</ProductName>
87 <Install>true</Install>
88 </BootstrapperPackage>
89 </ItemGroup>
90 <Import Project="$(MSBuildToolsPath)\Microsoft.CSHARP.Targets" />
91 <ProjectExtensions>
92 <VisualStudio AllowExistingFolder="true" />
93 </ProjectExtensions>
94</Project> \ 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 0000000..2f100f7
--- /dev/null
+++ b/share/32BitLaunch/OpenSim.32BitLaunch/OpenSim32.csproj.user
@@ -0,0 +1,16 @@
1<?xml version="1.0" encoding="utf-8"?>
2<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 <PropertyGroup>
4 <PublishUrlHistory>publish\</PublishUrlHistory>
5 <InstallUrlHistory />
6 <SupportUrlHistory />
7 <UpdateUrlHistory />
8 <BootstrapperUrlHistory />
9 <ErrorReportUrlHistory />
10 <FallbackCulture>en-US</FallbackCulture>
11 <VerifyUploadedFiles>false</VerifyUploadedFiles>
12 </PropertyGroup>
13 <PropertyGroup>
14 <ReferencePath>C:\Avination\testsim\bin\</ReferencePath>
15 </PropertyGroup>
16</Project> \ 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 0000000..93522ea
--- /dev/null
+++ b/share/32BitLaunch/OpenSim.32BitLaunch/OpenSim32.sln
@@ -0,0 +1,22 @@
1
2Microsoft Visual Studio Solution File, Format Version 12.00
3# Visual Studio 14
4VisualStudioVersion = 14.0.25420.1
5MinimumVisualStudioVersion = 10.0.40219.1
6Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim32", "OpenSim32.csproj", "{968B4C73-280D-4FF5-9F73-DD3D10160C2E}"
7EndProject
8Global
9 GlobalSection(SolutionConfigurationPlatforms) = preSolution
10 Debug|x86 = Debug|x86
11 Release|x86 = Release|x86
12 EndGlobalSection
13 GlobalSection(ProjectConfigurationPlatforms) = postSolution
14 {968B4C73-280D-4FF5-9F73-DD3D10160C2E}.Debug|x86.ActiveCfg = Release|x86
15 {968B4C73-280D-4FF5-9F73-DD3D10160C2E}.Debug|x86.Build.0 = Release|x86
16 {968B4C73-280D-4FF5-9F73-DD3D10160C2E}.Release|x86.ActiveCfg = Release|x86
17 {968B4C73-280D-4FF5-9F73-DD3D10160C2E}.Release|x86.Build.0 = Release|x86
18 EndGlobalSection
19 GlobalSection(SolutionProperties) = preSolution
20 HideSolutionNode = FALSE
21 EndGlobalSection
22EndGlobal
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 @@
27 27
28using System; 28using System;
29 29
30namespace OpenSim._32BitLaunch 30namespace OpenSim32
31{ 31{
32 class Program 32 class Program
33 { 33 {
34 static void Main(string[] args) 34 static void Main(string[] args)
35 { 35 {
36 log4net.Config.XmlConfigurator.Configure(); 36 global::OpenSim.Application.Main(args);
37
38 System.Console.WriteLine("32-bit OpenSim executor");
39 System.Console.WriteLine("-----------------------");
40 System.Console.WriteLine("");
41 System.Console.WriteLine("This application is compiled for 32-bit CPU and will run under WOW32 or similar.");
42 System.Console.WriteLine("All 64-bit incompatibilities should be gone.");
43 System.Console.WriteLine("");
44 System.Threading.Thread.Sleep(300);
45 try
46 {
47 global::OpenSim.Application.Main(args);
48 }
49 catch (Exception ex)
50 {
51 System.Console.WriteLine("OpenSim threw an exception:");
52 System.Console.WriteLine(ex.ToString());
53 System.Console.WriteLine("");
54 System.Console.WriteLine("Application will now terminate!");
55 System.Console.WriteLine("");
56 }
57 } 37 }
58 } 38 }
59} 39}
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;
32// General information about an assembly is controlled through the following 32// General information about an assembly is controlled through the following
33// set of attributes. Change these attribute values to modify the information 33// set of attributes. Change these attribute values to modify the information
34// associated with an assembly. 34// associated with an assembly.
35[assembly: AssemblyTitle("OpenSim.32BitLaunch")] 35[assembly: AssemblyTitle("OpenSim32")]
36[assembly: AssemblyDescription("")] 36[assembly: AssemblyDescription("OpenSim 32Bit Launcher")]
37[assembly: AssemblyConfiguration("")] 37[assembly: AssemblyConfiguration("")]
38[assembly: AssemblyCompany("http://opensimulator.org")] 38[assembly: AssemblyCompany("http://opensimulator.org")]
39[assembly: AssemblyProduct("OpenSim.32BitLaunch")] 39[assembly: AssemblyProduct("OpenSim 32BitLauncher")]
40[assembly: AssemblyCopyright("Copyright (c) 2008")] 40[assembly: AssemblyCopyright("Copyright (c) 2008")]
41[assembly: AssemblyTrademark("")] 41[assembly: AssemblyTrademark("")]
42[assembly: AssemblyCulture("")] 42[assembly: AssemblyCulture("")]
@@ -59,5 +59,5 @@ using System.Runtime.InteropServices;
59// You can specify all the values or you can default the Build and Revision Numbers 59// You can specify all the values or you can default the Build and Revision Numbers
60// by using the '*' as shown below: 60// by using the '*' as shown below:
61// [assembly: AssemblyVersion("0.6.3.*")] 61// [assembly: AssemblyVersion("0.6.3.*")]
62[assembly: AssemblyVersion("0.6.3.*")] 62[assembly: AssemblyVersion("0.9.1.*")]
63[assembly: AssemblyFileVersion("1.0.0.0")] 63[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 @@
1<configuration>
2 <configSections>
3 <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
4 </configSections>
5 <startup>
6 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
7 </startup>
8 <runtime>
9 <loadFromRemoteSources enabled="true" />
10 </runtime>
11 <appSettings>
12 </appSettings>
13 <log4net>
14 <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
15 <filter type="log4net.Filter.LoggerMatchFilter">
16 <loggerToMatch value="special"/>
17 <acceptOnMatch value="false"/>
18 </filter>
19 <layout type="log4net.Layout.PatternLayout">
20 <conversionPattern value="%date{HH:mm:ss} - %message" />
21 <!-- console log with milliseconds. Useful for debugging -->
22 <!-- <conversionPattern value="%date{HH:mm:ss.fff} - %message" /> -->
23 </layout>
24 </appender>
25
26 <!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender:
27 <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
28 <file value="log/OpenSim.log" />
29 <rollingStyle value="Date" />
30 <datePattern value="'.'yyyy-MM-dd"/>
31 ...
32-->
33
34 <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
35 <file value="OpenSim.log" />
36 <appendToFile value="true" />
37 <filter type="log4net.Filter.LoggerMatchFilter">
38 <loggerToMatch value="special"/>
39 <acceptOnMatch value="false"/>
40 </filter>
41 <layout type="log4net.Layout.PatternLayout">
42 <conversionPattern value="%date %-5level - %logger %message%newline" />
43 </layout>
44 </appender>
45
46 <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender">
47 <file value="OpenSimStats.log"/>
48 <appendToFile value="true" />
49 <layout type="log4net.Layout.PatternLayout">
50 <conversionPattern value="%date - %message%newline" />
51 </layout>
52 </appender>
53
54 <root>
55 <level value="DEBUG" />
56 <appender-ref ref="Console" />
57 <appender-ref ref="LogFileAppender" />
58 </root>
59
60 <!-- Independently control logging level for XEngine -->
61 <logger name="OpenSim.Region.ScriptEngine.XEngine">
62 <level value="INFO"/>
63 </logger>
64
65 <!-- Independently control logging level for per region module loading -->
66 <logger name="OpenSim.ApplicationPlugins.RegionModulesController.RegionModulesControllerPlugin">
67 <level value="INFO"/>
68 </logger>
69
70 <!-- used for stats recording -->
71 <logger name="special.StatsLogger">
72 <appender-ref ref="StatsLogFileAppender"/>
73 </logger>
74 </log4net>
75</configuration> \ No newline at end of file
generated by cgit v1.1 at 2024-08-25 00:36:38 +0000