aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml
diff options
context:
space:
mode:
authorMelanie2010-03-02 04:43:36 +0000
committerMelanie2010-03-02 04:46:13 +0000
commitbef311dfb9692ffefcafa5752e6da4d0823c8773 (patch)
tree56efb8190b32ad9b80eef9b15990ef44920d338e /prebuild.xml
parentChanged the query in GetFriends in SQLite to match the one in MySql. (diff)
parentFix a few compiler warnings. (diff)
downloadopensim-SC_OLD-bef311dfb9692ffefcafa5752e6da4d0823c8773.zip
opensim-SC_OLD-bef311dfb9692ffefcafa5752e6da4d0823c8773.tar.gz
opensim-SC_OLD-bef311dfb9692ffefcafa5752e6da4d0823c8773.tar.bz2
opensim-SC_OLD-bef311dfb9692ffefcafa5752e6da4d0823c8773.tar.xz
Merge branch 'master' into presence-refactor
This is the big one. master is now presence-refactor (pre 0.7). A new branch 0.6.9-post-fixes and leading tag 0.6.9 has been created. The Presence-refactor branch remains for experimental work.
Diffstat (limited to 'prebuild.xml')
-rw-r--r--prebuild.xml81
1 files changed, 52 insertions, 29 deletions
diff --git a/prebuild.xml b/prebuild.xml
index 8835f12..e19e636 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -533,7 +533,7 @@
533 <Reference name="OpenSim.Framework"/> 533 <Reference name="OpenSim.Framework"/>
534 <Reference name="OpenSim.Framework.Console"/> 534 <Reference name="OpenSim.Framework.Console"/>
535 <Reference name="OpenSim.Region.Physics.Manager"/> 535 <Reference name="OpenSim.Region.Physics.Manager"/>
536 <Reference name="Ode.NET.dll" /> 536 <Reference name="Ode.NET.dll" />
537 <Reference name="log4net.dll"/> 537 <Reference name="log4net.dll"/>
538 538
539 <Files> 539 <Files>
@@ -571,8 +571,6 @@
571 </Files> 571 </Files>
572 </Project> 572 </Project>
573 573
574
575
576 <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.Meshing" path="OpenSim/Region/Physics/Meshing" type="Library"> 574 <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.Meshing" path="OpenSim/Region/Physics/Meshing" type="Library">
577 <Configuration name="Debug"> 575 <Configuration name="Debug">
578 <Options> 576 <Options>
@@ -1403,7 +1401,7 @@
1403 <Reference name="OpenSim.Region.Physics.Manager"/> 1401 <Reference name="OpenSim.Region.Physics.Manager"/>
1404 1402
1405 <Reference name="GlynnTucker.Cache.dll"/> 1403 <Reference name="GlynnTucker.Cache.dll"/>
1406 1404
1407 <!-- For scripting in funny languages by default --> 1405 <!-- For scripting in funny languages by default -->
1408 <Reference name="Microsoft.JScript"/> 1406 <Reference name="Microsoft.JScript"/>
1409 <Reference name="XMLRPC.dll"/> 1407 <Reference name="XMLRPC.dll"/>
@@ -1411,8 +1409,8 @@
1411 <Reference name="Nini.dll" /> 1409 <Reference name="Nini.dll" />
1412 <Reference name="log4net.dll"/> 1410 <Reference name="log4net.dll"/>
1413 <Reference name="DotNetOpenMail.dll"/> 1411 <Reference name="DotNetOpenMail.dll"/>
1414 1412
1415 <!-- To allow regions to have mono addins --> 1413 <!-- To allow regions to have mono addins -->
1416 <Reference name="Mono.Addins.dll" /> 1414 <Reference name="Mono.Addins.dll" />
1417 1415
1418 <Files> 1416 <Files>
@@ -1495,7 +1493,6 @@
1495 <Reference name="log4net.dll"/> 1493 <Reference name="log4net.dll"/>
1496 <Reference name="DotNetOpenMail.dll"/> 1494 <Reference name="DotNetOpenMail.dll"/>
1497 1495
1498
1499 <Files> 1496 <Files>
1500 <Match pattern="*.cs" recurse="true"> 1497 <Match pattern="*.cs" recurse="true">
1501 <Exclude name="Tests" pattern="Tests" /> 1498 <Exclude name="Tests" pattern="Tests" />
@@ -1504,8 +1501,7 @@
1504 </Files> 1501 </Files>
1505 </Project> 1502 </Project>
1506 1503
1507 1504 <Project frameworkVersion="v3_5" name="OpenSim.Region.RegionCombinerModule" path="OpenSim/Region/RegionCombinerModule" type="Library">
1508<Project frameworkVersion="v3_5" name="OpenSim.Region.RegionCombinerModule" path="OpenSim/Region/RegionCombinerModule" type="Library">
1509 <Configuration name="Debug"> 1505 <Configuration name="Debug">
1510 <Options> 1506 <Options>
1511 <OutputPath>../../../bin/</OutputPath> 1507 <OutputPath>../../../bin/</OutputPath>
@@ -1533,8 +1529,8 @@
1533 <Reference name="OpenSim.Region.CoreModules" /> 1529 <Reference name="OpenSim.Region.CoreModules" />
1534 <Reference name="Nini.dll" /> 1530 <Reference name="Nini.dll" />
1535 <Reference name="log4net.dll"/> 1531 <Reference name="log4net.dll"/>
1536 1532
1537 <!-- To allow regions to have mono addins --> 1533 <!-- To allow regions to have mono addins -->
1538 <Reference name="Mono.Addins.dll" /> 1534 <Reference name="Mono.Addins.dll" />
1539 1535
1540 <Files> 1536 <Files>
@@ -1543,6 +1539,41 @@
1543 </Files> 1539 </Files>
1544 </Project> 1540 </Project>
1545 1541
1542 <Project frameworkVersion="v3_5" name="OpenSim.Region.Communications.Hypergrid" path="OpenSim/Region/Communications/Hypergrid" type="Library">
1543 <Configuration name="Debug">
1544 <Options>
1545 <OutputPath>../../../../bin/</OutputPath>
1546 </Options>
1547 </Configuration>
1548 <Configuration name="Release">
1549 <Options>
1550 <OutputPath>../../../../bin/</OutputPath>
1551 </Options>
1552 </Configuration>
1553
1554 <ReferencePath>../../../../bin/</ReferencePath>
1555 <Reference name="System"/>
1556 <Reference name="System.Drawing"/>
1557 <Reference name="System.Xml"/>
1558 <Reference name="OpenSim.Data"/>
1559 <Reference name="OpenSim.Framework"/>
1560 <Reference name="OpenSim.Framework.Communications" />
1561 <Reference name="OpenSim.Framework.Servers"/>
1562 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
1563 <Reference name="OpenSim.Framework.Statistics"/>
1564 <Reference name="OpenSim.Region.Communications.Local"/>
1565 <Reference name="OpenSim.Region.Communications.OGS1"/>
1566 <Reference name="OpenSim.Region.Framework"/>
1567 <Reference name="OpenSim.Services.Interfaces"/>
1568 <Reference name="OpenMetaverse.dll"/>
1569 <Reference name="OpenMetaverseTypes.dll"/>
1570 <Reference name="XMLRPC.dll"/>
1571 <Reference name="log4net.dll"/>
1572
1573 <Files>
1574 <Match pattern="*.cs" recurse="true"/>
1575 </Files>
1576 </Project>
1546 1577
1547 <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack" path="OpenSim/Region/ClientStack" type="Library"> 1578 <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack" path="OpenSim/Region/ClientStack" type="Library">
1548 <Configuration name="Debug"> 1579 <Configuration name="Debug">
@@ -1978,11 +2009,9 @@
1978 <Match pattern="*.cs" recurse="true"/> 2009 <Match pattern="*.cs" recurse="true"/>
1979 </Files> 2010 </Files>
1980 </Project> 2011 </Project>
1981 2012
1982 2013 <!-- Client Stack Modules -->
1983 <!-- Client Stack Modules --> 2014
1984
1985
1986 <Project frameworkVersion="v3_5" name="OpenSim.Client.MXP" path="OpenSim/Client/MXP" type="Library"> 2015 <Project frameworkVersion="v3_5" name="OpenSim.Client.MXP" path="OpenSim/Client/MXP" type="Library">
1987 <Configuration name="Debug"> 2016 <Configuration name="Debug">
1988 <Options> 2017 <Options>
@@ -2032,10 +2061,10 @@
2032 <Reference name="OpenMetaverseTypes.dll"/> 2061 <Reference name="OpenMetaverseTypes.dll"/>
2033 <Reference name="OpenMetaverse.dll"/> 2062 <Reference name="OpenMetaverse.dll"/>
2034 <Reference name="System"/> 2063 <Reference name="System"/>
2035 <Reference name="System.Drawing"/> 2064 <Reference name="System.Drawing"/>
2036 <Reference name="OpenSim.Framework"/> 2065 <Reference name="OpenSim.Framework"/>
2037 <Reference name="OpenSim.Framework.Servers"/> 2066 <Reference name="OpenSim.Framework.Servers"/>
2038 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 2067 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
2039 <Reference name="OpenSim.Region.Framework"/> 2068 <Reference name="OpenSim.Region.Framework"/>
2040 <Reference name="OpenSim.Framework.Communications"/> 2069 <Reference name="OpenSim.Framework.Communications"/>
2041 <Reference name="OpenSim.Services.Interfaces"/> 2070 <Reference name="OpenSim.Services.Interfaces"/>
@@ -2077,7 +2106,7 @@
2077 <Match pattern="*.cs" recurse="true"/> 2106 <Match pattern="*.cs" recurse="true"/>
2078 </Files> 2107 </Files>
2079 </Project> 2108 </Project>
2080 2109
2081 <Project frameworkVersion="v3_5" name="OpenSim.Client.Linden" path="OpenSim/Client/Linden" type="Library"> 2110 <Project frameworkVersion="v3_5" name="OpenSim.Client.Linden" path="OpenSim/Client/Linden" type="Library">
2082 <Configuration name="Debug"> 2111 <Configuration name="Debug">
2083 <Options> 2112 <Options>
@@ -2781,7 +2810,7 @@
2781 <ReferencePath>../../../bin/</ReferencePath> 2810 <ReferencePath>../../../bin/</ReferencePath>
2782 <Reference name="System"/> 2811 <Reference name="System"/>
2783 <Reference name="System.Xml"/> 2812 <Reference name="System.Xml"/>
2784 <Reference name="System.Core"/> 2813 <Reference name="System.Core"/>
2785 <Reference name="System.Drawing"/> 2814 <Reference name="System.Drawing"/>
2786 <Reference name="System.Data"/> 2815 <Reference name="System.Data"/>
2787 <Reference name="OpenMetaverse.dll"/> 2816 <Reference name="OpenMetaverse.dll"/>
@@ -2790,7 +2819,7 @@
2790 <Reference name="OpenSim.Data"/> 2819 <Reference name="OpenSim.Data"/>
2791 <Reference name="OpenSim.Region.Framework"/> 2820 <Reference name="OpenSim.Region.Framework"/>
2792 <Reference name="OpenSim.Region.CoreModules"/> 2821 <Reference name="OpenSim.Region.CoreModules"/>
2793 <Reference name="OpenSim.Tests.Common"/> 2822 <Reference name="OpenSim.Tests.Common"/>
2794 <Reference name="log4net.dll"/> 2823 <Reference name="log4net.dll"/>
2795 <Reference name="Mono.Addins.dll" /> 2824 <Reference name="Mono.Addins.dll" />
2796 <Reference name="nunit.framework.dll" /> 2825 <Reference name="nunit.framework.dll" />
@@ -2995,7 +3024,7 @@
2995 <Reference name="OpenSim.Region.CoreModules"/> 3024 <Reference name="OpenSim.Region.CoreModules"/>
2996 <Reference name="OpenSim.Region.Physics.Manager"/> 3025 <Reference name="OpenSim.Region.Physics.Manager"/>
2997 <Reference name="OpenSim.Services.Interfaces"/> 3026 <Reference name="OpenSim.Services.Interfaces"/>
2998 3027
2999 <!-- Unit tests --> 3028 <!-- Unit tests -->
3000 <Reference name="OpenSim.Tests.Common"/> 3029 <Reference name="OpenSim.Tests.Common"/>
3001 <Reference name="Nini.dll"/> 3030 <Reference name="Nini.dll"/>
@@ -3256,9 +3285,3 @@
3256 3285
3257 </Solution> 3286 </Solution>
3258</Prebuild> 3287</Prebuild>
3259
3260
3261
3262
3263
3264
generated by cgit v1.1 at 2024-11-04 21:57:02 +0000