Merge branch 'master' into careminster

author: Melanie 2013-02-22 01:28:54 +0000
committer: Melanie 2013-02-22 01:28:54 +0000
commit: 9534d5f9296979b68550177a5201c2bdba84f14e (patch)
tree: 1d39dee6d1eaed10b1146a9ee59a6deaa062bae2 /prebuild.xml
parent: Merge branch 'master' into careminster (diff)
parent: Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
download: opensim-SC-9534d5f9296979b68550177a5201c2bdba84f14e.zip
opensim-SC-9534d5f9296979b68550177a5201c2bdba84f14e.tar.gz
opensim-SC-9534d5f9296979b68550177a5201c2bdba84f14e.tar.bz2
opensim-SC-9534d5f9296979b68550177a5201c2bdba84f14e.tar.xz
1 files changed, 98 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml
index 2bee760..8296daa 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2647,6 +2647,104 @@
        </Match>
      </Files>
    </Project>
+    
+    <!-- Addons -->
+    
+    <Project frameworkVersion="v3_5" name="OpenSim.Addons.OfflineIM" path="OpenSim/Addons/OfflineIM" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System"/>
+      <Reference name="System.Core"/>
+      <Reference name="System.Data"/>
+      <Reference name="System.Web"/>
+      <Reference name="System.Xml"/>
+      <Reference name="Nini" path="../../../bin/"/>
+      <Reference name="Mono.Addins" path="../../../bin/"/>
+      <Reference name="MySql.Data" path="../../../bin/"/>
+      <Reference name="log4net" path="../../../bin/"/>
+      <Reference name="OpenMetaverse" path="../../../bin/"/>
+      <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Data"/>
+      <Reference name="OpenSim.Data.MySQL"/>
+      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
+      <Reference name="OpenSim.Services.Base"/>
+      <Reference name="OpenSim.Services.Interfaces"/>
+      <Reference name="OpenSim.Region.Framework"/>
+      <Reference name="OpenSim.Server.Base"/>
+      <Reference name="OpenSim.Server.Handlers"/>
+      <!-- To allow regions to have mono addins -->
+      <Reference name="Mono.Addins" path="../../../bin/" />
+      <Files>
+        <Match pattern="*.cs" recurse="true">
+          <Exclude pattern="Tests" />
+        </Match>
+        <Match buildAction="EmbeddedResource" path="Resources" pattern="*.migrations"/>
+      </Files>
+    </Project>
+    <Project frameworkVersion="v3_5" name="OpenSim.Addons.Groups" path="OpenSim/Addons/Groups" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System"/>
+      <Reference name="System.Core"/>
+      <Reference name="System.Data"/>
+      <Reference name="System.Web"/>
+      <Reference name="System.Xml"/>
+      <Reference name="Nini" path="../../../bin/"/>
+      <Reference name="Mono.Addins" path="../../../bin/"/>
+      <Reference name="log4net" path="../../../bin/"/>
+      <Reference name="OpenMetaverse" path="../../../bin/"/>
+      <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
+      <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Data"/>
+      <Reference name="OpenSim.Framework.Servers"/>
+      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
+      <Reference name="OpenSim.Services.Base"/>
+      <Reference name="OpenSim.Services.Interfaces"/>
+      <Reference name="OpenSim.Region.Framework"/>
+      <Reference name="OpenSim.Server.Base"/>
+      <Reference name="OpenSim.Server.Handlers"/>
+      <!-- To allow regions to have mono addins -->
+      <Reference name="Mono.Addins" path="../../../bin/" />
+      <Files>
+        <Match pattern="*.cs" recurse="true">
+          <Exclude pattern="Tests" />
+        </Match>
+        <Match buildAction="EmbeddedResource" path="Resources" pattern="*.migrations"/>
+      </Files>
+    </Project>
    <!-- Tools -->
author	Melanie	2013-02-22 01:28:54 +0000
committer	Melanie	2013-02-22 01:28:54 +0000
commit	9534d5f9296979b68550177a5201c2bdba84f14e (patch)
tree	1d39dee6d1eaed10b1146a9ee59a6deaa062bae2 /prebuild.xml
parent	Merge branch 'master' into careminster (diff)
parent	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
download	opensim-SC-9534d5f9296979b68550177a5201c2bdba84f14e.zip opensim-SC-9534d5f9296979b68550177a5201c2bdba84f14e.tar.gz opensim-SC-9534d5f9296979b68550177a5201c2bdba84f14e.tar.bz2 opensim-SC-9534d5f9296979b68550177a5201c2bdba84f14e.tar.xz

diff --git a/prebuild.xml b/prebuild.xml index 2bee760..8296daa 100644 --- a/prebuild.xml +++ b/prebuild.xml
@@ -2647,6 +2647,104 @@
2647	</Match>	2647	</Match>
2648	</Files>	2648	</Files>
2649	</Project>	2649	</Project>
		2650
		2651	<!-- Addons -->
		2652
		2653	<Project frameworkVersion="v3_5" name="OpenSim.Addons.OfflineIM" path="OpenSim/Addons/OfflineIM" type="Library">
		2654	<Configuration name="Debug">
		2655	<Options>
		2656	<OutputPath>../../../bin/</OutputPath>
		2657	</Options>
		2658	</Configuration>
		2659	<Configuration name="Release">
		2660	<Options>
		2661	<OutputPath>../../../bin/</OutputPath>
		2662	</Options>
		2663	</Configuration>
		2664
		2665	<ReferencePath>../../../bin/</ReferencePath>
		2666	<Reference name="System"/>
		2667	<Reference name="System.Core"/>
		2668	<Reference name="System.Data"/>
		2669	<Reference name="System.Web"/>
		2670	<Reference name="System.Xml"/>
		2671
		2672	<Reference name="Nini" path="../../../bin/"/>
		2673	<Reference name="Mono.Addins" path="../../../bin/"/>
		2674	<Reference name="MySql.Data" path="../../../bin/"/>
		2675	<Reference name="log4net" path="../../../bin/"/>
		2676	<Reference name="OpenMetaverse" path="../../../bin/"/>
		2677	<Reference name="OpenMetaverseTypes" path="../../../bin/"/>
		2678
		2679	<Reference name="OpenSim.Framework"/>
		2680	<Reference name="OpenSim.Data"/>
		2681	<Reference name="OpenSim.Data.MySQL"/>
		2682	<Reference name="OpenSim.Framework.Servers.HttpServer"/>
		2683	<Reference name="OpenSim.Services.Base"/>
		2684	<Reference name="OpenSim.Services.Interfaces"/>
		2685	<Reference name="OpenSim.Region.Framework"/>
		2686	<Reference name="OpenSim.Server.Base"/>
		2687	<Reference name="OpenSim.Server.Handlers"/>
		2688
		2689	<!-- To allow regions to have mono addins -->
		2690	<Reference name="Mono.Addins" path="../../../bin/" />
		2691
		2692	<Files>
		2693	<Match pattern="*.cs" recurse="true">
		2694	<Exclude pattern="Tests" />
		2695	</Match>
		2696	<Match buildAction="EmbeddedResource" path="Resources" pattern="*.migrations"/>
		2697	</Files>
		2698	</Project>
		2699
		2700	<Project frameworkVersion="v3_5" name="OpenSim.Addons.Groups" path="OpenSim/Addons/Groups" type="Library">
		2701	<Configuration name="Debug">
		2702	<Options>
		2703	<OutputPath>../../../bin/</OutputPath>
		2704	</Options>
		2705	</Configuration>
		2706	<Configuration name="Release">
		2707	<Options>
		2708	<OutputPath>../../../bin/</OutputPath>
		2709	</Options>
		2710	</Configuration>
		2711
		2712	<ReferencePath>../../../bin/</ReferencePath>
		2713	<Reference name="System"/>
		2714	<Reference name="System.Core"/>
		2715	<Reference name="System.Data"/>
		2716	<Reference name="System.Web"/>
		2717	<Reference name="System.Xml"/>
		2718
		2719	<Reference name="Nini" path="../../../bin/"/>
		2720	<Reference name="Mono.Addins" path="../../../bin/"/>
		2721	<Reference name="log4net" path="../../../bin/"/>
		2722	<Reference name="OpenMetaverse" path="../../../bin/"/>
		2723	<Reference name="OpenMetaverseTypes" path="../../../bin/"/>
		2724	<Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
		2725
		2726	<Reference name="OpenSim.Framework"/>
		2727	<Reference name="OpenSim.Data"/>
		2728	<Reference name="OpenSim.Framework.Servers"/>
		2729	<Reference name="OpenSim.Framework.Servers.HttpServer"/>
		2730	<Reference name="OpenSim.Services.Base"/>
		2731	<Reference name="OpenSim.Services.Interfaces"/>
		2732	<Reference name="OpenSim.Region.Framework"/>
		2733	<Reference name="OpenSim.Server.Base"/>
		2734	<Reference name="OpenSim.Server.Handlers"/>
		2735
		2736	<!-- To allow regions to have mono addins -->
		2737	<Reference name="Mono.Addins" path="../../../bin/" />
		2738
		2739	<Files>
		2740	<Match pattern="*.cs" recurse="true">
		2741	<Exclude pattern="Tests" />
		2742	</Match>
		2743	<Match buildAction="EmbeddedResource" path="Resources" pattern="*.migrations"/>
		2744	</Files>
		2745
		2746	</Project>
		2747
2650		2748
2651	<!-- Tools -->	2749	<!-- Tools -->
2652		2750