aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSean Dague2009-05-27 12:41:18 +0000
committerSean Dague2009-05-27 12:41:18 +0000
commit9b003a2a5d85ed0d513f31f491b2dcdb1d03bf5a (patch)
tree8b7d458638f0da038da607d498f8582b3aa7cd10
parent* Added IntegrationTest Attribute and tagged the ODETestClass (diff)
downloadopensim-SC_OLD-9b003a2a5d85ed0d513f31f491b2dcdb1d03bf5a.zip
opensim-SC_OLD-9b003a2a5d85ed0d513f31f491b2dcdb1d03bf5a.tar.gz
opensim-SC_OLD-9b003a2a5d85ed0d513f31f491b2dcdb1d03bf5a.tar.bz2
opensim-SC_OLD-9b003a2a5d85ed0d513f31f491b2dcdb1d03bf5a.tar.xz
the new Tests were defined before the Tests.Common dll in prebuild,
this causes nant to choke on a fresh checkout. This should fix the build break
-rw-r--r--prebuild.xml68
1 files changed, 35 insertions, 33 deletions
diff --git a/prebuild.xml b/prebuild.xml
index ffe8bad..854185f 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1422,39 +1422,6 @@
1422 </Files> 1422 </Files>
1423 </Project> 1423 </Project>
1424 1424
1425 <Project name="OpenSim.Server.Handlers.Tests" path="OpenSim/Server/Handlers/Tests" type="Library">
1426 <Configuration name="Debug">
1427 <Options>
1428 <OutputPath>../../../../bin/</OutputPath>
1429 </Options>
1430 </Configuration>
1431 <Configuration name="Release">
1432 <Options>
1433 <OutputPath>../../../../bin/</OutputPath>
1434 </Options>
1435 </Configuration>
1436
1437 <ReferencePath>../../../../bin/</ReferencePath>
1438 <Reference name="System"/>
1439 <Reference name="System.Xml"/>
1440 <Reference name="OpenMetaverseTypes.dll"/>
1441 <Reference name="OpenMetaverse.dll"/>
1442 <Reference name="nunit.framework.dll" />
1443 <Reference name="OpenSim.Framework"/>
1444 <Reference name="OpenSim.Framework.Console"/>
1445 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
1446 <Reference name="OpenSim.Server.Handlers"/>
1447 <Reference name="OpenSim.Server.Base"/>
1448 <Reference name="OpenSim.Services.Base" />
1449 <Reference name="OpenSim.Services.Interfaces"/>
1450 <Reference name="OpenSim.Tests.Common"/>
1451 <Reference name="Nini.dll" />
1452 <Reference name="log4net.dll"/>
1453
1454 <Files>
1455 <Match pattern="*.cs" recurse="true"/>
1456 </Files>
1457 </Project>
1458 1425
1459 <Project name="OpenSim.Services" path="OpenSim/Server" type="Exe"> 1426 <Project name="OpenSim.Services" path="OpenSim/Server" type="Exe">
1460 <Configuration name="Debug"> 1427 <Configuration name="Debug">
@@ -3725,6 +3692,41 @@
3725 </Files> 3692 </Files>
3726 </Project> 3693 </Project>
3727 3694
3695 <Project name="OpenSim.Server.Handlers.Tests" path="OpenSim/Server/Handlers/Tests" type="Library">
3696 <Configuration name="Debug">
3697 <Options>
3698 <OutputPath>../../../../bin/</OutputPath>
3699 </Options>
3700 </Configuration>
3701 <Configuration name="Release">
3702 <Options>
3703 <OutputPath>../../../../bin/</OutputPath>
3704 </Options>
3705 </Configuration>
3706
3707 <ReferencePath>../../../../bin/</ReferencePath>
3708 <Reference name="System"/>
3709 <Reference name="System.Xml"/>
3710 <Reference name="OpenMetaverseTypes.dll"/>
3711 <Reference name="OpenMetaverse.dll"/>
3712 <Reference name="nunit.framework.dll" />
3713 <Reference name="OpenSim.Framework"/>
3714 <Reference name="OpenSim.Framework.Console"/>
3715 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
3716 <Reference name="OpenSim.Server.Handlers"/>
3717 <Reference name="OpenSim.Server.Base"/>
3718 <Reference name="OpenSim.Services.Base" />
3719 <Reference name="OpenSim.Services.Interfaces"/>
3720 <Reference name="OpenSim.Tests.Common"/>
3721 <Reference name="Nini.dll" />
3722 <Reference name="log4net.dll"/>
3723
3724 <Files>
3725 <Match pattern="*.cs" recurse="true"/>
3726 </Files>
3727 </Project>
3728
3729
3728<!-- /////////////////// DO NOT EDIT THE BELOW 6 LINES!!!! //////////// --> 3730<!-- /////////////////// DO NOT EDIT THE BELOW 6 LINES!!!! //////////// -->
3729 3731
3730 3732