diff options
author | Melanie | 2011-01-23 23:29:25 +0000 |
---|---|---|
committer | Melanie | 2011-01-23 23:29:25 +0000 |
commit | 105deab601244584d779e8b7d1e8275b8aeb15ec (patch) | |
tree | 63e2f064a748fddcaa566fde915ee56e8546220b /prebuild.xml | |
parent | Completely nixing flags from the client causes wearables to break. Fix it (diff) | |
parent | Fixes mantis #5343 (diff) | |
download | opensim-SC_OLD-105deab601244584d779e8b7d1e8275b8aeb15ec.zip opensim-SC_OLD-105deab601244584d779e8b7d1e8275b8aeb15ec.tar.gz opensim-SC_OLD-105deab601244584d779e8b7d1e8275b8aeb15ec.tar.bz2 opensim-SC_OLD-105deab601244584d779e8b7d1e8275b8aeb15ec.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'prebuild.xml')
-rw-r--r-- | prebuild.xml | 150 |
1 files changed, 55 insertions, 95 deletions
diff --git a/prebuild.xml b/prebuild.xml index 5825655..bf6c1cc 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -1470,60 +1470,6 @@ | |||
1470 | </Files> | 1470 | </Files> |
1471 | </Project> | 1471 | </Project> |
1472 | 1472 | ||
1473 | <Project frameworkVersion="v3_5" name="OpenSim.Region.OptionalModules" path="OpenSim/Region/OptionalModules" type="Library"> | ||
1474 | <Configuration name="Debug"> | ||
1475 | <Options> | ||
1476 | <OutputPath>../../../bin/</OutputPath> | ||
1477 | </Options> | ||
1478 | </Configuration> | ||
1479 | <Configuration name="Release"> | ||
1480 | <Options> | ||
1481 | <OutputPath>../../../bin/</OutputPath> | ||
1482 | </Options> | ||
1483 | </Configuration> | ||
1484 | |||
1485 | <ReferencePath>../../../bin/</ReferencePath> | ||
1486 | <Reference name="System"/> | ||
1487 | <Reference name="System.Xml"/> | ||
1488 | <Reference name="System.Drawing"/> | ||
1489 | <Reference name="System.Web"/> | ||
1490 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | ||
1491 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | ||
1492 | <Reference name="OpenMetaverse" path="../../../bin/"/> | ||
1493 | <Reference name="PumaCode.SvnDotNet" path="../../../bin/"/> | ||
1494 | <Reference name="OpenSim.Framework"/> | ||
1495 | <Reference name="OpenSim.Framework.Communications"/> | ||
1496 | <Reference name="OpenSim.Data"/> | ||
1497 | <Reference name="OpenSim.Region.Framework"/> | ||
1498 | <Reference name="OpenSim.Region.CoreModules"/> | ||
1499 | <Reference name="OpenSim.Framework.Capabilities"/> | ||
1500 | <Reference name="OpenSim.Framework.Console"/> | ||
1501 | <Reference name="OpenSim.Framework.Servers"/> | ||
1502 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||
1503 | <Reference name="OpenSim.Framework.Statistics"/> | ||
1504 | <Reference name="OpenSim.Region.Physics.Manager"/> | ||
1505 | <Reference name="OpenSim.Server.Base"/> | ||
1506 | <Reference name="OpenSim.Server.Handlers"/> | ||
1507 | <Reference name="OpenSim.Services.Connectors"/> | ||
1508 | <Reference name="OpenSim.Services.Base"/> | ||
1509 | <Reference name="OpenSim.Services.Interfaces"/> | ||
1510 | <Reference name="Mono.Addins" path="../../../bin/"/> | ||
1511 | |||
1512 | <!-- For scripting in funny languages by default --> | ||
1513 | <Reference name="XMLRPC" path="../../../bin/"/> | ||
1514 | <Reference name="OpenSim.Framework.Communications"/> | ||
1515 | <Reference name="Nini" path="../../../bin/"/> | ||
1516 | <Reference name="log4net" path="../../../bin/"/> | ||
1517 | <Reference name="DotNetOpenMail" path="../../../bin/"/> | ||
1518 | |||
1519 | <Files> | ||
1520 | <Match pattern="*.cs" recurse="true"> | ||
1521 | <Exclude name="Tests" pattern="Tests"/> | ||
1522 | </Match> | ||
1523 | <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/> | ||
1524 | </Files> | ||
1525 | </Project> | ||
1526 | |||
1527 | <Project frameworkVersion="v3_5" name="OpenSim.Region.RegionCombinerModule" path="OpenSim/Region/RegionCombinerModule" type="Library"> | 1473 | <Project frameworkVersion="v3_5" name="OpenSim.Region.RegionCombinerModule" path="OpenSim/Region/RegionCombinerModule" type="Library"> |
1528 | <Configuration name="Debug"> | 1474 | <Configuration name="Debug"> |
1529 | <Options> | 1475 | <Options> |
@@ -1587,7 +1533,6 @@ | |||
1587 | <Reference name="OpenSim.Framework.Communications"/> | 1533 | <Reference name="OpenSim.Framework.Communications"/> |
1588 | <Reference name="OpenSim.Framework.Statistics"/> | 1534 | <Reference name="OpenSim.Framework.Statistics"/> |
1589 | <Reference name="OpenSim.Region.Physics.Manager"/> | 1535 | <Reference name="OpenSim.Region.Physics.Manager"/> |
1590 | <Reference name="OpenSim.Region.CoreModules"/> | ||
1591 | <Reference name="XMLRPC" path="../../../bin/"/> | 1536 | <Reference name="XMLRPC" path="../../../bin/"/> |
1592 | <Reference name="Nini" path="../../../bin/"/> | 1537 | <Reference name="Nini" path="../../../bin/"/> |
1593 | <Reference name="log4net" path="../../../bin/"/> | 1538 | <Reference name="log4net" path="../../../bin/"/> |
@@ -1638,6 +1583,61 @@ | |||
1638 | </Files> | 1583 | </Files> |
1639 | </Project> | 1584 | </Project> |
1640 | 1585 | ||
1586 | <Project frameworkVersion="v3_5" name="OpenSim.Region.OptionalModules" path="OpenSim/Region/OptionalModules" type="Library"> | ||
1587 | <Configuration name="Debug"> | ||
1588 | <Options> | ||
1589 | <OutputPath>../../../bin/</OutputPath> | ||
1590 | </Options> | ||
1591 | </Configuration> | ||
1592 | <Configuration name="Release"> | ||
1593 | <Options> | ||
1594 | <OutputPath>../../../bin/</OutputPath> | ||
1595 | </Options> | ||
1596 | </Configuration> | ||
1597 | |||
1598 | <ReferencePath>../../../bin/</ReferencePath> | ||
1599 | <Reference name="System"/> | ||
1600 | <Reference name="System.Xml"/> | ||
1601 | <Reference name="System.Drawing"/> | ||
1602 | <Reference name="System.Web"/> | ||
1603 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | ||
1604 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | ||
1605 | <Reference name="OpenMetaverse" path="../../../bin/"/> | ||
1606 | <Reference name="PumaCode.SvnDotNet" path="../../../bin/"/> | ||
1607 | <Reference name="OpenSim.Framework"/> | ||
1608 | <Reference name="OpenSim.Framework.Communications"/> | ||
1609 | <Reference name="OpenSim.Data"/> | ||
1610 | <Reference name="OpenSim.Framework.Capabilities"/> | ||
1611 | <Reference name="OpenSim.Framework.Console"/> | ||
1612 | <Reference name="OpenSim.Framework.Servers"/> | ||
1613 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||
1614 | <Reference name="OpenSim.Framework.Statistics"/> | ||
1615 | <Reference name="OpenSim.Region.ClientStack.LindenUDP"/> | ||
1616 | <Reference name="OpenSim.Region.CoreModules"/> | ||
1617 | <Reference name="OpenSim.Region.Framework"/> | ||
1618 | <Reference name="OpenSim.Region.Physics.Manager"/> | ||
1619 | <Reference name="OpenSim.Server.Base"/> | ||
1620 | <Reference name="OpenSim.Server.Handlers"/> | ||
1621 | <Reference name="OpenSim.Services.Connectors"/> | ||
1622 | <Reference name="OpenSim.Services.Base"/> | ||
1623 | <Reference name="OpenSim.Services.Interfaces"/> | ||
1624 | <Reference name="Mono.Addins" path="../../../bin/"/> | ||
1625 | |||
1626 | <!-- For scripting in funny languages by default --> | ||
1627 | <Reference name="XMLRPC" path="../../../bin/"/> | ||
1628 | <Reference name="OpenSim.Framework.Communications"/> | ||
1629 | <Reference name="Nini" path="../../../bin/"/> | ||
1630 | <Reference name="log4net" path="../../../bin/"/> | ||
1631 | <Reference name="DotNetOpenMail" path="../../../bin/"/> | ||
1632 | |||
1633 | <Files> | ||
1634 | <Match pattern="*.cs" recurse="true"> | ||
1635 | <Exclude name="Tests" pattern="Tests"/> | ||
1636 | </Match> | ||
1637 | <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/> | ||
1638 | </Files> | ||
1639 | </Project> | ||
1640 | |||
1641 | <!-- Datastore Plugins --> | 1641 | <!-- Datastore Plugins --> |
1642 | <Project frameworkVersion="v3_5" name="OpenSim.Data.Null" path="OpenSim/Data/Null" type="Library"> | 1642 | <Project frameworkVersion="v3_5" name="OpenSim.Data.Null" path="OpenSim/Data/Null" type="Library"> |
1643 | <Configuration name="Debug"> | 1643 | <Configuration name="Debug"> |
@@ -2022,7 +2022,6 @@ | |||
2022 | </Files> | 2022 | </Files> |
2023 | </Project> | 2023 | </Project> |
2024 | 2024 | ||
2025 | |||
2026 | <Project frameworkVersion="v3_5" name="OpenSim.Client.VWoHTTP" path="OpenSim/Client/VWoHTTP" type="Library"> | 2025 | <Project frameworkVersion="v3_5" name="OpenSim.Client.VWoHTTP" path="OpenSim/Client/VWoHTTP" type="Library"> |
2027 | <Configuration name="Debug"> | 2026 | <Configuration name="Debug"> |
2028 | <Options> | 2027 | <Options> |
@@ -2054,45 +2053,6 @@ | |||
2054 | </Files> | 2053 | </Files> |
2055 | </Project> | 2054 | </Project> |
2056 | 2055 | ||
2057 | <Project frameworkVersion="v3_5" name="OpenSim.Client.Linden" path="OpenSim/Client/Linden" type="Library"> | ||
2058 | <Configuration name="Debug"> | ||
2059 | <Options> | ||
2060 | <OutputPath>../../../bin/</OutputPath> | ||
2061 | </Options> | ||
2062 | </Configuration> | ||
2063 | <Configuration name="Release"> | ||
2064 | <Options> | ||
2065 | <OutputPath>../../../bin/</OutputPath> | ||
2066 | </Options> | ||
2067 | </Configuration> | ||
2068 | |||
2069 | <ReferencePath>../../../bin/</ReferencePath> | ||
2070 | |||
2071 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | ||
2072 | <Reference name="OpenMetaverse" path="../../../bin/"/> | ||
2073 | <Reference name="System"/> | ||
2074 | <Reference name="OpenSim.Framework"/> | ||
2075 | <Reference name="OpenSim.Region.Framework"/> | ||
2076 | <Reference name="OpenSim.Framework.Communications"/> | ||
2077 | <Reference name="Nini" path="../../../bin/"/> | ||
2078 | <Reference name="log4net" path="../../../bin/"/> | ||
2079 | <Reference name="OpenSim.Framework.Capabilities"/> | ||
2080 | <Reference name="OpenSim.Framework.Servers"/> | ||
2081 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||
2082 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | ||
2083 | <Reference name="OpenSim.Region.ClientStack"/> | ||
2084 | <Reference name="OpenSim.Region.ClientStack.LindenUDP"/> | ||
2085 | <Reference name="OpenSim.Services.Interfaces"/> | ||
2086 | <Reference name="XMLRPC" path="../../../bin/"/> | ||
2087 | <Reference name="OpenSim.Region.Framework"/> | ||
2088 | <Files> | ||
2089 | <Match pattern="*.cs" recurse="true"/> | ||
2090 | <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/> | ||
2091 | </Files> | ||
2092 | </Project> | ||
2093 | |||
2094 | |||
2095 | |||
2096 | <!-- Data Base Modules --> | 2056 | <!-- Data Base Modules --> |
2097 | <Project frameworkVersion="v3_5" name="OpenSim.Data.MySQL" path="OpenSim/Data/MySQL" type="Library"> | 2057 | <Project frameworkVersion="v3_5" name="OpenSim.Data.MySQL" path="OpenSim/Data/MySQL" type="Library"> |
2098 | <Configuration name="Debug"> | 2058 | <Configuration name="Debug"> |