aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml
diff options
context:
space:
mode:
authorMelanie2011-05-05 09:49:10 +0100
committerMelanie2011-05-05 09:49:10 +0100
commit4beb0c9b9b402c1e8f70a02c0efa557c1f292f1c (patch)
tree24e24cb7b424df74b13788d28be9d7588fbd99d0 /prebuild.xml
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentTest m_Enabled on RemoveRegion. (diff)
downloadopensim-SC_OLD-4beb0c9b9b402c1e8f70a02c0efa557c1f292f1c.zip
opensim-SC_OLD-4beb0c9b9b402c1e8f70a02c0efa557c1f292f1c.tar.gz
opensim-SC_OLD-4beb0c9b9b402c1e8f70a02c0efa557c1f292f1c.tar.bz2
opensim-SC_OLD-4beb0c9b9b402c1e8f70a02c0efa557c1f292f1c.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'prebuild.xml')
-rw-r--r--prebuild.xml140
1 files changed, 111 insertions, 29 deletions
diff --git a/prebuild.xml b/prebuild.xml
index 16e3a9c..c264ff7 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -690,19 +690,19 @@
690 </Files> 690 </Files>
691 </Project> 691 </Project>
692 692
693 <Project frameworkVersion="v3_5" name="OpenSim.Framework.Capabilities" path="OpenSim/Framework/Capabilities" type="Library"> 693 <Project frameworkVersion="v3_5" name="OpenSim.Capabilities" path="OpenSim/Capabilities" type="Library">
694 <Configuration name="Debug"> 694 <Configuration name="Debug">
695 <Options> 695 <Options>
696 <OutputPath>../../../bin/</OutputPath> 696 <OutputPath>../../bin/</OutputPath>
697 </Options> 697 </Options>
698 </Configuration> 698 </Configuration>
699 <Configuration name="Release"> 699 <Configuration name="Release">
700 <Options> 700 <Options>
701 <OutputPath>../../../bin/</OutputPath> 701 <OutputPath>../../bin/</OutputPath>
702 </Options> 702 </Options>
703 </Configuration> 703 </Configuration>
704 704
705 <ReferencePath>../../../bin/</ReferencePath> 705 <ReferencePath>../../bin/</ReferencePath>
706 <Reference name="System"/> 706 <Reference name="System"/>
707 <Reference name="System.Xml"/> 707 <Reference name="System.Xml"/>
708 <Reference name="System.Web"/> 708 <Reference name="System.Web"/>
@@ -713,18 +713,18 @@
713 <Reference name="OpenSim.Services.Interfaces"/> 713 <Reference name="OpenSim.Services.Interfaces"/>
714 <Reference name="OpenMetaverse" path="../../../bin/"/> 714 <Reference name="OpenMetaverse" path="../../../bin/"/>
715 <Reference name="OpenMetaverseTypes" path="../../../bin/"/> 715 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
716 <!-- FIXME: The OpenMetaverse.dll reference can be dropped when the TransferRequestPacket reference is removed from the code -->
717 <Reference name="Nini" path="../../../bin/"/> 716 <Reference name="Nini" path="../../../bin/"/>
718 <Reference name="log4net" path="../../../bin/"/> 717 <Reference name="log4net" path="../../../bin/"/>
719 718
720 <Files> 719 <Files>
721 <Match pattern="*.cs" recurse="true"> 720 <Match pattern="*.cs" recurse="false">
722 <Exclude name="Tests" pattern="Tests"/> 721 <Exclude name="Tests" pattern="Tests"/>
723 </Match> 722 </Match>
724 <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/> 723 <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/>
725 </Files> 724 </Files>
726 </Project> 725 </Project>
727 726
727
728 <Project frameworkVersion="v3_5" name="OpenSim.Framework.Communications" path="OpenSim/Framework/Communications" type="Library"> 728 <Project frameworkVersion="v3_5" name="OpenSim.Framework.Communications" path="OpenSim/Framework/Communications" type="Library">
729 <Configuration name="Debug"> 729 <Configuration name="Debug">
730 <Options> 730 <Options>
@@ -744,7 +744,6 @@
744 <Reference name="OpenSim.Framework"/> 744 <Reference name="OpenSim.Framework"/>
745 <Reference name="OpenSim.Framework.AssetLoader.Filesystem"/> 745 <Reference name="OpenSim.Framework.AssetLoader.Filesystem"/>
746 <Reference name="OpenSim.Data"/> 746 <Reference name="OpenSim.Data"/>
747 <Reference name="OpenSim.Framework.Capabilities"/>
748 <Reference name="OpenSim.Framework.Servers"/> 747 <Reference name="OpenSim.Framework.Servers"/>
749 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 748 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
750 <Reference name="OpenSim.Framework.Console"/> 749 <Reference name="OpenSim.Framework.Console"/>
@@ -790,7 +789,7 @@
790 <Reference name="OpenMetaverse" path="../../../bin/"/> 789 <Reference name="OpenMetaverse" path="../../../bin/"/>
791 <Reference name="OpenSim.Services.Interfaces"/> 790 <Reference name="OpenSim.Services.Interfaces"/>
792 <Reference name="OpenSim.Framework"/> 791 <Reference name="OpenSim.Framework"/>
793 <Reference name="OpenSim.Framework.Capabilities"/> 792 <Reference name="OpenSim.Capabilities"/>
794 <Reference name="OpenSim.Framework.Communications"/> 793 <Reference name="OpenSim.Framework.Communications"/>
795 <Reference name="OpenSim.Data"/> 794 <Reference name="OpenSim.Data"/>
796 <Reference name="OpenSim.Framework.Console"/> 795 <Reference name="OpenSim.Framework.Console"/>
@@ -1216,7 +1215,6 @@
1216 <Reference name="OpenMetaverseTypes" path="../../../bin/"/> 1215 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
1217 <Reference name="OpenMetaverse" path="../../../bin/"/> 1216 <Reference name="OpenMetaverse" path="../../../bin/"/>
1218 <Reference name="OpenSim.Framework"/> 1217 <Reference name="OpenSim.Framework"/>
1219 <Reference name="OpenSim.Framework.Capabilities"/>
1220 <Reference name="OpenSim.Framework.Console"/> 1218 <Reference name="OpenSim.Framework.Console"/>
1221 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 1219 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
1222 <Reference name="OpenSim.Services.Interfaces"/> 1220 <Reference name="OpenSim.Services.Interfaces"/>
@@ -1248,7 +1246,6 @@
1248 <Reference name="System"/> 1246 <Reference name="System"/>
1249 <Reference name="System.Core"/> 1247 <Reference name="System.Core"/>
1250 <Reference name="OpenSim.Framework"/> 1248 <Reference name="OpenSim.Framework"/>
1251 <Reference name="OpenSim.Framework.Capabilities"/>
1252 <Reference name="OpenSim.Framework.Console"/> 1249 <Reference name="OpenSim.Framework.Console"/>
1253 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 1250 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
1254 <Reference name="OpenSim.Services.Interfaces"/> 1251 <Reference name="OpenSim.Services.Interfaces"/>
@@ -1302,7 +1299,6 @@
1302 </Files> 1299 </Files>
1303 </Project> 1300 </Project>
1304 1301
1305
1306 <Project frameworkVersion="v3_5" name="OpenSim.Server.Handlers" path="OpenSim/Server/Handlers" type="Library"> 1302 <Project frameworkVersion="v3_5" name="OpenSim.Server.Handlers" path="OpenSim/Server/Handlers" type="Library">
1307 <Configuration name="Debug"> 1303 <Configuration name="Debug">
1308 <Options> 1304 <Options>
@@ -1341,6 +1337,46 @@
1341 </Project> 1337 </Project>
1342 1338
1343 1339
1340 <Project frameworkVersion="v3_5" name="OpenSim.Capabilities.Handlers" path="OpenSim/Capabilities/Handlers" type="Library">
1341 <Configuration name="Debug">
1342 <Options>
1343 <OutputPath>../../../bin/</OutputPath>
1344 </Options>
1345 </Configuration>
1346 <Configuration name="Release">
1347 <Options>
1348 <OutputPath>../../../bin/</OutputPath>
1349 </Options>
1350 </Configuration>
1351
1352 <ReferencePath>../../../bin/</ReferencePath>
1353 <Reference name="System"/>
1354 <Reference name="System.Drawing"/>
1355 <Reference name="System.Xml"/>
1356 <Reference name="System.Web"/>
1357 <Reference name="OpenMetaverse" path="../../../bin/"/>
1358 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
1359 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
1360 <Reference name="OpenSim.Capabilities"/>
1361 <Reference name="OpenSim.Framework"/>
1362 <Reference name="OpenSim.Framework.Console"/>
1363 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
1364 <Reference name="OpenSim.Server.Base"/>
1365 <Reference name="OpenSim.Server.Handlers"/>
1366 <Reference name="OpenSim.Services.Base"/>
1367 <Reference name="OpenSim.Services.Interfaces"/>
1368 <Reference name="Nini" path="../../../bin/"/>
1369 <Reference name="log4net" path="../../../bin/"/>
1370 <Reference name="DotNetOpenId" path="../../../bin/"/>
1371
1372 <Files>
1373 <Match pattern="*.cs" recurse="true">
1374 <Exclude pattern="Tests"/>
1375 </Match>
1376 </Files>
1377 </Project>
1378
1379
1344 <Project frameworkVersion="v3_5" name="Robust" path="OpenSim/Server" type="Exe"> 1380 <Project frameworkVersion="v3_5" name="Robust" path="OpenSim/Server" type="Exe">
1345 <Configuration name="Debug"> 1381 <Configuration name="Debug">
1346 <Options> 1382 <Options>
@@ -1433,8 +1469,8 @@
1433 <Reference name="OpenMetaverse" path="../../../bin/"/> 1469 <Reference name="OpenMetaverse" path="../../../bin/"/>
1434 <Reference name="CSJ2K" path="../../../bin/"/> 1470 <Reference name="CSJ2K" path="../../../bin/"/>
1435 <Reference name="Warp3D" path="../../../bin/" localCopy="true"/> 1471 <Reference name="Warp3D" path="../../../bin/" localCopy="true"/>
1472 <Reference name="OpenSim.Capabilities"/>
1436 <Reference name="OpenSim.Framework"/> 1473 <Reference name="OpenSim.Framework"/>
1437 <Reference name="OpenSim.Framework.Capabilities"/>
1438 <Reference name="OpenSim.Framework.Communications"/> 1474 <Reference name="OpenSim.Framework.Communications"/>
1439 <Reference name="OpenSim.Data"/> 1475 <Reference name="OpenSim.Data"/>
1440 <Reference name="OpenSim.Region.Framework"/> 1476 <Reference name="OpenSim.Region.Framework"/>
@@ -1544,43 +1580,89 @@
1544 </Project> 1580 </Project>
1545 1581
1546 <!-- ClientStack Plugins --> 1582 <!-- ClientStack Plugins -->
1547 <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack.LindenUDP" path="OpenSim/Region/ClientStack/LindenUDP" type="Library"> 1583 <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack.LindenUDP" path="OpenSim/Region/ClientStack/Linden/UDP" type="Library">
1548 <Configuration name="Debug"> 1584 <Configuration name="Debug">
1549 <Options> 1585 <Options>
1550 <OutputPath>../../../../bin/</OutputPath> 1586 <OutputPath>../../../../../bin/</OutputPath>
1551 </Options> 1587 </Options>
1552 </Configuration> 1588 </Configuration>
1553 <Configuration name="Release"> 1589 <Configuration name="Release">
1554 <Options> 1590 <Options>
1555 <OutputPath>../../../../bin/</OutputPath> 1591 <OutputPath>../../../../../bin/</OutputPath>
1556 </Options> 1592 </Options>
1557 </Configuration> 1593 </Configuration>
1558 1594
1559 <ReferencePath>../../../../bin/</ReferencePath> 1595 <ReferencePath>../../../../../bin/</ReferencePath>
1560 <Reference name="System"/> 1596 <Reference name="System"/>
1561 <Reference name="System.Core"/> 1597 <Reference name="System.Core"/>
1598 <Reference name="System.Drawing"/>
1562 <Reference name="System.Xml"/> 1599 <Reference name="System.Xml"/>
1563 <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> 1600 <Reference name="System.Web"/>
1564 <Reference name="OpenMetaverse.StructuredData" path="../../../../bin/"/> 1601 <Reference name="OpenMetaverseTypes" path="../../../../../bin/"/>
1565 <Reference name="OpenMetaverse" path="../../../../bin/"/> 1602 <Reference name="OpenMetaverse.StructuredData" path="../../../../../bin/"/>
1603 <Reference name="OpenMetaverse" path="../../../../../bin/"/>
1566 <Reference name="OpenSim.Region.Framework"/> 1604 <Reference name="OpenSim.Region.Framework"/>
1567 <Reference name="OpenSim.Framework"/> 1605 <Reference name="OpenSim.Framework"/>
1568 <Reference name="OpenSim.Data"/> 1606 <Reference name="OpenSim.Data"/>
1569 <Reference name="OpenSim.Framework.Servers"/> 1607 <Reference name="OpenSim.Framework.Servers"/>
1608 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
1570 <Reference name="OpenSim.Framework.Console"/> 1609 <Reference name="OpenSim.Framework.Console"/>
1571 <Reference name="OpenSim.Framework.Communications"/> 1610 <Reference name="OpenSim.Framework.Communications"/>
1572 <Reference name="OpenSim.Framework.Statistics"/> 1611 <Reference name="OpenSim.Framework.Statistics"/>
1573 <Reference name="OpenSim.Region.ClientStack"/> 1612 <Reference name="OpenSim.Region.ClientStack"/>
1613 <Reference name="OpenSim.Services.Interfaces"/>
1614 <Reference name="Mono.Addins" path="../../../../bin/"/>
1615 <Reference name="Nini" path="../../../../../bin/"/>
1616 <Reference name="log4net" path="../../../../../bin/"/>
1617 <Reference name="C5" path="../../../../../bin/"/>
1618 <Reference name="Nini" path="../../../../../bin/"/>
1619
1620 <Files>
1621 <Match pattern="*.cs" recurse="true">
1622 <Exclude name="Tests" pattern="Tests"/>
1623 </Match>
1624 </Files>
1625 </Project>
1626
1627 <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack.LindenCaps" path="OpenSim/Region/ClientStack/Linden/Caps" type="Library">
1628 <Configuration name="Debug">
1629 <Options>
1630 <OutputPath>../../../../../bin/</OutputPath>
1631 </Options>
1632 </Configuration>
1633 <Configuration name="Release">
1634 <Options>
1635 <OutputPath>../../../../../bin/</OutputPath>
1636 </Options>
1637 </Configuration>
1638
1639 <ReferencePath>../../../../../bin/</ReferencePath>
1640 <Reference name="System"/>
1641 <Reference name="System.Core"/>
1642 <Reference name="System.Drawing"/>
1643 <Reference name="System.Xml"/>
1644 <Reference name="System.Web"/>
1645 <Reference name="OpenMetaverseTypes" path="../../../../../bin/"/>
1646 <Reference name="OpenMetaverse.StructuredData" path="../../../../../bin/"/>
1647 <Reference name="OpenMetaverse" path="../../../../../bin/"/>
1648 <Reference name="OpenSim.Region.Framework"/>
1649 <Reference name="OpenSim.Capabilities"/>
1650 <Reference name="OpenSim.Capabilities.Handlers"/>
1651 <Reference name="OpenSim.Framework"/>
1652 <Reference name="OpenSim.Framework.Servers"/>
1653 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
1654 <Reference name="OpenSim.Framework.Console"/>
1574 <Reference name="OpenSim.Region.Physics.Manager"/> 1655 <Reference name="OpenSim.Region.Physics.Manager"/>
1575 <Reference name="OpenSim.Services.Interfaces"/> 1656 <Reference name="OpenSim.Services.Interfaces"/>
1576 <Reference name="XMLRPC" path="../../../../bin/"/> 1657 <Reference name="Mono.Addins" path="../../../../bin/"/>
1577 <Reference name="Nini" path="../../../../bin/"/> 1658 <Reference name="Nini" path="../../../../../bin/"/>
1578 <Reference name="log4net" path="../../../../bin/"/> 1659 <Reference name="log4net" path="../../../../../bin/"/>
1579 <Reference name="C5" path="../../../../bin/"/> 1660 <Reference name="Nini" path="../../../../../bin/"/>
1580 <Reference name="Nini" path="../../../../bin/"/>
1581 1661
1582 <Files> 1662 <Files>
1583 <Match pattern="*.cs" recurse="false"/> 1663 <Match pattern="*.cs" recurse="true">
1664 <Exclude name="Tests" pattern="Tests"/>
1665 </Match>
1584 </Files> 1666 </Files>
1585 </Project> 1667 </Project>
1586 1668
@@ -1605,16 +1687,16 @@
1605 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> 1687 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
1606 <Reference name="OpenMetaverse" path="../../../bin/"/> 1688 <Reference name="OpenMetaverse" path="../../../bin/"/>
1607 <Reference name="PumaCode.SvnDotNet" path="../../../bin/"/> 1689 <Reference name="PumaCode.SvnDotNet" path="../../../bin/"/>
1690 <Reference name="OpenSim.Capabilities"/>
1608 <Reference name="OpenSim.Framework"/> 1691 <Reference name="OpenSim.Framework"/>
1609 <Reference name="OpenSim.Framework.Communications"/> 1692 <Reference name="OpenSim.Framework.Communications"/>
1610 <Reference name="OpenSim.Data"/> 1693 <Reference name="OpenSim.Data"/>
1611 <Reference name="OpenSim.Framework.Capabilities"/>
1612 <Reference name="OpenSim.Framework.Console"/> 1694 <Reference name="OpenSim.Framework.Console"/>
1613 <Reference name="OpenSim.Framework.Servers"/> 1695 <Reference name="OpenSim.Framework.Servers"/>
1614 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 1696 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
1615 <Reference name="OpenSim.Framework.Statistics"/> 1697 <Reference name="OpenSim.Framework.Statistics"/>
1616 <Reference name="OpenSim.Region.ClientStack.LindenUDP"/>
1617 <Reference name="OpenSim.Region.CoreModules"/> 1698 <Reference name="OpenSim.Region.CoreModules"/>
1699 <Reference name="OpenSim.Region.ClientStack.LindenUDP"/>
1618 <Reference name="OpenSim.Region.Framework"/> 1700 <Reference name="OpenSim.Region.Framework"/>
1619 <Reference name="OpenSim.Region.Physics.Manager"/> 1701 <Reference name="OpenSim.Region.Physics.Manager"/>
1620 <Reference name="OpenSim.Server.Base"/> 1702 <Reference name="OpenSim.Server.Base"/>
@@ -1945,8 +2027,8 @@
1945 <Reference name="System"/> 2027 <Reference name="System"/>
1946 <Reference name="System.Xml"/> 2028 <Reference name="System.Xml"/>
1947 <Reference name="System.Data"/> 2029 <Reference name="System.Data"/>
2030 <Reference name="OpenSim.Capabilities"/>
1948 <Reference name="OpenSim.Framework"/> 2031 <Reference name="OpenSim.Framework"/>
1949 <Reference name="OpenSim.Framework.Capabilities"/>
1950 <Reference name="OpenSim.Framework.Communications"/> 2032 <Reference name="OpenSim.Framework.Communications"/>
1951 <Reference name="OpenSim.Framework.Console"/> 2033 <Reference name="OpenSim.Framework.Console"/>
1952 <Reference name="OpenSim.Framework.Servers"/> 2034 <Reference name="OpenSim.Framework.Servers"/>
@@ -2378,13 +2460,13 @@
2378 <Reference name="OpenMetaverseTypes" path="../../../bin/"/> 2460 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
2379 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> 2461 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
2380 <Reference name="OpenMetaverse" path="../../../bin/"/> 2462 <Reference name="OpenMetaverse" path="../../../bin/"/>
2463 <Reference name="OpenSim.Capabilities"/>
2381 <Reference name="OpenSim.Framework"/> 2464 <Reference name="OpenSim.Framework"/>
2382 <Reference name="OpenSim.Data"/> 2465 <Reference name="OpenSim.Data"/>
2383 <Reference name="OpenSim.Region.Framework"/> 2466 <Reference name="OpenSim.Region.Framework"/>
2384 <Reference name="OpenSim.Region.CoreModules"/> 2467 <Reference name="OpenSim.Region.CoreModules"/>
2385 <Reference name="OpenSim.Framework.Console"/> 2468 <Reference name="OpenSim.Framework.Console"/>
2386 <Reference name="OpenSim.Framework.Servers"/> 2469 <Reference name="OpenSim.Framework.Servers"/>
2387 <Reference name="OpenSim.Framework.Capabilities"/>
2388 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 2470 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
2389 <Reference name="OpenSim.Framework.Statistics"/> 2471 <Reference name="OpenSim.Framework.Statistics"/>
2390 <Reference name="OpenSim.Region.Physics.Manager"/> 2472 <Reference name="OpenSim.Region.Physics.Manager"/>