Fix up prebuild.xml so it compiles on Linux. Needs to be retested on Windows.

author: Justin Clarke Casey 2007-12-31 01:18:35 +0000
committer: Justin Clarke Casey 2007-12-31 01:18:35 +0000
commit: 508048f3c489da90b6fe446710c0bac1d6dfaa25 (patch)
tree: 876f13fe368dc17fed7e96e4ed0a1c537fff5583
parent: * Added graceful remote script server connection error handling (diff)
download: opensim-SC-508048f3c489da90b6fe446710c0bac1d6dfaa25.zip
opensim-SC-508048f3c489da90b6fe446710c0bac1d6dfaa25.tar.gz
opensim-SC-508048f3c489da90b6fe446710c0bac1d6dfaa25.tar.bz2
opensim-SC-508048f3c489da90b6fe446710c0bac1d6dfaa25.tar.xz
1 files changed, 29 insertions, 30 deletions
diff --git a/prebuild.xml b/prebuild.xml
index bc1165e..92fa34b 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1151,73 +1151,72 @@
      </Files>
    </Project>
-    <Project name="OpenSim.Region.ScriptEngine.RemoteServer" path="OpenSim/Region/ScriptEngine/RemoteServer" type="Library">
+    <Project name="OpenSim.Grid.ScriptServer" path="OpenSim/Grid/ScriptServer" type="Exe">
      <Configuration name="Debug">
        <Options>
-          <OutputPath>../../../../bin/ScriptEngines/</OutputPath>
+          <OutputPath>../../../bin/</OutputPath>
        </Options>
      </Configuration>
      <Configuration name="Release">
        <Options>
-          <OutputPath>../../../../bin/ScriptEngines/</OutputPath>
+          <OutputPath>../../../bin/</OutputPath>
        </Options>
      </Configuration>
-      <ReferencePath>../../../../bin/</ReferencePath>      
+      <ReferencePath>../../../bin/</ReferencePath>
-      <ReferencePath>../../../../bin/ScriptEngines/</ReferencePath> 
      <Reference name="System" localCopy="false"/>
      <Reference name="System.Data" localCopy="false"/>
-      <Reference name="System.Xml" localCopy="false"/>
      <Reference name="System.Runtime.Remoting" localCopy="false"/>
-      <Reference name="OpenSim.Region.Environment" />
+      <Reference name="System.Xml" localCopy="false"/>
-      <Reference name="libsecondlife.dll"/>
+      <Reference name="OpenSim"/>
-      <Reference name="RAIL.dll"/>
      <Reference name="OpenSim.Framework"/>
      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Framework.Servers"/>
+      <Reference name="OpenSim.Framework.Data"/>
+      <Reference name="OpenSim.Region.Environment"/>
+      <Reference name="../../../bin/ScriptEngines/OpenSim.Region.ScriptEngine.DotNetEngine"/>
      <Reference name="OpenSim.Region.ScriptEngine.Common"/>
-      <Reference name="OpenSim.Region.Terrain.BasicTerrain"/>
+      <Reference name="libsecondlife.dll"/>
-      <Reference name="OpenSim.Grid.ScriptServer"/>
-      <Reference name="OpenSim.Region.ScriptEngine"/>
-      <Reference name="OpenSim.Region.ScriptEngine.DotNetEngine"/>
      <Reference name="Axiom.MathLib.dll" localCopy="false"/>
-      <Reference name="Nini.dll" />
+      <Reference name="XMLRPC.dll"/>
      <Files>
        <Match pattern="*.cs" recurse="true"/>
      </Files>
    </Project>
+    <Project name="OpenSim.Region.ScriptEngine.RemoteServer" path="OpenSim/Region/ScriptEngine/RemoteServer" type="Library">
-    <Project name="OpenSim.Grid.ScriptServer" path="OpenSim/Grid/ScriptServer" type="Exe">
      <Configuration name="Debug">
        <Options>
-          <OutputPath>../../../bin/</OutputPath>
+          <OutputPath>../../../../bin/ScriptEngines/</OutputPath>
        </Options>
      </Configuration>
      <Configuration name="Release">
        <Options>
-          <OutputPath>../../../bin/</OutputPath>
+          <OutputPath>../../../../bin/ScriptEngines/</OutputPath>
        </Options>
      </Configuration>
-      <ReferencePath>../../../bin/</ReferencePath>
+      <ReferencePath>../../../../bin/</ReferencePath>      
+      <ReferencePath>../../../../bin/ScriptEngines/</ReferencePath> 
      <Reference name="System" localCopy="false"/>
      <Reference name="System.Data" localCopy="false"/>
-      <Reference name="System.Runtime.Remoting" localCopy="false"/>
      <Reference name="System.Xml" localCopy="false"/>
-      <Reference name="OpenSim"/>
+      <Reference name="System.Runtime.Remoting" localCopy="false"/>
+      <Reference name="OpenSim.Region.Environment" />
+      <Reference name="libsecondlife.dll"/>
+      <Reference name="RAIL.dll"/>
      <Reference name="OpenSim.Framework"/>
      <Reference name="OpenSim.Framework.Console"/>
-      <Reference name="OpenSim.Framework.Servers"/>
-      <Reference name="OpenSim.Framework.Data"/>
-      <Reference name="OpenSim.Region.Environment"/>
-      <Reference name="OpenSim.Region.ScriptEngine.DotNetEngine"/>
      <Reference name="OpenSim.Region.ScriptEngine.Common"/>
-      <Reference name="libsecondlife.dll"/>
+      <Reference name="OpenSim.Region.Terrain.BasicTerrain"/>
+      <Reference name="OpenSim.Grid.ScriptServer"/>
+      <Reference name="../../../../bin/ScriptEngines/OpenSim.Region.ScriptEngine.DotNetEngine"/>
      <Reference name="Axiom.MathLib.dll" localCopy="false"/>
-      <Reference name="XMLRPC.dll"/>
+      <Reference name="Nini.dll" />
      <Files>
        <Match pattern="*.cs" recurse="true"/>
      </Files>
author	Justin Clarke Casey	2007-12-31 01:18:35 +0000
committer	Justin Clarke Casey	2007-12-31 01:18:35 +0000
commit	508048f3c489da90b6fe446710c0bac1d6dfaa25 (patch)
tree	876f13fe368dc17fed7e96e4ed0a1c537fff5583
parent	* Added graceful remote script server connection error handling (diff)
download	opensim-SC-508048f3c489da90b6fe446710c0bac1d6dfaa25.zip opensim-SC-508048f3c489da90b6fe446710c0bac1d6dfaa25.tar.gz opensim-SC-508048f3c489da90b6fe446710c0bac1d6dfaa25.tar.bz2 opensim-SC-508048f3c489da90b6fe446710c0bac1d6dfaa25.tar.xz

diff --git a/prebuild.xml b/prebuild.xml index bc1165e..92fa34b 100644 --- a/prebuild.xml +++ b/prebuild.xml
@@ -1151,73 +1151,72 @@
1151	</Files>	1151	</Files>
1152	</Project>	1152	</Project>
1153		1153
1154	<Project name="OpenSim.Region.ScriptEngine.RemoteServer" path="OpenSim/Region/ScriptEngine/RemoteServer" type="Library">	1154
		1155
		1156
		1157	<Project name="OpenSim.Grid.ScriptServer" path="OpenSim/Grid/ScriptServer" type="Exe">
1155	<Configuration name="Debug">	1158	<Configuration name="Debug">
1156	<Options>	1159	<Options>
1157	<OutputPath>../../../../bin/ScriptEngines/</OutputPath>	1160	<OutputPath>../../../bin/</OutputPath>
1158	</Options>	1161	</Options>
1159	</Configuration>	1162	</Configuration>
1160	<Configuration name="Release">	1163	<Configuration name="Release">
1161	<Options>	1164	<Options>
1162	<OutputPath>../../../../bin/ScriptEngines/</OutputPath>	1165	<OutputPath>../../../bin/</OutputPath>
1163	</Options>	1166	</Options>
1164	</Configuration>	1167	</Configuration>
1165		1168
1166	<ReferencePath>../../../../bin/</ReferencePath>	1169	<ReferencePath>../../../bin/</ReferencePath>
1167	<ReferencePath>../../../../bin/ScriptEngines/</ReferencePath>
1168	<Reference name="System" localCopy="false"/>	1170	<Reference name="System" localCopy="false"/>
1169	<Reference name="System.Data" localCopy="false"/>	1171	<Reference name="System.Data" localCopy="false"/>
1170	<Reference name="System.Xml" localCopy="false"/>
1171	<Reference name="System.Runtime.Remoting" localCopy="false"/>	1172	<Reference name="System.Runtime.Remoting" localCopy="false"/>
1172	<Reference name="OpenSim.Region.Environment" />	1173	<Reference name="System.Xml" localCopy="false"/>
1173	<Reference name="libsecondlife.dll"/>	1174	<Reference name="OpenSim"/>
1174	<Reference name="RAIL.dll"/>
1175	<Reference name="OpenSim.Framework"/>	1175	<Reference name="OpenSim.Framework"/>
1176	<Reference name="OpenSim.Framework.Console"/>	1176	<Reference name="OpenSim.Framework.Console"/>
		1177	<Reference name="OpenSim.Framework.Servers"/>
		1178	<Reference name="OpenSim.Framework.Data"/>
		1179	<Reference name="OpenSim.Region.Environment"/>
		1180	<Reference name="../../../bin/ScriptEngines/OpenSim.Region.ScriptEngine.DotNetEngine"/>
1177	<Reference name="OpenSim.Region.ScriptEngine.Common"/>	1181	<Reference name="OpenSim.Region.ScriptEngine.Common"/>
1178	<Reference name="OpenSim.Region.Terrain.BasicTerrain"/>	1182	<Reference name="libsecondlife.dll"/>
1179	<Reference name="OpenSim.Grid.ScriptServer"/>
1180	<Reference name="OpenSim.Region.ScriptEngine"/>
1181	<Reference name="OpenSim.Region.ScriptEngine.DotNetEngine"/>
1182	<Reference name="Axiom.MathLib.dll" localCopy="false"/>	1183	<Reference name="Axiom.MathLib.dll" localCopy="false"/>
1183	<Reference name="Nini.dll" />	1184	<Reference name="XMLRPC.dll"/>
		1185
1184	<Files>	1186	<Files>
1185	<Match pattern="*.cs" recurse="true"/>	1187	<Match pattern="*.cs" recurse="true"/>
1186	</Files>	1188	</Files>
1187	</Project>	1189	</Project>
1188		1190
1189		1191	<Project name="OpenSim.Region.ScriptEngine.RemoteServer" path="OpenSim/Region/ScriptEngine/RemoteServer" type="Library">
1190
1191
1192	<Project name="OpenSim.Grid.ScriptServer" path="OpenSim/Grid/ScriptServer" type="Exe">
1193	<Configuration name="Debug">	1192	<Configuration name="Debug">
1194	<Options>	1193	<Options>
1195	<OutputPath>../../../bin/</OutputPath>	1194	<OutputPath>../../../../bin/ScriptEngines/</OutputPath>
1196	</Options>	1195	</Options>
1197	</Configuration>	1196	</Configuration>
1198	<Configuration name="Release">	1197	<Configuration name="Release">
1199	<Options>	1198	<Options>
1200	<OutputPath>../../../bin/</OutputPath>	1199	<OutputPath>../../../../bin/ScriptEngines/</OutputPath>
1201	</Options>	1200	</Options>
1202	</Configuration>	1201	</Configuration>
1203		1202
1204	<ReferencePath>../../../bin/</ReferencePath>	1203	<ReferencePath>../../../../bin/</ReferencePath>
		1204	<ReferencePath>../../../../bin/ScriptEngines/</ReferencePath>
1205	<Reference name="System" localCopy="false"/>	1205	<Reference name="System" localCopy="false"/>
1206	<Reference name="System.Data" localCopy="false"/>	1206	<Reference name="System.Data" localCopy="false"/>
1207	<Reference name="System.Runtime.Remoting" localCopy="false"/>
1208	<Reference name="System.Xml" localCopy="false"/>	1207	<Reference name="System.Xml" localCopy="false"/>
1209	<Reference name="OpenSim"/>	1208	<Reference name="System.Runtime.Remoting" localCopy="false"/>
		1209	<Reference name="OpenSim.Region.Environment" />
		1210	<Reference name="libsecondlife.dll"/>
		1211	<Reference name="RAIL.dll"/>
1210	<Reference name="OpenSim.Framework"/>	1212	<Reference name="OpenSim.Framework"/>
1211	<Reference name="OpenSim.Framework.Console"/>	1213	<Reference name="OpenSim.Framework.Console"/>
1212	<Reference name="OpenSim.Framework.Servers"/>
1213	<Reference name="OpenSim.Framework.Data"/>
1214	<Reference name="OpenSim.Region.Environment"/>
1215	<Reference name="OpenSim.Region.ScriptEngine.DotNetEngine"/>
1216	<Reference name="OpenSim.Region.ScriptEngine.Common"/>	1214	<Reference name="OpenSim.Region.ScriptEngine.Common"/>
1217	<Reference name="libsecondlife.dll"/>	1215	<Reference name="OpenSim.Region.Terrain.BasicTerrain"/>
		1216	<Reference name="OpenSim.Grid.ScriptServer"/>
		1217	<Reference name="../../../../bin/ScriptEngines/OpenSim.Region.ScriptEngine.DotNetEngine"/>
1218	<Reference name="Axiom.MathLib.dll" localCopy="false"/>	1218	<Reference name="Axiom.MathLib.dll" localCopy="false"/>
1219	<Reference name="XMLRPC.dll"/>	1219	<Reference name="Nini.dll" />
1220
1221	<Files>	1220	<Files>
1222	<Match pattern="*.cs" recurse="true"/>	1221	<Match pattern="*.cs" recurse="true"/>
1223	</Files>	1222	</Files>