aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml
diff options
context:
space:
mode:
authorteravus2012-11-15 10:05:16 -0500
committerteravus2012-11-15 10:05:16 -0500
commite9153e1d1aae50024d8cd05fe14a9bce34343a0e (patch)
treebc111d34f95a26b99c7e34d9e495dc14d1802cc3 /prebuild.xml
parentMerge master into teravuswork (diff)
downloadopensim-SC-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.zip
opensim-SC-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.gz
opensim-SC-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.bz2
opensim-SC-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.xz
Revert "Merge master into teravuswork", it should have been avination, not master.
This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
Diffstat (limited to '')
-rw-r--r--prebuild.xml310
1 files changed, 133 insertions, 177 deletions
diff --git a/prebuild.xml b/prebuild.xml
index 08e7070..afcae1c 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -112,34 +112,6 @@
112 </Files> 112 </Files>
113 </Project> 113 </Project>
114 114
115 <Project frameworkVersion="v3_5" name="OpenSim.Services.Interfaces" path="OpenSim/Services/Interfaces" type="Library">
116 <Configuration name="Debug">
117 <Options>
118 <OutputPath>../../../bin/</OutputPath>
119 </Options>
120 </Configuration>
121 <Configuration name="Release">
122 <Options>
123 <OutputPath>../../../bin/</OutputPath>
124 </Options>
125 </Configuration>
126
127 <ReferencePath>../../../bin/</ReferencePath>
128 <Reference name="System"/>
129 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
130 <Reference name="OpenMetaverse" path="../../../bin/"/>
131 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
132 <Reference name="OpenSim.Framework"/>
133 <Reference name="OpenSim.Framework.Console"/>
134 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
135 <Reference name="Nini" path="../../../bin/"/>
136 <Reference name="log4net" path="../../../bin/"/>
137
138 <Files>
139 <Match pattern="*.cs" recurse="true"/>
140 </Files>
141 </Project>
142
143 <Project frameworkVersion="v3_5" name="OpenSim.Framework.Monitoring" path="OpenSim/Framework/Monitoring" type="Library"> 115 <Project frameworkVersion="v3_5" name="OpenSim.Framework.Monitoring" path="OpenSim/Framework/Monitoring" type="Library">
144 <Configuration name="Debug"> 116 <Configuration name="Debug">
145 <Options> 117 <Options>
@@ -234,6 +206,34 @@
234 </Files> 206 </Files>
235 </Project> 207 </Project>
236 208
209 <Project frameworkVersion="v3_5" name="OpenSim.Services.Interfaces" path="OpenSim/Services/Interfaces" type="Library">
210 <Configuration name="Debug">
211 <Options>
212 <OutputPath>../../../bin/</OutputPath>
213 </Options>
214 </Configuration>
215 <Configuration name="Release">
216 <Options>
217 <OutputPath>../../../bin/</OutputPath>
218 </Options>
219 </Configuration>
220
221 <ReferencePath>../../../bin/</ReferencePath>
222 <Reference name="System"/>
223 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
224 <Reference name="OpenMetaverse" path="../../../bin/"/>
225 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
226 <Reference name="OpenSim.Framework"/>
227 <Reference name="OpenSim.Framework.Console"/>
228 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
229 <Reference name="Nini" path="../../../bin/"/>
230 <Reference name="log4net" path="../../../bin/"/>
231
232 <Files>
233 <Match pattern="*.cs" recurse="true"/>
234 </Files>
235 </Project>
236
237 <Project frameworkVersion="v3_5" name="OpenSim.Framework.Serialization" path="OpenSim/Framework/Serialization" type="Library"> 237 <Project frameworkVersion="v3_5" name="OpenSim.Framework.Serialization" path="OpenSim/Framework/Serialization" type="Library">
238 <Configuration name="Debug"> 238 <Configuration name="Debug">
239 <Options> 239 <Options>
@@ -1497,6 +1497,110 @@
1497 </Files> 1497 </Files>
1498 </Project> 1498 </Project>
1499 1499
1500 <Project frameworkVersion="v3_5" name="OpenSim.Region.CoreModules" path="OpenSim/Region/CoreModules" type="Library">
1501 <Configuration name="Debug">
1502 <Options>
1503 <OutputPath>../../../bin/</OutputPath>
1504 <AllowUnsafe>true</AllowUnsafe>
1505 </Options>
1506 </Configuration>
1507 <Configuration name="Release">
1508 <Options>
1509 <OutputPath>../../../bin/</OutputPath>
1510 <AllowUnsafe>true</AllowUnsafe>
1511 </Options>
1512 </Configuration>
1513
1514 <ReferencePath>../../../bin/</ReferencePath>
1515 <Reference name="System"/>
1516 <Reference name="System.Core"/>
1517 <Reference name="System.Xml"/>
1518 <Reference name="System.Xml.Linq"/>
1519 <Reference name="System.Drawing"/>
1520 <Reference name="System.Web"/>
1521 <Reference name="NDesk.Options" path="../../../bin/"/>
1522 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
1523 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
1524 <Reference name="OpenMetaverse" path="../../../bin/"/>
1525 <Reference name="CSJ2K" path="../../../bin/"/>
1526 <Reference name="Warp3D" path="../../../bin/"/>
1527 <Reference name="OpenSim.Capabilities"/>
1528 <Reference name="OpenSim.Data"/>
1529 <Reference name="OpenSim.Framework"/>
1530 <Reference name="OpenSim.Framework.Communications"/>
1531 <Reference name="OpenSim.Framework.Console"/>
1532 <Reference name="OpenSim.Framework.Monitoring"/>
1533 <Reference name="OpenSim.Framework.Serialization"/>
1534 <Reference name="OpenSim.Framework.Servers"/>
1535 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
1536 <Reference name="OpenSim.Region.Framework"/>
1537 <Reference name="OpenSim.Region.Physics.Manager"/>
1538 <Reference name="OpenSim.Server.Base"/>
1539 <Reference name="OpenSim.Server.Handlers"/>
1540 <Reference name="OpenSim.Services.Connectors"/>
1541 <Reference name="OpenSim.Services.Base"/>
1542 <Reference name="OpenSim.Services.Interfaces"/>
1543 <Reference name="Ionic.Zip" path="../../../bin/"/>
1544
1545 <Reference name="GlynnTucker.Cache" path="../../../bin/"/>
1546
1547 <!-- For scripting in funny languages by default -->
1548 <Reference name="XMLRPC" path="../../../bin/"/>
1549 <Reference name="OpenSim.Framework.Communications"/>
1550 <Reference name="Nini" path="../../../bin/"/>
1551 <Reference name="log4net" path="../../../bin/"/>
1552 <Reference name="DotNetOpenMail" path="../../../bin/"/>
1553
1554 <!-- To allow regions to have mono addins -->
1555 <Reference name="Mono.Addins" path="../../../bin/"/>
1556
1557 <Files>
1558 <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/>
1559 <Match pattern="*.cs" recurse="true">
1560 <Exclude name="Tests" pattern="Tests"/>
1561 </Match>
1562 <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/>
1563 </Files>
1564 </Project>
1565
1566 <Project frameworkVersion="v3_5" name="OpenSim.Region.RegionCombinerModule" path="OpenSim/Region/RegionCombinerModule" type="Library">
1567 <Configuration name="Debug">
1568 <Options>
1569 <OutputPath>../../../bin/</OutputPath>
1570 </Options>
1571 </Configuration>
1572 <Configuration name="Release">
1573 <Options>
1574 <OutputPath>../../../bin/</OutputPath>
1575 </Options>
1576 </Configuration>
1577
1578 <ReferencePath>../../../bin/</ReferencePath>
1579 <Reference name="System"/>
1580 <Reference name="System.Xml"/>
1581 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
1582 <Reference name="OpenMetaverse" path="../../../bin/"/>
1583 <Reference name="OpenSim.Framework"/>
1584 <Reference name="OpenSim.Framework.Communications"/>
1585 <Reference name="OpenSim.Region.Framework"/>
1586 <Reference name="OpenSim.Server.Base"/>
1587 <Reference name="OpenSim.Server.Handlers"/>
1588 <Reference name="OpenSim.Framework.Console"/>
1589 <Reference name="OpenSim.Region.Physics.Manager"/>
1590 <Reference name="OpenSim.Framework.Communications"/>
1591 <Reference name="OpenSim.Region.CoreModules"/>
1592 <Reference name="Nini" path="../../../bin/"/>
1593 <Reference name="log4net" path="../../../bin/"/>
1594
1595 <!-- To allow regions to have mono addins -->
1596 <Reference name="Mono.Addins" path="../../../bin/"/>
1597
1598 <Files>
1599 <Match pattern="*.cs" recurse="true"/>
1600 <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/>
1601 </Files>
1602 </Project>
1603
1500 <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack" path="OpenSim/Region/ClientStack" type="Library"> 1604 <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack" path="OpenSim/Region/ClientStack" type="Library">
1501 <Configuration name="Debug"> 1605 <Configuration name="Debug">
1502 <Options> 1606 <Options>
@@ -1619,111 +1723,6 @@
1619 </Files> 1723 </Files>
1620 </Project> 1724 </Project>
1621 1725
1622 <Project frameworkVersion="v3_5" name="OpenSim.Region.CoreModules" path="OpenSim/Region/CoreModules" type="Library">
1623 <Configuration name="Debug">
1624 <Options>
1625 <OutputPath>../../../bin/</OutputPath>
1626 <AllowUnsafe>true</AllowUnsafe>
1627 </Options>
1628 </Configuration>
1629 <Configuration name="Release">
1630 <Options>
1631 <OutputPath>../../../bin/</OutputPath>
1632 <AllowUnsafe>true</AllowUnsafe>
1633 </Options>
1634 </Configuration>
1635
1636 <ReferencePath>../../../bin/</ReferencePath>
1637 <Reference name="System"/>
1638 <Reference name="System.Core"/>
1639 <Reference name="System.Xml"/>
1640 <Reference name="System.Xml.Linq"/>
1641 <Reference name="System.Drawing"/>
1642 <Reference name="System.Web"/>
1643 <Reference name="NDesk.Options" path="../../../bin/"/>
1644 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
1645 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
1646 <Reference name="OpenMetaverse" path="../../../bin/"/>
1647 <Reference name="CSJ2K" path="../../../bin/"/>
1648 <Reference name="Warp3D" path="../../../bin/"/>
1649 <Reference name="OpenSim.Capabilities"/>
1650 <Reference name="OpenSim.Data"/>
1651 <Reference name="OpenSim.Framework"/>
1652 <Reference name="OpenSim.Framework.Communications"/>
1653 <Reference name="OpenSim.Framework.Console"/>
1654 <Reference name="OpenSim.Framework.Monitoring"/>
1655 <Reference name="OpenSim.Framework.Serialization"/>
1656 <Reference name="OpenSim.Framework.Servers"/>
1657 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
1658 <Reference name="OpenSim.Region.ClientStack.LindenUDP"/>
1659 <Reference name="OpenSim.Region.Framework"/>
1660 <Reference name="OpenSim.Region.Physics.Manager"/>
1661 <Reference name="OpenSim.Server.Base"/>
1662 <Reference name="OpenSim.Server.Handlers"/>
1663 <Reference name="OpenSim.Services.Connectors"/>
1664 <Reference name="OpenSim.Services.Base"/>
1665 <Reference name="OpenSim.Services.Interfaces"/>
1666 <Reference name="Ionic.Zip" path="../../../bin/"/>
1667
1668 <Reference name="GlynnTucker.Cache" path="../../../bin/"/>
1669
1670 <!-- For scripting in funny languages by default -->
1671 <Reference name="XMLRPC" path="../../../bin/"/>
1672 <Reference name="OpenSim.Framework.Communications"/>
1673 <Reference name="Nini" path="../../../bin/"/>
1674 <Reference name="log4net" path="../../../bin/"/>
1675 <Reference name="DotNetOpenMail" path="../../../bin/"/>
1676
1677 <!-- To allow regions to have mono addins -->
1678 <Reference name="Mono.Addins" path="../../../bin/"/>
1679
1680 <Files>
1681 <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/>
1682 <Match pattern="*.cs" recurse="true">
1683 <Exclude name="Tests" pattern="Tests"/>
1684 </Match>
1685 <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/>
1686 </Files>
1687 </Project>
1688
1689 <Project frameworkVersion="v3_5" name="OpenSim.Region.RegionCombinerModule" path="OpenSim/Region/RegionCombinerModule" type="Library">
1690 <Configuration name="Debug">
1691 <Options>
1692 <OutputPath>../../../bin/</OutputPath>
1693 </Options>
1694 </Configuration>
1695 <Configuration name="Release">
1696 <Options>
1697 <OutputPath>../../../bin/</OutputPath>
1698 </Options>
1699 </Configuration>
1700
1701 <ReferencePath>../../../bin/</ReferencePath>
1702 <Reference name="System"/>
1703 <Reference name="System.Xml"/>
1704 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
1705 <Reference name="OpenMetaverse" path="../../../bin/"/>
1706 <Reference name="OpenSim.Framework"/>
1707 <Reference name="OpenSim.Framework.Communications"/>
1708 <Reference name="OpenSim.Region.Framework"/>
1709 <Reference name="OpenSim.Server.Base"/>
1710 <Reference name="OpenSim.Server.Handlers"/>
1711 <Reference name="OpenSim.Framework.Console"/>
1712 <Reference name="OpenSim.Region.Physics.Manager"/>
1713 <Reference name="OpenSim.Framework.Communications"/>
1714 <Reference name="OpenSim.Region.CoreModules"/>
1715 <Reference name="Nini" path="../../../bin/"/>
1716 <Reference name="log4net" path="../../../bin/"/>
1717
1718 <!-- To allow regions to have mono addins -->
1719 <Reference name="Mono.Addins" path="../../../bin/"/>
1720
1721 <Files>
1722 <Match pattern="*.cs" recurse="true"/>
1723 <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/>
1724 </Files>
1725 </Project>
1726
1727 <Project frameworkVersion="v3_5" name="OpenSim.Region.OptionalModules" path="OpenSim/Region/OptionalModules" type="Library"> 1726 <Project frameworkVersion="v3_5" name="OpenSim.Region.OptionalModules" path="OpenSim/Region/OptionalModules" type="Library">
1728 <Configuration name="Debug"> 1727 <Configuration name="Debug">
1729 <Options> 1728 <Options>
@@ -1884,7 +1883,6 @@
1884 <Reference name="System.Core"/> 1883 <Reference name="System.Core"/>
1885 <Reference name="System.Xml"/> 1884 <Reference name="System.Xml"/>
1886 <Reference name="Mono.Addins" path="../../../bin/"/> 1885 <Reference name="Mono.Addins" path="../../../bin/"/>
1887 <Reference name="NDesk.Options" path="../../../bin/"/>
1888 <Reference name="OpenMetaverseTypes" path="../../../bin/"/> 1886 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
1889 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> 1887 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
1890 <Reference name="OpenMetaverse" path="../../../bin/"/> 1888 <Reference name="OpenMetaverse" path="../../../bin/"/>
@@ -3095,7 +3093,6 @@
3095 <Match path="World/Media/Moap/Tests" pattern="*.cs" recurse="true"/> 3093 <Match path="World/Media/Moap/Tests" pattern="*.cs" recurse="true"/>
3096 <Match path="World/Serialiser/Tests" pattern="*.cs" recurse="true"/> 3094 <Match path="World/Serialiser/Tests" pattern="*.cs" recurse="true"/>
3097 <Match path="World/Terrain/Tests" pattern="*.cs" recurse="true"/> 3095 <Match path="World/Terrain/Tests" pattern="*.cs" recurse="true"/>
3098 <Match path="ServiceConnectorsOut/Asset/Tests" pattern="*.cs" recurse="true"/>
3099 <Match path="ServiceConnectorsOut/Grid/Tests" pattern="*.cs" recurse="true"/> 3096 <Match path="ServiceConnectorsOut/Grid/Tests" pattern="*.cs" recurse="true"/>
3100 <Match path="ServiceConnectorsOut/Presence/Tests" pattern="*.cs" recurse="true"/> 3097 <Match path="ServiceConnectorsOut/Presence/Tests" pattern="*.cs" recurse="true"/>
3101 </Files> 3098 </Files>
@@ -3376,48 +3373,7 @@
3376 </Files> 3373 </Files>
3377 </Project> 3374 </Project>
3378 3375
3379 <Project frameworkVersion="v3_5" name="OpenSim.Tests.Stress" path="OpenSim/Tests/Stress" type="Library"> 3376 <Project frameworkVersion="v3_5" name="OpenSim.Tests.Torture" path="OpenSim/Tests/Torture" type="Library">
3380 <Configuration name="Debug">
3381 <Options>
3382 <OutputPath>../../../bin/</OutputPath>
3383 </Options>
3384 </Configuration>
3385 <Configuration name="Release">
3386 <Options>
3387 <OutputPath>../../../bin/</OutputPath>
3388 </Options>
3389 </Configuration>
3390
3391 <ReferencePath>../../../bin/</ReferencePath>
3392 <Reference name="System"/>
3393 <Reference name="System.Core"/>
3394 <Reference name="System.Xml"/>
3395 <Reference name="System.Data"/>
3396 <Reference name="log4net" path="../../../bin/"/>
3397 <Reference name="Nini" path="../../../bin/"/>
3398 <Reference name="nunit.framework" path="../../../bin/"/>
3399 <Reference name="OpenMetaverse" path="../../../bin/"/>
3400 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
3401 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
3402 <Reference name="XMLRPC" path="../../../bin/"/>
3403 <Reference name="OpenSim.Framework"/>
3404 <Reference name="OpenSim.Framework.Communications"/>
3405 <Reference name="OpenSim.Framework.Console"/>
3406 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
3407 <Reference name="OpenSim.Region.CoreModules"/>
3408 <Reference name="OpenSim.Region.Framework"/>
3409 <Reference name="OpenSim.Region.OptionalModules"/>
3410 <Reference name="OpenSim.Region.ScriptEngine.Shared"/>
3411 <Reference name="OpenSim.Region.ScriptEngine.XEngine"/>
3412 <Reference name="OpenSim.Services.Interfaces"/>
3413 <Reference name="OpenSim.Services.AvatarService"/>
3414 <Reference name="OpenSim.Tests.Common"/>
3415 <Files>
3416 <Match pattern="*.cs" recurse="false"/>
3417 </Files>
3418 </Project>
3419
3420 <Project frameworkVersion="v3_5" name="OpenSim.Tests.Performance" path="OpenSim/Tests/Performance" type="Library">
3421 <Configuration name="Debug"> 3377 <Configuration name="Debug">
3422 <Options> 3378 <Options>
3423 <OutputPath>../../../bin/</OutputPath> 3379 <OutputPath>../../../bin/</OutputPath>