diff options
author | Jeff Ames | 2008-02-15 02:37:05 +0000 |
---|---|---|
committer | Jeff Ames | 2008-02-15 02:37:05 +0000 |
commit | b5a9592cc1214b9bee1a69c20cd9ebe5983a396c (patch) | |
tree | 96a9796e9c96c33dd459f3489511295f85cb80ca /OpenSim | |
parent | Update svn properties. (diff) | |
download | opensim-SC-b5a9592cc1214b9bee1a69c20cd9ebe5983a396c.zip opensim-SC-b5a9592cc1214b9bee1a69c20cd9ebe5983a396c.tar.gz opensim-SC-b5a9592cc1214b9bee1a69c20cd9ebe5983a396c.tar.bz2 opensim-SC-b5a9592cc1214b9bee1a69c20cd9ebe5983a396c.tar.xz |
Moved LaunchSLClient build system to Prebuild.
Refactored LaunchSLClient code a bit.
Diffstat (limited to '')
8 files changed, 185 insertions, 190 deletions
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.Designer.cs b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.Designer.cs index 40dee17..db9ad33 100644 --- a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.Designer.cs +++ b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.Designer.cs | |||
@@ -98,15 +98,11 @@ namespace LaunchSLClient | |||
98 | this.Text = "OpenSim Client Launcher"; | 98 | this.Text = "OpenSim Client Launcher"; |
99 | this.ResumeLayout(false); | 99 | this.ResumeLayout(false); |
100 | this.PerformLayout(); | 100 | this.PerformLayout(); |
101 | |||
102 | } | 101 | } |
103 | 102 | ||
104 | #endregion | 103 | #endregion |
105 | 104 | ||
106 | private System.Windows.Forms.ComboBox comboBox1; | 105 | private System.Windows.Forms.ComboBox comboBox1; |
107 | private System.Windows.Forms.TextBox textBox1; | 106 | private System.Windows.Forms.TextBox textBox1; |
108 | |||
109 | } | 107 | } |
110 | } | 108 | } |
111 | |||
112 | |||
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.cs b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.cs index 70f8b87..183a104 100644 --- a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.cs +++ b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.cs | |||
@@ -25,6 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | |||
28 | using System; | 29 | using System; |
29 | using System.IO; | 30 | using System.IO; |
30 | using System.Collections; | 31 | using System.Collections; |
@@ -42,143 +43,149 @@ namespace LaunchSLClient | |||
42 | { | 43 | { |
43 | public partial class Form1 : Form | 44 | public partial class Form1 : Form |
44 | { | 45 | { |
46 | const string deepGridUrl = "http://user.deepgrid.com:8002/"; | ||
47 | const string osGridUrl = "http://www.osgrid.org:8002/"; | ||
48 | const string openLifeGridUrl = "http://logingrid.net:8002"; | ||
49 | |||
45 | string gridUrl = ""; | 50 | string gridUrl = ""; |
46 | string sandboxUrl = ""; | 51 | string sandboxUrl = ""; |
47 | string deepGridUrl = "http://user.deepgrid.com:8002/"; | ||
48 | string osGridUrl = "http://www.osgrid.org:8002/"; | ||
49 | string runUrl = ""; | 52 | string runUrl = ""; |
50 | string runLine = ""; | 53 | string runLine = ""; |
51 | Object exeFlags; | 54 | string exeFlags = ""; |
52 | Object exePath; | 55 | string exePath = ""; |
53 | |||
54 | 56 | ||
55 | public Form1() | 57 | private void addLocalSandbox(ref ArrayList menuItems) |
56 | { | 58 | { |
57 | InitializeComponent(); | 59 | // build sandbox URL from Regions\default.xml |
58 | ArrayList menuItems=new ArrayList(); | 60 | // this is highly dependant on a standard default.xml |
59 | menuItems.Add("Please select one:"); | 61 | if (File.Exists(@"Regions\default.xml")) |
60 | string sandboxHostName = ""; | ||
61 | string sandboxPort = ""; | ||
62 | Object simPath = null; | ||
63 | FileInfo defaultFile; | ||
64 | StreamReader stream; | ||
65 | |||
66 | |||
67 | // get executable path from registry | ||
68 | // | ||
69 | RegistryKey regKey; | ||
70 | RegistryKey exeKey; | ||
71 | regKey = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Linden Research, Inc.\SecondLife"); | ||
72 | if (regKey == null) | ||
73 | { | ||
74 | regKey = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Wow6432Node\Linden Research, Inc.\SecondLife"); | ||
75 | if (regKey == null) | ||
76 | { | ||
77 | throw new LauncherException("Can't find Second Life. Are you sure it is installed?", "LauncherException.Form1"); | ||
78 | } | ||
79 | } | ||
80 | Object exe = regKey.GetValue("Exe"); | ||
81 | exeFlags = regKey.GetValue("Flags"); | ||
82 | exePath = regKey.GetValue(""); | ||
83 | runLine = exePath.ToString() + "\\" + exe.ToString(); | ||
84 | Registry.LocalMachine.Flush(); | ||
85 | Registry.LocalMachine.Close(); | ||
86 | |||
87 | // find opensim directory | ||
88 | // | ||
89 | exeKey = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\OpenSim\OpenSim"); | ||
90 | if (exeKey != null) | ||
91 | { | 62 | { |
92 | 63 | string sandboxHostName = ""; | |
93 | simPath = exeKey.GetValue("Path"); | 64 | string sandboxPort = ""; |
94 | |||
95 | // build sandbox URL from Regions\default.xml | ||
96 | // this is highly dependant on a standard default.xml | ||
97 | // | ||
98 | Directory.SetCurrentDirectory(simPath.ToString()); //this should be set to wherever we decide to put the binaries | ||
99 | string text; | 65 | string text; |
66 | |||
100 | Regex myRegex = new Regex(".*internal_ip_port=\\\"(?<port>.*?)\\\".*external_host_name=\\\"(?<name>.*?)\\\".*"); | 67 | Regex myRegex = new Regex(".*internal_ip_port=\\\"(?<port>.*?)\\\".*external_host_name=\\\"(?<name>.*?)\\\".*"); |
101 | if (File.Exists(@"Regions\default.xml")) | 68 | |
69 | FileInfo defaultFile = new FileInfo(@"Regions\default.xml"); | ||
70 | StreamReader stream = defaultFile.OpenText(); | ||
71 | do | ||
102 | { | 72 | { |
103 | defaultFile = new FileInfo(@"Regions\default.xml"); | 73 | text = stream.ReadLine(); |
104 | stream = defaultFile.OpenText(); | 74 | if (text == null) |
105 | do | ||
106 | { | 75 | { |
107 | text = stream.ReadLine(); | 76 | break; |
108 | if (text == null) | 77 | } |
109 | { | 78 | MatchCollection theMatches = myRegex.Matches(text); |
110 | break; | 79 | foreach (Match theMatch in theMatches) |
111 | } | 80 | { |
112 | MatchCollection theMatches = myRegex.Matches(text); | 81 | if (theMatch.Length != 0) |
113 | foreach (Match theMatch in theMatches) | ||
114 | { | 82 | { |
115 | if (theMatch.Length != 0) | 83 | sandboxHostName = theMatch.Groups["name"].ToString(); |
116 | { | 84 | sandboxPort = theMatch.Groups["port"].ToString(); |
117 | sandboxHostName = theMatch.Groups["name"].ToString(); | ||
118 | sandboxPort = theMatch.Groups["port"].ToString(); | ||
119 | } | ||
120 | } | 85 | } |
121 | } while (text != null); | 86 | } |
122 | stream.Close(); | 87 | } while (text != null); |
123 | sandboxUrl = "http:\\" + sandboxHostName + ":" + sandboxPort; | ||
124 | menuItems.Add("Local Sandbox"); | ||
125 | } | ||
126 | else | ||
127 | { | ||
128 | MessageBox.Show("No OpenSim config files found. Please run OpenSim and finish configuration to run a local sim. Showing public grids only", "No OpenSim"); | ||
129 | } | ||
130 | |||
131 | 88 | ||
132 | //build local grid URL from network_servers_information.xml | 89 | stream.Close(); |
133 | // this is highly dependant on a standard default.xml | 90 | sandboxUrl = "http:\\" + sandboxHostName + ":" + sandboxPort; |
134 | // | 91 | menuItems.Add("Local Sandbox"); |
135 | myRegex = new Regex(".*UserServerURL=\\\"(?<url>.*?)\\\".*"); | 92 | } |
136 | if (File.Exists(@"network_servers_information.xml")) | 93 | } |
137 | { | ||
138 | defaultFile = new FileInfo(@"network_servers_information.xml"); | ||
139 | 94 | ||
95 | private void addLocalGrid(ref ArrayList menuItems) | ||
96 | { | ||
97 | //build local grid URL from network_servers_information.xml | ||
98 | // this is highly dependant on a standard default.xml | ||
99 | if (File.Exists(@"network_servers_information.xml")) | ||
100 | { | ||
101 | string text; | ||
102 | FileInfo defaultFile = new FileInfo(@"network_servers_information.xml"); | ||
103 | Regex myRegex = new Regex(".*UserServerURL=\\\"(?<url>.*?)\\\".*"); | ||
104 | StreamReader stream = defaultFile.OpenText(); | ||
140 | 105 | ||
141 | stream = defaultFile.OpenText(); | 106 | do |
142 | do | 107 | { |
108 | text = stream.ReadLine(); | ||
109 | if (text == null) | ||
143 | { | 110 | { |
144 | text = stream.ReadLine(); | 111 | break; |
145 | if (text == null) | 112 | } |
146 | { | 113 | foreach (Match theMatch in myRegex.Matches(text)) |
147 | break; | 114 | { |
148 | } | 115 | if (theMatch.Length != 0) |
149 | MatchCollection theMatches = myRegex.Matches(text); | ||
150 | foreach (Match theMatch in theMatches) | ||
151 | { | 116 | { |
152 | if (theMatch.Length != 0) | 117 | gridUrl = theMatch.Groups["url"].ToString(); |
153 | { | ||
154 | gridUrl = theMatch.Groups["url"].ToString(); | ||
155 | } | ||
156 | } | 118 | } |
157 | } while (text != null); | ||
158 | stream.Close(); | ||
159 | if (gridUrl != null) | ||
160 | { | ||
161 | menuItems.Add("Local Grid Server"); | ||
162 | } | 119 | } |
120 | } while (text != null); | ||
121 | stream.Close(); | ||
122 | if (gridUrl != null) | ||
123 | { | ||
124 | menuItems.Add("Local Grid Server"); | ||
163 | } | 125 | } |
164 | } | 126 | } |
127 | } | ||
128 | |||
129 | private void addLocalSims(ref ArrayList menuItems) | ||
130 | { | ||
131 | // find opensim directory | ||
132 | RegistryKey exeKey = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\OpenSim\OpenSim"); | ||
133 | if (exeKey != null) | ||
134 | { | ||
135 | Object simPath = exeKey.GetValue("Path"); | ||
136 | |||
137 | Directory.SetCurrentDirectory(simPath.ToString()); //this should be set to wherever we decide to put the binaries | ||
138 | |||
139 | addLocalSandbox(ref menuItems); | ||
140 | addLocalGrid(ref menuItems); | ||
141 | } | ||
165 | else | 142 | else |
166 | { | 143 | { |
167 | MessageBox.Show("No OpenSim installed. Showing public grids only", "No OpenSim"); | 144 | MessageBox.Show("No OpenSim installed. Showing public grids only", "No OpenSim"); |
168 | } | 145 | } |
146 | } | ||
147 | |||
148 | private void getClient(ref string exePath, ref string runLine, ref string exeFlags) | ||
149 | { | ||
150 | // get executable path from registry | ||
151 | RegistryKey regKey = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Linden Research, Inc.\SecondLife"); | ||
152 | if (regKey == null) | ||
153 | { | ||
154 | regKey = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Wow6432Node\Linden Research, Inc.\SecondLife"); | ||
155 | if (regKey == null) | ||
156 | { | ||
157 | throw new LauncherException("Can't find Second Life. Are you sure it is installed?", "LauncherException.Form1"); | ||
158 | } | ||
159 | } | ||
160 | string exe = regKey.GetValue("Exe").ToString(); | ||
161 | exeFlags = regKey.GetValue("Flags").ToString(); | ||
162 | exePath = regKey.GetValue("").ToString(); | ||
163 | runLine = exePath + "\\" + exe; | ||
164 | Registry.LocalMachine.Flush(); | ||
165 | Registry.LocalMachine.Close(); | ||
166 | } | ||
167 | |||
168 | public Form1() | ||
169 | { | ||
170 | InitializeComponent(); | ||
171 | ArrayList menuItems = new ArrayList(); | ||
172 | |||
173 | getClient(ref exePath, ref runLine, ref exeFlags); | ||
174 | |||
175 | menuItems.Add("Please select one:"); | ||
176 | |||
177 | addLocalSims(ref menuItems); | ||
169 | 178 | ||
170 | menuItems.Add("OSGrid - www.osgrid.org"); | 179 | menuItems.Add("OSGrid - www.osgrid.org"); |
171 | menuItems.Add("DeepGrid - www.deepgrid.com"); | 180 | menuItems.Add("DeepGrid - www.deepgrid.com"); |
172 | menuItems.Add("OpenlifeGrid - www.openlifegrid.com"); | 181 | menuItems.Add("OpenlifeGrid - www.openlifegrid.com"); |
173 | 182 | menuItems.Add("Linden Labs - www.secondlife.com"); | |
174 | // We don't have a proper login uri for SL grid | 183 | |
175 | // menuItems.Add("Linden Labs - www.secondlife.com"); | 184 | comboBox1.DataSource = menuItems; |
176 | comboBox1.DataSource=menuItems; | ||
177 | } | 185 | } |
178 | 186 | ||
179 | private void radioButton1_CheckedChanged(object sender, EventArgs e) | 187 | private void radioButton1_CheckedChanged(object sender, EventArgs e) |
180 | { | 188 | { |
181 | |||
182 | } | 189 | } |
183 | 190 | ||
184 | private void comboBox1_SelectedIndexChanged(object sender, EventArgs e) | 191 | private void comboBox1_SelectedIndexChanged(object sender, EventArgs e) |
@@ -188,8 +195,8 @@ namespace LaunchSLClient | |||
188 | if (comboBox1.Text == "Local Grid Server") { runUrl = " -loginuri " + gridUrl; } | 195 | if (comboBox1.Text == "Local Grid Server") { runUrl = " -loginuri " + gridUrl; } |
189 | if (comboBox1.Text == "DeepGrid - www.deepgrid.com") { runUrl = " -loginuri " + deepGridUrl; } | 196 | if (comboBox1.Text == "DeepGrid - www.deepgrid.com") { runUrl = " -loginuri " + deepGridUrl; } |
190 | if (comboBox1.Text == "OSGrid - www.osgrid.org") { runUrl = " -loginuri " + osGridUrl; } | 197 | if (comboBox1.Text == "OSGrid - www.osgrid.org") { runUrl = " -loginuri " + osGridUrl; } |
198 | if (comboBox1.Text == "OpenlifeGrid - www.openlifegrid.com") { runUrl = " -loginuri " + openLifeGridUrl; } | ||
191 | if (comboBox1.Text == "Linden Labs - www.secondlife.com") { runUrl = ""; } | 199 | if (comboBox1.Text == "Linden Labs - www.secondlife.com") { runUrl = ""; } |
192 | if (comboBox1.Text == "OpenlifeGrid - www.openlifegrid.com") { runUrl = " -loginuri http://logingrid.net:8002"; } | ||
193 | 200 | ||
194 | System.Diagnostics.Process proc = new System.Diagnostics.Process(); | 201 | System.Diagnostics.Process proc = new System.Diagnostics.Process(); |
195 | proc.StartInfo.FileName = runLine; | 202 | proc.StartInfo.FileName = runLine; |
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/LaunchSLClient.csproj b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/LaunchSLClient.csproj deleted file mode 100644 index 2589ec7..0000000 --- a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/LaunchSLClient.csproj +++ /dev/null | |||
@@ -1,79 +0,0 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
2 | <PropertyGroup> | ||
3 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
4 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
5 | <ProductVersion>8.0.50727</ProductVersion> | ||
6 | <SchemaVersion>2.0</SchemaVersion> | ||
7 | <ProjectGuid>{50FD2DCD-2E2D-413C-8260-D9CD22405895}</ProjectGuid> | ||
8 | <OutputType>WinExe</OutputType> | ||
9 | <AppDesignerFolder>Properties</AppDesignerFolder> | ||
10 | <RootNamespace>LaunchSLClient</RootNamespace> | ||
11 | <AssemblyName>LaunchSLClient</AssemblyName> | ||
12 | </PropertyGroup> | ||
13 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
14 | <DebugSymbols>true</DebugSymbols> | ||
15 | <DebugType>full</DebugType> | ||
16 | <Optimize>false</Optimize> | ||
17 | <OutputPath>bin\Debug\</OutputPath> | ||
18 | <DefineConstants>DEBUG;TRACE</DefineConstants> | ||
19 | <ErrorReport>prompt</ErrorReport> | ||
20 | <WarningLevel>4</WarningLevel> | ||
21 | </PropertyGroup> | ||
22 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
23 | <DebugType>pdbonly</DebugType> | ||
24 | <Optimize>true</Optimize> | ||
25 | <OutputPath>bin\Release\</OutputPath> | ||
26 | <DefineConstants>TRACE</DefineConstants> | ||
27 | <ErrorReport>prompt</ErrorReport> | ||
28 | <WarningLevel>4</WarningLevel> | ||
29 | </PropertyGroup> | ||
30 | <ItemGroup> | ||
31 | <Reference Include="System" /> | ||
32 | <Reference Include="System.Data" /> | ||
33 | <Reference Include="System.Deployment" /> | ||
34 | <Reference Include="System.Drawing" /> | ||
35 | <Reference Include="System.Windows.Forms" /> | ||
36 | <Reference Include="System.Xml" /> | ||
37 | </ItemGroup> | ||
38 | <ItemGroup> | ||
39 | <Compile Include="Form1.cs"> | ||
40 | <SubType>Form</SubType> | ||
41 | </Compile> | ||
42 | <Compile Include="Form1.Designer.cs"> | ||
43 | <DependentUpon>Form1.cs</DependentUpon> | ||
44 | </Compile> | ||
45 | <Compile Include="LauncherException.cs" /> | ||
46 | <Compile Include="Program.cs" /> | ||
47 | <Compile Include="Properties\AssemblyInfo.cs" /> | ||
48 | <EmbeddedResource Include="Form1.resx"> | ||
49 | <SubType>Designer</SubType> | ||
50 | <DependentUpon>Form1.cs</DependentUpon> | ||
51 | </EmbeddedResource> | ||
52 | <EmbeddedResource Include="Properties\Resources.resx"> | ||
53 | <Generator>ResXFileCodeGenerator</Generator> | ||
54 | <LastGenOutput>Resources.Designer.cs</LastGenOutput> | ||
55 | <SubType>Designer</SubType> | ||
56 | </EmbeddedResource> | ||
57 | <Compile Include="Properties\Resources.Designer.cs"> | ||
58 | <AutoGen>True</AutoGen> | ||
59 | <DependentUpon>Resources.resx</DependentUpon> | ||
60 | </Compile> | ||
61 | <None Include="Properties\Settings.settings"> | ||
62 | <Generator>SettingsSingleFileGenerator</Generator> | ||
63 | <LastGenOutput>Settings.Designer.cs</LastGenOutput> | ||
64 | </None> | ||
65 | <Compile Include="Properties\Settings.Designer.cs"> | ||
66 | <AutoGen>True</AutoGen> | ||
67 | <DependentUpon>Settings.settings</DependentUpon> | ||
68 | <DesignTimeSharedInput>True</DesignTimeSharedInput> | ||
69 | </Compile> | ||
70 | </ItemGroup> | ||
71 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | ||
72 | <!-- To modify your build process, add your task inside one of the targets below and uncomment it. | ||
73 | Other similar extension points exist, see Microsoft.Common.targets. | ||
74 | <Target Name="BeforeBuild"> | ||
75 | </Target> | ||
76 | <Target Name="AfterBuild"> | ||
77 | </Target> | ||
78 | --> | ||
79 | </Project> \ No newline at end of file | ||
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/LauncherException.cs b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/LauncherException.cs index acfa421..e31bd1d 100644 --- a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/LauncherException.cs +++ b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/LauncherException.cs | |||
@@ -25,6 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | |||
28 | using System; | 29 | using System; |
29 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
30 | using System.Text; | 31 | using System.Text; |
@@ -33,7 +34,6 @@ namespace LaunchSLClient | |||
33 | { | 34 | { |
34 | class LauncherException : ApplicationException | 35 | class LauncherException : ApplicationException |
35 | { | 36 | { |
36 | |||
37 | private const string CUSTOMMESSAGE = "The SL Client Launcher has failed with the following error: "; | 37 | private const string CUSTOMMESSAGE = "The SL Client Launcher has failed with the following error: "; |
38 | 38 | ||
39 | private LauncherException() { } | 39 | private LauncherException() { } |
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Program.cs b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Program.cs index 0e77abe..778d5c0 100644 --- a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Program.cs +++ b/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Program.cs | |||
@@ -25,11 +25,11 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | |||
28 | using System; | 29 | using System; |
29 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
30 | using System.Windows.Forms; | 31 | using System.Windows.Forms; |
31 | 32 | ||
32 | |||
33 | namespace LaunchSLClient | 33 | namespace LaunchSLClient |
34 | { | 34 | { |
35 | static class Program | 35 | static class Program |
@@ -40,7 +40,6 @@ namespace LaunchSLClient | |||
40 | [STAThread] | 40 | [STAThread] |
41 | static void Main() | 41 | static void Main() |
42 | { | 42 | { |
43 | |||
44 | try | 43 | try |
45 | { | 44 | { |
46 | Application.EnableVisualStyles(); | 45 | Application.EnableVisualStyles(); |
diff --git a/OpenSim/Tools/LaunchSLClient/prebuild.xml b/OpenSim/Tools/LaunchSLClient/prebuild.xml new file mode 100644 index 0000000..8e58ba6 --- /dev/null +++ b/OpenSim/Tools/LaunchSLClient/prebuild.xml | |||
@@ -0,0 +1,66 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" ?> | ||
2 | <Prebuild xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd" version="1.7"> | ||
3 | <Solution name="LaunchSLClient" activeConfig="Debug" path="./" version="0.5.0-svn"> | ||
4 | <Configuration name="Debug"> | ||
5 | <Options> | ||
6 | <CompilerDefines>TRACE;DEBUG</CompilerDefines> | ||
7 | <OptimizeCode>false</OptimizeCode> | ||
8 | <CheckUnderflowOverflow>false</CheckUnderflowOverflow> | ||
9 | <AllowUnsafe>false</AllowUnsafe> | ||
10 | <WarningLevel>4</WarningLevel> | ||
11 | <WarningsAsErrors>false</WarningsAsErrors> | ||
12 | <SuppressWarnings></SuppressWarnings> | ||
13 | <OutputPath>../../../bin</OutputPath> | ||
14 | <DebugInformation>true</DebugInformation> | ||
15 | <IncrementalBuild>true</IncrementalBuild> | ||
16 | <NoStdLib>false</NoStdLib> | ||
17 | </Options> | ||
18 | </Configuration> | ||
19 | <Configuration name="Release"> | ||
20 | <Options> | ||
21 | <CompilerDefines>TRACE</CompilerDefines> | ||
22 | <OptimizeCode>true</OptimizeCode> | ||
23 | <CheckUnderflowOverflow>false</CheckUnderflowOverflow> | ||
24 | <AllowUnsafe>false</AllowUnsafe> | ||
25 | <WarningLevel>4</WarningLevel> | ||
26 | <WarningsAsErrors>false</WarningsAsErrors> | ||
27 | <SuppressWarnings></SuppressWarnings> | ||
28 | <OutputPath>../../../bin</OutputPath> | ||
29 | <DebugInformation>false</DebugInformation> | ||
30 | <IncrementalBuild>true</IncrementalBuild> | ||
31 | <NoStdLib>false</NoStdLib> | ||
32 | </Options> | ||
33 | </Configuration> | ||
34 | |||
35 | <Project name="LaunchSLClient" path="LaunchSLClient" type="Exe"> | ||
36 | <Configuration name="Debug"> | ||
37 | <Options> | ||
38 | <OutputPath>../../../bin/</OutputPath> | ||
39 | </Options> | ||
40 | </Configuration> | ||
41 | <Configuration name="Release"> | ||
42 | <Options> | ||
43 | <OutputPath>../../../bin/</OutputPath> | ||
44 | </Options> | ||
45 | </Configuration> | ||
46 | |||
47 | <ReferencePath>../../../bin/</ReferencePath> | ||
48 | <Reference name="System" localCopy="false"/> | ||
49 | <Reference name="System.IO" localCopy="false"/> | ||
50 | <Reference name="System.Collections" localCopy="false"/> | ||
51 | <Reference name="System.Collections.Generic" localCopy="false"/> | ||
52 | <Reference name="System.ComponentModel" localCopy="false"/> | ||
53 | <Reference name="System.Data" localCopy="false"/> | ||
54 | <Reference name="System.Diagnostics" localCopy="false"/> | ||
55 | <Reference name="System.Drawing" localCopy="false"/> | ||
56 | <Reference name="System.Text" localCopy="false"/> | ||
57 | <Reference name="System.Text.RegularExpressions" localCopy="false"/> | ||
58 | <Reference name="System.Windows.Forms" localCopy="false"/> | ||
59 | <Reference name="Microsoft.Win32" localCopy="false"/> | ||
60 | |||
61 | <Files> | ||
62 | <Match pattern="*.cs" recurse="true"/> | ||
63 | </Files> | ||
64 | </Project> | ||
65 | </Solution> | ||
66 | </Prebuild> | ||
diff --git a/OpenSim/Tools/LaunchSLClient/runprebuild.bat b/OpenSim/Tools/LaunchSLClient/runprebuild.bat new file mode 100755 index 0000000..8a2c21a --- /dev/null +++ b/OpenSim/Tools/LaunchSLClient/runprebuild.bat | |||
@@ -0,0 +1,2 @@ | |||
1 | bin\Prebuild.exe /target nant | ||
2 | bin\Prebuild.exe /target vs2005 \ No newline at end of file | ||
diff --git a/OpenSim/Tools/LaunchSLClient/runprebuild.sh b/OpenSim/Tools/LaunchSLClient/runprebuild.sh new file mode 100755 index 0000000..7215bc5 --- /dev/null +++ b/OpenSim/Tools/LaunchSLClient/runprebuild.sh | |||
@@ -0,0 +1,4 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | mono ../../../bin/Prebuild.exe /target nant | ||
4 | mono ../../../bin/Prebuild.exe /target vs2005 | ||