diff options
author | Melanie | 2009-09-27 21:25:10 +0100 |
---|---|---|
committer | Melanie | 2009-09-27 21:25:10 +0100 |
commit | b5bf3f87d552f8aef7fc8f4ab8fa34d6dbefcd30 (patch) | |
tree | b7e6844d7f037541640e489d3c8bec53159b5df0 /prebuild.xml | |
parent | Add the Migration for the regions table (diff) | |
parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
download | opensim-SC-b5bf3f87d552f8aef7fc8f4ab8fa34d6dbefcd30.zip opensim-SC-b5bf3f87d552f8aef7fc8f4ab8fa34d6dbefcd30.tar.gz opensim-SC-b5bf3f87d552f8aef7fc8f4ab8fa34d6dbefcd30.tar.bz2 opensim-SC-b5bf3f87d552f8aef7fc8f4ab8fa34d6dbefcd30.tar.xz |
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Conflicts:
OpenSim/Data/MySQL/MySQLRegionData.cs
Diffstat (limited to 'prebuild.xml')
-rw-r--r-- | prebuild.xml | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml index 2265b09..6ac7b68 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -1205,6 +1205,7 @@ | |||
1205 | <ReferencePath>../../../bin/</ReferencePath> | 1205 | <ReferencePath>../../../bin/</ReferencePath> |
1206 | <Reference name="System"/> | 1206 | <Reference name="System"/> |
1207 | <Reference name="System.Xml"/> | 1207 | <Reference name="System.Xml"/> |
1208 | <Reference name="System.Drawing"/> | ||
1208 | <Reference name="OpenMetaverseTypes.dll"/> | 1209 | <Reference name="OpenMetaverseTypes.dll"/> |
1209 | <Reference name="OpenMetaverse.dll"/> | 1210 | <Reference name="OpenMetaverse.dll"/> |
1210 | <Reference name="OpenMetaverse.StructuredData.dll"/> | 1211 | <Reference name="OpenMetaverse.StructuredData.dll"/> |
@@ -3220,6 +3221,35 @@ | |||
3220 | </Files> | 3221 | </Files> |
3221 | </Project> | 3222 | </Project> |
3222 | 3223 | ||
3224 | <!-- Test Clients --> | ||
3225 | <Project frameworkVersion="v3_5" name="OpenSim.Tests.Clients.GridClient" path="OpenSim/Tests/Clients/Grid" type="Exe"> | ||
3226 | <Configuration name="Debug"> | ||
3227 | <Options> | ||
3228 | <OutputPath>../../../../bin/</OutputPath> | ||
3229 | </Options> | ||
3230 | </Configuration> | ||
3231 | <Configuration name="Release"> | ||
3232 | <Options> | ||
3233 | <OutputPath>../../../../bin/</OutputPath> | ||
3234 | </Options> | ||
3235 | </Configuration> | ||
3236 | |||
3237 | <ReferencePath>../../../../bin/</ReferencePath> | ||
3238 | <Reference name="System"/> | ||
3239 | <Reference name="OpenMetaverseTypes.dll"/> | ||
3240 | <Reference name="OpenMetaverse.dll"/> | ||
3241 | <Reference name="OpenSim.Framework"/> | ||
3242 | <Reference name="OpenSim.Services.Interfaces" /> | ||
3243 | <Reference name="OpenSim.Services.Connectors" /> | ||
3244 | <Reference name="Nini.dll" /> | ||
3245 | <Reference name="log4net.dll"/> | ||
3246 | |||
3247 | <Files> | ||
3248 | <Match pattern="*.cs" recurse="true"/> | ||
3249 | </Files> | ||
3250 | </Project> | ||
3251 | |||
3252 | |||
3223 | <!-- Test assemblies --> | 3253 | <!-- Test assemblies --> |
3224 | <Project frameworkVersion="v3_5" name="OpenSim.Tests.Common" path="OpenSim/Tests/Common" type="Library"> | 3254 | <Project frameworkVersion="v3_5" name="OpenSim.Tests.Common" path="OpenSim/Tests/Common" type="Library"> |
3225 | <Configuration name="Debug"> | 3255 | <Configuration name="Debug"> |
@@ -3591,6 +3621,7 @@ | |||
3591 | <Match path="World/Archiver/Tests" pattern="*.cs" recurse="true" /> | 3621 | <Match path="World/Archiver/Tests" pattern="*.cs" recurse="true" /> |
3592 | <Match path="World/Serialiser/Tests" pattern="*.cs" recurse="true" /> | 3622 | <Match path="World/Serialiser/Tests" pattern="*.cs" recurse="true" /> |
3593 | <Match path="World/Terrain/Tests" pattern="*.cs" recurse="true" /> | 3623 | <Match path="World/Terrain/Tests" pattern="*.cs" recurse="true" /> |
3624 | <Match path="ServiceConnectorsOut/Grid/Tests" pattern="*.cs" recurse="true" /> | ||
3594 | </Files> | 3625 | </Files> |
3595 | </Project> | 3626 | </Project> |
3596 | 3627 | ||