diff options
author | UbitUmarov | 2017-06-12 20:36:36 +0100 |
---|---|---|
committer | UbitUmarov | 2017-06-12 20:36:36 +0100 |
commit | 25371933b4809e0c542fa7de795e09b1b40bb21e (patch) | |
tree | 7c8a557f1d5b338405448e565fc3f4e8a06c6354 /share/32BitLaunch | |
parent | add Robust32.exe so recovering the option to run it also in 32bit on windows (diff) | |
download | opensim-SC_OLD-25371933b4809e0c542fa7de795e09b1b40bb21e.zip opensim-SC_OLD-25371933b4809e0c542fa7de795e09b1b40bb21e.tar.gz opensim-SC_OLD-25371933b4809e0c542fa7de795e09b1b40bb21e.tar.bz2 opensim-SC_OLD-25371933b4809e0c542fa7de795e09b1b40bb21e.tar.xz |
update Robust32.exe build files
Diffstat (limited to 'share/32BitLaunch')
-rw-r--r-- | share/32BitLaunch/README | 5 | ||||
-rwxr-xr-x | share/32BitLaunch/Robust.32BitLaunch.exe | bin | 5632 -> 0 bytes | |||
-rw-r--r-- | share/32BitLaunch/Robust.32BitLaunch/Program.cs | 23 | ||||
-rw-r--r-- | share/32BitLaunch/Robust.32BitLaunch/Robust32.csproj | 92 | ||||
-rw-r--r-- | share/32BitLaunch/Robust.32BitLaunch/Robust32.csproj.user | 13 | ||||
-rw-r--r-- | share/32BitLaunch/Robust.32BitLaunch/Robust32.sln | 22 | ||||
-rw-r--r-- | share/32BitLaunch/Robust.32BitLaunch/app.config | 72 |
7 files changed, 200 insertions, 27 deletions
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 @@ | |||
1 | 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. | ||
2 | |||
3 | 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. | ||
4 | |||
5 | 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 --- a/share/32BitLaunch/Robust.32BitLaunch.exe +++ /dev/null | |||
Binary files 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 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using log4net; | ||
30 | 29 | ||
31 | namespace Robust._32BitLaunch | 30 | namespace Robust32 |
32 | { | 31 | { |
33 | class Program | 32 | class Program |
34 | { | 33 | { |
35 | static void Main(string[] args) | 34 | static void Main(string[] args) |
36 | { | 35 | { |
37 | log4net.Config.XmlConfigurator.Configure(); | ||
38 | |||
39 | System.Console.WriteLine("32-bit OpenSim executor"); | ||
40 | System.Console.WriteLine("-----------------------"); | ||
41 | System.Console.WriteLine(""); | ||
42 | System.Console.WriteLine("This application is compiled for 32-bit CPU and will run under WOW32 or similar."); | ||
43 | System.Console.WriteLine("All 64-bit incompatibilities should be gone."); | ||
44 | System.Console.WriteLine(""); | ||
45 | System.Threading.Thread.Sleep(300); | ||
46 | try | ||
47 | { | ||
48 | global::OpenSim.Server.OpenSimServer.Main(args); | 36 | global::OpenSim.Server.OpenSimServer.Main(args); |
49 | } | ||
50 | catch (Exception ex) | ||
51 | { | ||
52 | System.Console.WriteLine("OpenSim threw an exception:"); | ||
53 | System.Console.WriteLine(ex.ToString()); | ||
54 | System.Console.WriteLine(""); | ||
55 | System.Console.WriteLine("Application will now terminate!"); | ||
56 | System.Console.WriteLine(""); | ||
57 | } | ||
58 | } | 37 | } |
59 | } | 38 | } |
60 | } | 39 | } |
diff --git a/share/32BitLaunch/Robust.32BitLaunch/Robust32.csproj b/share/32BitLaunch/Robust.32BitLaunch/Robust32.csproj new file mode 100644 index 0000000..a6dae90 --- /dev/null +++ b/share/32BitLaunch/Robust.32BitLaunch/Robust32.csproj | |||
@@ -0,0 +1,92 @@ | |||
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>{A159489E-6552-4734-8EFA-8E031F63C7F6}</ProjectGuid> | ||
7 | <OutputType>Exe</OutputType> | ||
8 | <NoStandardLibraries>false</NoStandardLibraries> | ||
9 | <AssemblyName>Robust32</AssemblyName> | ||
10 | <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> | ||
11 | <TargetFrameworkProfile> | ||
12 | </TargetFrameworkProfile> | ||
13 | <FileAlignment>512</FileAlignment> | ||
14 | <PublishUrl>publish\</PublishUrl> | ||
15 | <Install>true</Install> | ||
16 | <InstallFrom>Disk</InstallFrom> | ||
17 | <UpdateEnabled>false</UpdateEnabled> | ||
18 | <UpdateMode>Foreground</UpdateMode> | ||
19 | <UpdateInterval>7</UpdateInterval> | ||
20 | <UpdateIntervalUnits>Days</UpdateIntervalUnits> | ||
21 | <UpdatePeriodically>false</UpdatePeriodically> | ||
22 | <UpdateRequired>false</UpdateRequired> | ||
23 | <MapFileExtensions>true</MapFileExtensions> | ||
24 | <ApplicationRevision>0</ApplicationRevision> | ||
25 | <ApplicationVersion>1.0.0.%2a</ApplicationVersion> | ||
26 | <IsWebBootstrapper>false</IsWebBootstrapper> | ||
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\</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 | <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies> | ||
50 | </PropertyGroup> | ||
51 | <PropertyGroup> | ||
52 | <RootNamespace>Robust32</RootNamespace> | ||
53 | </PropertyGroup> | ||
54 | <PropertyGroup> | ||
55 | <StartupObject>Robust32.Program</StartupObject> | ||
56 | </PropertyGroup> | ||
57 | <ItemGroup> | ||
58 | <Reference Include="Microsoft.CSharp" /> | ||
59 | <Reference Include="Robust, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
60 | <SpecificVersion>False</SpecificVersion> | ||
61 | <HintPath>..\..\..\bin\Robust.exe</HintPath> | ||
62 | </Reference> | ||
63 | </ItemGroup> | ||
64 | <ItemGroup> | ||
65 | <Compile Include="Program.cs" /> | ||
66 | <Compile Include="Properties\AssemblyInfo.cs" /> | ||
67 | </ItemGroup> | ||
68 | <ItemGroup> | ||
69 | <None Include="app.config" /> | ||
70 | </ItemGroup> | ||
71 | <ItemGroup> | ||
72 | <BootstrapperPackage Include=".NETFramework,Version=v4.0"> | ||
73 | <Visible>False</Visible> | ||
74 | <ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName> | ||
75 | <Install>true</Install> | ||
76 | </BootstrapperPackage> | ||
77 | <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1"> | ||
78 | <Visible>False</Visible> | ||
79 | <ProductName>.NET Framework 3.5 SP1</ProductName> | ||
80 | <Install>false</Install> | ||
81 | </BootstrapperPackage> | ||
82 | <BootstrapperPackage Include="Microsoft.Windows.Installer.4.5"> | ||
83 | <Visible>False</Visible> | ||
84 | <ProductName>Windows Installer 4.5</ProductName> | ||
85 | <Install>true</Install> | ||
86 | </BootstrapperPackage> | ||
87 | </ItemGroup> | ||
88 | <Import Project="$(MSBuildToolsPath)\Microsoft.CSHARP.Targets" /> | ||
89 | <ProjectExtensions> | ||
90 | <VisualStudio AllowExistingFolder="true" /> | ||
91 | </ProjectExtensions> | ||
92 | </Project> \ No newline at end of file | ||
diff --git a/share/32BitLaunch/Robust.32BitLaunch/Robust32.csproj.user b/share/32BitLaunch/Robust.32BitLaunch/Robust32.csproj.user new file mode 100644 index 0000000..8221333 --- /dev/null +++ b/share/32BitLaunch/Robust.32BitLaunch/Robust32.csproj.user | |||
@@ -0,0 +1,13 @@ | |||
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 | </Project> \ No newline at end of file | ||
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 @@ | |||
1 | | ||
2 | Microsoft Visual Studio Solution File, Format Version 12.00 | ||
3 | # Visual Studio 14 | ||
4 | VisualStudioVersion = 14.0.25420.1 | ||
5 | MinimumVisualStudioVersion = 10.0.40219.1 | ||
6 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust32", "Robust32.csproj", "{A159489E-6552-4734-8EFA-8E031F63C7F6}" | ||
7 | EndProject | ||
8 | Global | ||
9 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
10 | Debug|x86 = Debug|x86 | ||
11 | Release|x86 = Release|x86 | ||
12 | EndGlobalSection | ||
13 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
14 | {A159489E-6552-4734-8EFA-8E031F63C7F6}.Debug|x86.ActiveCfg = Debug|x86 | ||
15 | {A159489E-6552-4734-8EFA-8E031F63C7F6}.Debug|x86.Build.0 = Debug|x86 | ||
16 | {A159489E-6552-4734-8EFA-8E031F63C7F6}.Release|x86.ActiveCfg = Release|x86 | ||
17 | {A159489E-6552-4734-8EFA-8E031F63C7F6}.Release|x86.Build.0 = Release|x86 | ||
18 | EndGlobalSection | ||
19 | GlobalSection(SolutionProperties) = preSolution | ||
20 | HideSolutionNode = FALSE | ||
21 | EndGlobalSection | ||
22 | 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 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
2 | <configuration> | ||
3 | <configSections> | ||
4 | <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" /> | ||
5 | </configSections> | ||
6 | <startup> | ||
7 | <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" /> | ||
8 | </startup> | ||
9 | <runtime> | ||
10 | <loadFromRemoteSources enabled="true" /> | ||
11 | </runtime> | ||
12 | <appSettings> | ||
13 | <add key="ClientSettingsProvider.ServiceUri" value="" /> | ||
14 | </appSettings> | ||
15 | <log4net> | ||
16 | <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console"> | ||
17 | <filter type="log4net.Filter.LoggerMatchFilter"> | ||
18 | <loggerToMatch value="special" /> | ||
19 | <acceptOnMatch value="false" /> | ||
20 | </filter> | ||
21 | <layout type="log4net.Layout.PatternLayout"> | ||
22 | <conversionPattern value="%date{HH:mm:ss} - %message" /> | ||
23 | </layout> | ||
24 | </appender> | ||
25 | <!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender: | ||
26 | <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender"> | ||
27 | <file value="log/Robust.log" /> | ||
28 | <rollingStyle value="Date" /> | ||
29 | <datePattern value="'.'yyyy-MM-dd"/> | ||
30 | ... | ||
31 | --> | ||
32 | <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> | ||
33 | <file value="Robust.log" /> | ||
34 | <appendToFile value="true" /> | ||
35 | <filter type="log4net.Filter.LoggerMatchFilter"> | ||
36 | <loggerToMatch value="special" /> | ||
37 | <acceptOnMatch value="false" /> | ||
38 | </filter> | ||
39 | <layout type="log4net.Layout.PatternLayout"> | ||
40 | <conversionPattern value="%date %-5level - %logger %message%newline" /> | ||
41 | </layout> | ||
42 | </appender> | ||
43 | <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender"> | ||
44 | <file value="RobustStats.log" /> | ||
45 | <appendToFile value="true" /> | ||
46 | <layout type="log4net.Layout.PatternLayout"> | ||
47 | <conversionPattern value="%date - %message%newline" /> | ||
48 | </layout> | ||
49 | </appender> | ||
50 | <root> | ||
51 | <level value="DEBUG" /> | ||
52 | <appender-ref ref="Console" /> | ||
53 | <appender-ref ref="LogFileAppender" /> | ||
54 | </root> | ||
55 | <!-- used for stats recording --> | ||
56 | <logger name="special.StatsLogger"> | ||
57 | <appender-ref ref="StatsLogFileAppender" /> | ||
58 | </logger> | ||
59 | </log4net> | ||
60 | <system.web> | ||
61 | <membership defaultProvider="ClientAuthenticationMembershipProvider"> | ||
62 | <providers> | ||
63 | <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" /> | ||
64 | </providers> | ||
65 | </membership> | ||
66 | <roleManager defaultProvider="ClientRoleProvider" enabled="true"> | ||
67 | <providers> | ||
68 | <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" /> | ||
69 | </providers> | ||
70 | </roleManager> | ||
71 | </system.web> | ||
72 | </configuration> \ No newline at end of file | ||