Changed the order of the OpenSim.Grid.GridServer and OpenSim.Grid.GridServer.Modules projects in prebuild.xml. Hopefully this will fix the mono build problem.

author: MW 2009-02-27 16:07:11 +0000
committer: MW 2009-02-27 16:07:11 +0000
commit: bb9ba1602bbc09a1eb023f85dc84d337a17470fb (patch)
tree: 3cdd1237548f20b2b5f103edc270809350d06c77
parent: Added GridServerPlugin class (which implements IGridPlugin) to OpenSim.Grid... (diff)
download: opensim-SC_OLD-bb9ba1602bbc09a1eb023f85dc84d337a17470fb.zip
opensim-SC_OLD-bb9ba1602bbc09a1eb023f85dc84d337a17470fb.tar.gz
opensim-SC_OLD-bb9ba1602bbc09a1eb023f85dc84d337a17470fb.tar.bz2
opensim-SC_OLD-bb9ba1602bbc09a1eb023f85dc84d337a17470fb.tar.xz
1 files changed, 6 insertions, 6 deletions
diff --git a/prebuild.xml b/prebuild.xml
index 1bb0f8e..4425520 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -714,7 +714,7 @@
      </Files>
    </Project>
-    <Project name="OpenSim.Grid.GridServer.Modules" path="OpenSim/Grid/GridServer.Modules" type="Library">
+    <Project name="OpenSim.Grid.GridServer" path="OpenSim/Grid/GridServer" type="Exe">
      <Configuration name="Debug">
        <Options>
          <OutputPath>../../../bin/</OutputPath>
@@ -730,6 +730,7 @@
      <Reference name="System"/>
      <Reference name="System.Data"/>
      <Reference name="System.Xml"/>
+      <Reference name="Mono.Addins.dll" />
      <Reference name="OpenSim.Framework"/>
      <Reference name="OpenSim.Framework.Communications"/>
      <Reference name="OpenSim.Framework.Console"/>
@@ -738,19 +739,16 @@
      <Reference name="OpenSim.Data.MySQL"/>
      <Reference name="OpenSim.Grid.Framework"/>
      <Reference name="OpenMetaverseTypes.dll"/>
-      <Reference name="OpenSim.Grid.GridServer"/>
      <Reference name="OpenMetaverse.dll"/>
      <Reference name="XMLRPC.dll"/>
      <Reference name="log4net.dll"/>
      <Files>
        <Match pattern="*.cs" recurse="true"/>
-        <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
      </Files>
    </Project>
+    <Project name="OpenSim.Grid.GridServer.Modules" path="OpenSim/Grid/GridServer.Modules" type="Library">
-    <Project name="OpenSim.Grid.GridServer" path="OpenSim/Grid/GridServer" type="Exe">
      <Configuration name="Debug">
        <Options>
          <OutputPath>../../../bin/</OutputPath>
@@ -766,7 +764,6 @@
      <Reference name="System"/>
      <Reference name="System.Data"/>
      <Reference name="System.Xml"/>
-      <Reference name="Mono.Addins.dll" />
      <Reference name="OpenSim.Framework"/>
      <Reference name="OpenSim.Framework.Communications"/>
      <Reference name="OpenSim.Framework.Console"/>
@@ -775,15 +772,18 @@
      <Reference name="OpenSim.Data.MySQL"/>
      <Reference name="OpenSim.Grid.Framework"/>
      <Reference name="OpenMetaverseTypes.dll"/>
+      <Reference name="OpenSim.Grid.GridServer"/>
      <Reference name="OpenMetaverse.dll"/>
      <Reference name="XMLRPC.dll"/>
      <Reference name="log4net.dll"/>
      <Files>
        <Match pattern="*.cs" recurse="true"/>
+        <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
      </Files>
    </Project>
    <Project name="OpenSim.Grid.AssetServer" path="OpenSim/Grid/AssetServer" type="Exe">
      <Configuration name="Debug">
        <Options>
author	MW	2009-02-27 16:07:11 +0000
committer	MW	2009-02-27 16:07:11 +0000
commit	bb9ba1602bbc09a1eb023f85dc84d337a17470fb (patch)
tree	3cdd1237548f20b2b5f103edc270809350d06c77
parent	Added GridServerPlugin class (which implements IGridPlugin) to OpenSim.Grid... (diff)
download	opensim-SC_OLD-bb9ba1602bbc09a1eb023f85dc84d337a17470fb.zip opensim-SC_OLD-bb9ba1602bbc09a1eb023f85dc84d337a17470fb.tar.gz opensim-SC_OLD-bb9ba1602bbc09a1eb023f85dc84d337a17470fb.tar.bz2 opensim-SC_OLD-bb9ba1602bbc09a1eb023f85dc84d337a17470fb.tar.xz

diff --git a/prebuild.xml b/prebuild.xml index 1bb0f8e..4425520 100644 --- a/prebuild.xml +++ b/prebuild.xml
@@ -714,7 +714,7 @@
714	</Files>	714	</Files>
715	</Project>	715	</Project>
716		716
717	<Project name="OpenSim.Grid.GridServer.Modules" path="OpenSim/Grid/GridServer.Modules" type="Library">	717	<Project name="OpenSim.Grid.GridServer" path="OpenSim/Grid/GridServer" type="Exe">
718	<Configuration name="Debug">	718	<Configuration name="Debug">
719	<Options>	719	<Options>
720	<OutputPath>../../../bin/</OutputPath>	720	<OutputPath>../../../bin/</OutputPath>
@@ -730,6 +730,7 @@
730	<Reference name="System"/>	730	<Reference name="System"/>
731	<Reference name="System.Data"/>	731	<Reference name="System.Data"/>
732	<Reference name="System.Xml"/>	732	<Reference name="System.Xml"/>
		733	<Reference name="Mono.Addins.dll" />
733	<Reference name="OpenSim.Framework"/>	734	<Reference name="OpenSim.Framework"/>
734	<Reference name="OpenSim.Framework.Communications"/>	735	<Reference name="OpenSim.Framework.Communications"/>
735	<Reference name="OpenSim.Framework.Console"/>	736	<Reference name="OpenSim.Framework.Console"/>
@@ -738,19 +739,16 @@
738	<Reference name="OpenSim.Data.MySQL"/>	739	<Reference name="OpenSim.Data.MySQL"/>
739	<Reference name="OpenSim.Grid.Framework"/>	740	<Reference name="OpenSim.Grid.Framework"/>
740	<Reference name="OpenMetaverseTypes.dll"/>	741	<Reference name="OpenMetaverseTypes.dll"/>
741	<Reference name="OpenSim.Grid.GridServer"/>
742	<Reference name="OpenMetaverse.dll"/>	742	<Reference name="OpenMetaverse.dll"/>
743	<Reference name="XMLRPC.dll"/>	743	<Reference name="XMLRPC.dll"/>
744	<Reference name="log4net.dll"/>	744	<Reference name="log4net.dll"/>
745		745
746	<Files>	746	<Files>
747	<Match pattern="*.cs" recurse="true"/>	747	<Match pattern="*.cs" recurse="true"/>
748	<Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
749	</Files>	748	</Files>
750	</Project>	749	</Project>
751		750
752		751	<Project name="OpenSim.Grid.GridServer.Modules" path="OpenSim/Grid/GridServer.Modules" type="Library">
753	<Project name="OpenSim.Grid.GridServer" path="OpenSim/Grid/GridServer" type="Exe">
754	<Configuration name="Debug">	752	<Configuration name="Debug">
755	<Options>	753	<Options>
756	<OutputPath>../../../bin/</OutputPath>	754	<OutputPath>../../../bin/</OutputPath>
@@ -766,7 +764,6 @@
766	<Reference name="System"/>	764	<Reference name="System"/>
767	<Reference name="System.Data"/>	765	<Reference name="System.Data"/>
768	<Reference name="System.Xml"/>	766	<Reference name="System.Xml"/>
769	<Reference name="Mono.Addins.dll" />
770	<Reference name="OpenSim.Framework"/>	767	<Reference name="OpenSim.Framework"/>
771	<Reference name="OpenSim.Framework.Communications"/>	768	<Reference name="OpenSim.Framework.Communications"/>
772	<Reference name="OpenSim.Framework.Console"/>	769	<Reference name="OpenSim.Framework.Console"/>
@@ -775,15 +772,18 @@
775	<Reference name="OpenSim.Data.MySQL"/>	772	<Reference name="OpenSim.Data.MySQL"/>
776	<Reference name="OpenSim.Grid.Framework"/>	773	<Reference name="OpenSim.Grid.Framework"/>
777	<Reference name="OpenMetaverseTypes.dll"/>	774	<Reference name="OpenMetaverseTypes.dll"/>
		775	<Reference name="OpenSim.Grid.GridServer"/>
778	<Reference name="OpenMetaverse.dll"/>	776	<Reference name="OpenMetaverse.dll"/>
779	<Reference name="XMLRPC.dll"/>	777	<Reference name="XMLRPC.dll"/>
780	<Reference name="log4net.dll"/>	778	<Reference name="log4net.dll"/>
781		779
782	<Files>	780	<Files>
783	<Match pattern="*.cs" recurse="true"/>	781	<Match pattern="*.cs" recurse="true"/>
		782	<Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
784	</Files>	783	</Files>
785	</Project>	784	</Project>
786		785
		786
787	<Project name="OpenSim.Grid.AssetServer" path="OpenSim/Grid/AssetServer" type="Exe">	787	<Project name="OpenSim.Grid.AssetServer" path="OpenSim/Grid/AssetServer" type="Exe">
788	<Configuration name="Debug">	788	<Configuration name="Debug">
789	<Options>	789	<Options>