aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJeff Ames2008-02-15 03:30:15 +0000
committerJeff Ames2008-02-15 03:30:15 +0000
commite16f9a16c77aca017ddd3413d6ff84d3a3ee7364 (patch)
tree8cae2a7880b784ee80fc7c836136c785045e366e
parentMove pCampBot prebuild.xml into main prebuild.xml to fix reference errors. U... (diff)
downloadopensim-SC-e16f9a16c77aca017ddd3413d6ff84d3a3ee7364.zip
opensim-SC-e16f9a16c77aca017ddd3413d6ff84d3a3ee7364.tar.gz
opensim-SC-e16f9a16c77aca017ddd3413d6ff84d3a3ee7364.tar.bz2
opensim-SC-e16f9a16c77aca017ddd3413d6ff84d3a3ee7364.tar.xz
Moved LaunchSLClient prebuild.xml into main prebuild.xml
-rw-r--r--OpenSim/Tools/LaunchSLClient/Form1.Designer.cs (renamed from OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.Designer.cs)0
-rw-r--r--OpenSim/Tools/LaunchSLClient/Form1.cs (renamed from OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.cs)0
-rw-r--r--OpenSim/Tools/LaunchSLClient/Form1.resx (renamed from OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.resx)0
-rw-r--r--OpenSim/Tools/LaunchSLClient/LauncherException.cs (renamed from OpenSim/Tools/LaunchSLClient/LaunchSLClient/LauncherException.cs)0
-rw-r--r--OpenSim/Tools/LaunchSLClient/Program.cs (renamed from OpenSim/Tools/LaunchSLClient/LaunchSLClient/Program.cs)0
-rw-r--r--OpenSim/Tools/LaunchSLClient/Properties/AssemblyInfo.cs (renamed from OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/AssemblyInfo.cs)0
-rw-r--r--OpenSim/Tools/LaunchSLClient/Properties/Resources.Designer.cs (renamed from OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/Resources.Designer.cs)0
-rw-r--r--OpenSim/Tools/LaunchSLClient/Properties/Resources.resx (renamed from OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/Resources.resx)0
-rw-r--r--OpenSim/Tools/LaunchSLClient/Properties/Settings.Designer.cs (renamed from OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/Settings.Designer.cs)0
-rw-r--r--OpenSim/Tools/LaunchSLClient/Properties/Settings.settings (renamed from OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/Settings.settings)0
-rw-r--r--OpenSim/Tools/LaunchSLClient/prebuild.xml66
-rwxr-xr-xOpenSim/Tools/LaunchSLClient/runprebuild.bat2
-rwxr-xr-xOpenSim/Tools/LaunchSLClient/runprebuild.sh4
-rw-r--r--prebuild.xml31
14 files changed, 31 insertions, 72 deletions
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.Designer.cs b/OpenSim/Tools/LaunchSLClient/Form1.Designer.cs
index b841f0b..b841f0b 100644
--- a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.Designer.cs
+++ b/OpenSim/Tools/LaunchSLClient/Form1.Designer.cs
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.cs b/OpenSim/Tools/LaunchSLClient/Form1.cs
index 183a104..183a104 100644
--- a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.cs
+++ b/OpenSim/Tools/LaunchSLClient/Form1.cs
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.resx b/OpenSim/Tools/LaunchSLClient/Form1.resx
index 19dc0dd..19dc0dd 100644
--- a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Form1.resx
+++ b/OpenSim/Tools/LaunchSLClient/Form1.resx
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/LauncherException.cs b/OpenSim/Tools/LaunchSLClient/LauncherException.cs
index e31bd1d..e31bd1d 100644
--- a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/LauncherException.cs
+++ b/OpenSim/Tools/LaunchSLClient/LauncherException.cs
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Program.cs b/OpenSim/Tools/LaunchSLClient/Program.cs
index 778d5c0..778d5c0 100644
--- a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Program.cs
+++ b/OpenSim/Tools/LaunchSLClient/Program.cs
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/AssemblyInfo.cs b/OpenSim/Tools/LaunchSLClient/Properties/AssemblyInfo.cs
index 87a4ac4..87a4ac4 100644
--- a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/AssemblyInfo.cs
+++ b/OpenSim/Tools/LaunchSLClient/Properties/AssemblyInfo.cs
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/Resources.Designer.cs b/OpenSim/Tools/LaunchSLClient/Properties/Resources.Designer.cs
index 4e9188d..4e9188d 100644
--- a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/Resources.Designer.cs
+++ b/OpenSim/Tools/LaunchSLClient/Properties/Resources.Designer.cs
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/Resources.resx b/OpenSim/Tools/LaunchSLClient/Properties/Resources.resx
index af7dbeb..af7dbeb 100644
--- a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/Resources.resx
+++ b/OpenSim/Tools/LaunchSLClient/Properties/Resources.resx
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/Settings.Designer.cs b/OpenSim/Tools/LaunchSLClient/Properties/Settings.Designer.cs
index 3dcc200..3dcc200 100644
--- a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/Settings.Designer.cs
+++ b/OpenSim/Tools/LaunchSLClient/Properties/Settings.Designer.cs
diff --git a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/Settings.settings b/OpenSim/Tools/LaunchSLClient/Properties/Settings.settings
index 3964565..3964565 100644
--- a/OpenSim/Tools/LaunchSLClient/LaunchSLClient/Properties/Settings.settings
+++ b/OpenSim/Tools/LaunchSLClient/Properties/Settings.settings
diff --git a/OpenSim/Tools/LaunchSLClient/prebuild.xml b/OpenSim/Tools/LaunchSLClient/prebuild.xml
deleted file mode 100644
index 8e58ba6..0000000
--- a/OpenSim/Tools/LaunchSLClient/prebuild.xml
+++ /dev/null
@@ -1,66 +0,0 @@
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
deleted file mode 100755
index 0427d2e..0000000
--- a/OpenSim/Tools/LaunchSLClient/runprebuild.bat
+++ /dev/null
@@ -1,2 +0,0 @@
1..\..\..\bin\Prebuild.exe /target nant
2..\..\..\bin\Prebuild.exe /target vs2005
diff --git a/OpenSim/Tools/LaunchSLClient/runprebuild.sh b/OpenSim/Tools/LaunchSLClient/runprebuild.sh
deleted file mode 100755
index 7215bc5..0000000
--- a/OpenSim/Tools/LaunchSLClient/runprebuild.sh
+++ /dev/null
@@ -1,4 +0,0 @@
1#!/bin/sh
2
3mono ../../../bin/Prebuild.exe /target nant
4mono ../../../bin/Prebuild.exe /target vs2005
diff --git a/prebuild.xml b/prebuild.xml
index 135a8d7..e7c51f9 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1505,6 +1505,37 @@
1505 <Match pattern="*.cs" recurse="true"/> 1505 <Match pattern="*.cs" recurse="true"/>
1506 </Files> 1506 </Files>
1507 </Project> 1507 </Project>
1508
1509 <Project name="LaunchSLClient" path="OpenSim/Tools/LaunchSLClient" type="Exe">
1510 <Configuration name="Debug">
1511 <Options>
1512 <OutputPath>../../../bin/</OutputPath>
1513 </Options>
1514 </Configuration>
1515 <Configuration name="Release">
1516 <Options>
1517 <OutputPath>../../../bin/</OutputPath>
1518 </Options>
1519 </Configuration>
1520
1521 <ReferencePath>../../../bin/</ReferencePath>
1522 <Reference name="System" localCopy="false"/>
1523 <Reference name="System.IO" localCopy="false"/>
1524 <Reference name="System.Collections" localCopy="false"/>
1525 <Reference name="System.Collections.Generic" localCopy="false"/>
1526 <Reference name="System.ComponentModel" localCopy="false"/>
1527 <Reference name="System.Data" localCopy="false"/>
1528 <Reference name="System.Diagnostics" localCopy="false"/>
1529 <Reference name="System.Drawing" localCopy="false"/>
1530 <Reference name="System.Text" localCopy="false"/>
1531 <Reference name="System.Text.RegularExpressions" localCopy="false"/>
1532 <Reference name="System.Windows.Forms" localCopy="false"/>
1533 <Reference name="Microsoft.Win32" localCopy="false"/>
1534
1535 <Files>
1536 <Match pattern="*.cs" recurse="true"/>
1537 </Files>
1538 </Project>
1508 </Solution> 1539 </Solution>
1509 1540
1510 <!-- Prebuild tool --> 1541 <!-- Prebuild tool -->