Finished initial sim<>Grid login (kinda)

Can login but no config data sent/updated yet
0.1-prestable
gareth 2007-04-03 20:39:28 +00:00
parent c43d6cf0e5
commit 5e81e7ed9d
28 changed files with 1165 additions and 1145 deletions

View File

@ -1,46 +1,46 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<project name="OpenGrid.Config.GridConfigDb4o" default="build"> <project name="OpenGrid.Config.GridConfigDb4o" default="build">
<target name="build"> <target name="build">
<echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
<mkdir dir="${project::get-base-directory()}/${build.dir}" /> <mkdir dir="${project::get-base-directory()}/${build.dir}" />
<copy todir="${project::get-base-directory()}/${build.dir}"> <copy todir="${project::get-base-directory()}/${build.dir}">
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenGrid.Config.GridConfigDb4o" dynamicprefix="true" > <resources prefix="OpenGrid.Config.GridConfigDb4o" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="AssemblyInfo.cs" /> <include name="AssemblyInfo.cs" />
<include name="DbGridConfig.cs" /> <include name="DbGridConfig.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">
<lib> <lib>
<include name="${project::get-base-directory()}" /> <include name="${project::get-base-directory()}" />
<include name="${project::get-base-directory()}/${build.dir}" /> <include name="${project::get-base-directory()}/${build.dir}" />
</lib> </lib>
<include name="System.dll" /> <include name="System.dll" />
<include name="System.Data.dll.dll" /> <include name="System.Data.dll.dll" />
<include name="System.Xml.dll" /> <include name="System.Xml.dll" />
<include name="../../bin/libsecondlife.dll" /> <include name="../../bin/libsecondlife.dll" />
<include name="../../bin/Db4objects.Db4o.dll" /> <include name="../../bin/Db4objects.Db4o.dll" />
<include name="../../bin/OpenSim.Framework.dll" /> <include name="../../bin/OpenSim.Framework.dll" />
<include name="../../bin/OpenSim.Framework.Console.dll" /> <include name="../../bin/OpenSim.Framework.Console.dll" />
</references> </references>
</csc> </csc>
<echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
<mkdir dir="${project::get-base-directory()}/../../bin/"/> <mkdir dir="${project::get-base-directory()}/../../bin/"/>
<copy todir="${project::get-base-directory()}/../../bin/"> <copy todir="${project::get-base-directory()}/../../bin/">
<fileset basedir="${project::get-base-directory()}/${build.dir}/" > <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
<include name="*.dll"/> <include name="*.dll"/>
<include name="*.exe"/> <include name="*.exe"/>
</fileset> </fileset>
</copy> </copy>
</target> </target>
<target name="clean"> <target name="clean">
<delete dir="${bin.dir}" failonerror="false" /> <delete dir="${bin.dir}" failonerror="false" />
<delete dir="${obj.dir}" failonerror="false" /> <delete dir="${obj.dir}" failonerror="false" />
</target> </target>
<target name="doc" description="Creates documentation."> <target name="doc" description="Creates documentation.">
</target> </target>
</project> </project>

View File

@ -114,7 +114,6 @@ namespace OpenGridServices.GridServer
SimNeighboursData.Add(NeighbourBlock); SimNeighboursData.Add(NeighbourBlock);
} }
} }
SimLoginRespData["region_locx"]=TheSim.RegionLocX.ToString(); SimLoginRespData["region_locx"]=TheSim.RegionLocX.ToString();
SimLoginRespData["region_locy"]=TheSim.RegionLocY.ToString(); SimLoginRespData["region_locy"]=TheSim.RegionLocY.ToString();

View File

@ -1,48 +1,48 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<project name="OpenGridServices.GridServer" default="build"> <project name="OpenGridServices.GridServer" default="build">
<target name="build"> <target name="build">
<echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
<mkdir dir="${project::get-base-directory()}/${build.dir}" /> <mkdir dir="${project::get-base-directory()}/${build.dir}" />
<copy todir="${project::get-base-directory()}/${build.dir}"> <copy todir="${project::get-base-directory()}/${build.dir}">
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
<resources prefix="OpenGridServices.GridServer" dynamicprefix="true" > <resources prefix="OpenGridServices.GridServer" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="GridHttp.cs" /> <include name="GridHttp.cs" />
<include name="Main.cs" /> <include name="Main.cs" />
<include name="SimProfiles.cs" /> <include name="SimProfiles.cs" />
<include name="Properties/AssemblyInfo.cs" /> <include name="Properties/AssemblyInfo.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">
<lib> <lib>
<include name="${project::get-base-directory()}" /> <include name="${project::get-base-directory()}" />
<include name="${project::get-base-directory()}/${build.dir}" /> <include name="${project::get-base-directory()}/${build.dir}" />
</lib> </lib>
<include name="System.dll" /> <include name="System.dll" />
<include name="System.Data.dll" /> <include name="System.Data.dll" />
<include name="System.Xml.dll" /> <include name="System.Xml.dll" />
<include name="../bin/OpenSim.Framework.dll" /> <include name="../bin/OpenSim.Framework.dll" />
<include name="../bin/OpenSim.Framework.Console.dll" /> <include name="../bin/OpenSim.Framework.Console.dll" />
<include name="../bin/libsecondlife.dll" /> <include name="../bin/libsecondlife.dll" />
<include name="../bin/Db4objects.Db4o.dll" /> <include name="../bin/Db4objects.Db4o.dll" />
</references> </references>
</csc> </csc>
<echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
<mkdir dir="${project::get-base-directory()}/../bin/"/> <mkdir dir="${project::get-base-directory()}/../bin/"/>
<copy todir="${project::get-base-directory()}/../bin/"> <copy todir="${project::get-base-directory()}/../bin/">
<fileset basedir="${project::get-base-directory()}/${build.dir}/" > <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
<include name="*.dll"/> <include name="*.dll"/>
<include name="*.exe"/> <include name="*.exe"/>
</fileset> </fileset>
</copy> </copy>
</target> </target>
<target name="clean"> <target name="clean">
<delete dir="${bin.dir}" failonerror="false" /> <delete dir="${bin.dir}" failonerror="false" />
<delete dir="${obj.dir}" failonerror="false" /> <delete dir="${obj.dir}" failonerror="false" />
</target> </target>
<target name="doc" description="Creates documentation."> <target name="doc" description="Creates documentation.">
</target> </target>
</project> </project>

View File

@ -1,47 +1,47 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<project name="OpenGridServices.UserServer" default="build"> <project name="OpenGridServices.UserServer" default="build">
<target name="build"> <target name="build">
<echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
<mkdir dir="${project::get-base-directory()}/${build.dir}" /> <mkdir dir="${project::get-base-directory()}/${build.dir}" />
<copy todir="${project::get-base-directory()}/${build.dir}"> <copy todir="${project::get-base-directory()}/${build.dir}">
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
<resources prefix="OpenGridServices.UserServer" dynamicprefix="true" > <resources prefix="OpenGridServices.UserServer" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="Main.cs" /> <include name="Main.cs" />
<include name="UserHttp.cs" /> <include name="UserHttp.cs" />
<include name="Properties/AssemblyInfo.cs" /> <include name="Properties/AssemblyInfo.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">
<lib> <lib>
<include name="${project::get-base-directory()}" /> <include name="${project::get-base-directory()}" />
<include name="${project::get-base-directory()}/${build.dir}" /> <include name="${project::get-base-directory()}/${build.dir}" />
</lib> </lib>
<include name="System.dll" /> <include name="System.dll" />
<include name="System.Data.dll" /> <include name="System.Data.dll" />
<include name="System.Xml.dll" /> <include name="System.Xml.dll" />
<include name="../bin/OpenSim.Framework.dll" /> <include name="../bin/OpenSim.Framework.dll" />
<include name="../bin/OpenSim.Framework.Console.dll" /> <include name="../bin/OpenSim.Framework.Console.dll" />
<include name="../bin/libsecondlife.dll" /> <include name="../bin/libsecondlife.dll" />
<include name="../bin/Db4objects.Db4o.dll" /> <include name="../bin/Db4objects.Db4o.dll" />
</references> </references>
</csc> </csc>
<echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
<mkdir dir="${project::get-base-directory()}/../bin/"/> <mkdir dir="${project::get-base-directory()}/../bin/"/>
<copy todir="${project::get-base-directory()}/../bin/"> <copy todir="${project::get-base-directory()}/../bin/">
<fileset basedir="${project::get-base-directory()}/${build.dir}/" > <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
<include name="*.dll"/> <include name="*.dll"/>
<include name="*.exe"/> <include name="*.exe"/>
</fileset> </fileset>
</copy> </copy>
</target> </target>
<target name="clean"> <target name="clean">
<delete dir="${bin.dir}" failonerror="false" /> <delete dir="${bin.dir}" failonerror="false" />
<delete dir="${obj.dir}" failonerror="false" /> <delete dir="${obj.dir}" failonerror="false" />
</target> </target>
<target name="doc" description="Creates documentation."> <target name="doc" description="Creates documentation.">
</target> </target>
</project> </project>

View File

@ -1,46 +1,46 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<project name="OpenSim.Config.SimConfigDb4o" default="build"> <project name="OpenSim.Config.SimConfigDb4o" default="build">
<target name="build"> <target name="build">
<echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
<mkdir dir="${project::get-base-directory()}/${build.dir}" /> <mkdir dir="${project::get-base-directory()}/${build.dir}" />
<copy todir="${project::get-base-directory()}/${build.dir}"> <copy todir="${project::get-base-directory()}/${build.dir}">
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenSim.Config.SimConfigDb4o" dynamicprefix="true" > <resources prefix="OpenSim.Config.SimConfigDb4o" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="AssemblyInfo.cs" /> <include name="AssemblyInfo.cs" />
<include name="DbSimConfig.cs" /> <include name="DbSimConfig.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">
<lib> <lib>
<include name="${project::get-base-directory()}" /> <include name="${project::get-base-directory()}" />
<include name="${project::get-base-directory()}/${build.dir}" /> <include name="${project::get-base-directory()}/${build.dir}" />
</lib> </lib>
<include name="System.dll" /> <include name="System.dll" />
<include name="System.Data.dll.dll" /> <include name="System.Data.dll.dll" />
<include name="System.Xml.dll" /> <include name="System.Xml.dll" />
<include name="../../bin/libsecondlife.dll" /> <include name="../../bin/libsecondlife.dll" />
<include name="../../bin/Db4objects.Db4o.dll" /> <include name="../../bin/Db4objects.Db4o.dll" />
<include name="../../bin/OpenSim.Framework.dll" /> <include name="../../bin/OpenSim.Framework.dll" />
<include name="../../bin/OpenSim.Framework.Console.dll" /> <include name="../../bin/OpenSim.Framework.Console.dll" />
</references> </references>
</csc> </csc>
<echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
<mkdir dir="${project::get-base-directory()}/../../bin/"/> <mkdir dir="${project::get-base-directory()}/../../bin/"/>
<copy todir="${project::get-base-directory()}/../../bin/"> <copy todir="${project::get-base-directory()}/../../bin/">
<fileset basedir="${project::get-base-directory()}/${build.dir}/" > <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
<include name="*.dll"/> <include name="*.dll"/>
<include name="*.exe"/> <include name="*.exe"/>
</fileset> </fileset>
</copy> </copy>
</target> </target>
<target name="clean"> <target name="clean">
<delete dir="${bin.dir}" failonerror="false" /> <delete dir="${bin.dir}" failonerror="false" />
<delete dir="${obj.dir}" failonerror="false" /> <delete dir="${obj.dir}" failonerror="false" />
</target> </target>
<target name="doc" description="Creates documentation."> <target name="doc" description="Creates documentation.">
</target> </target>
</project> </project>

View File

@ -1,42 +1,42 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<project name="OpenSim.Framework.Console" default="build"> <project name="OpenSim.Framework.Console" default="build">
<target name="build"> <target name="build">
<echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
<mkdir dir="${project::get-base-directory()}/${build.dir}" /> <mkdir dir="${project::get-base-directory()}/${build.dir}" />
<copy todir="${project::get-base-directory()}/${build.dir}"> <copy todir="${project::get-base-directory()}/${build.dir}">
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenSim.Framework.Console" dynamicprefix="true" > <resources prefix="OpenSim.Framework.Console" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="AssemblyInfo.cs" /> <include name="AssemblyInfo.cs" />
<include name="ConsoleBase.cs" /> <include name="ConsoleBase.cs" />
<include name="ConsoleCallbacksBase.cs" /> <include name="ConsoleCallbacksBase.cs" />
<include name="MainConsole.cs" /> <include name="MainConsole.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">
<lib> <lib>
<include name="${project::get-base-directory()}" /> <include name="${project::get-base-directory()}" />
<include name="${project::get-base-directory()}/${build.dir}" /> <include name="${project::get-base-directory()}/${build.dir}" />
</lib> </lib>
<include name="System.dll" /> <include name="System.dll" />
</references> </references>
</csc> </csc>
<echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
<mkdir dir="${project::get-base-directory()}/../bin/"/> <mkdir dir="${project::get-base-directory()}/../bin/"/>
<copy todir="${project::get-base-directory()}/../bin/"> <copy todir="${project::get-base-directory()}/../bin/">
<fileset basedir="${project::get-base-directory()}/${build.dir}/" > <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
<include name="*.dll"/> <include name="*.dll"/>
<include name="*.exe"/> <include name="*.exe"/>
</fileset> </fileset>
</copy> </copy>
</target> </target>
<target name="clean"> <target name="clean">
<delete dir="${bin.dir}" failonerror="false" /> <delete dir="${bin.dir}" failonerror="false" />
<delete dir="${obj.dir}" failonerror="false" /> <delete dir="${obj.dir}" failonerror="false" />
</target> </target>
<target name="doc" description="Creates documentation."> <target name="doc" description="Creates documentation.">
</target> </target>
</project> </project>

View File

@ -48,7 +48,7 @@ namespace OpenSim.Framework.Interfaces
AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
string GetName(); string GetName();
bool RequestConnection(); bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port);
void SetServerInfo(string ServerUrl, string SendKey, string RecvKey); void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);
void Close(); void Close();
} }

View File

@ -12,7 +12,7 @@ namespace OpenSim.Framework.Interfaces
public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
public abstract string GetName(); public abstract string GetName();
public abstract bool RequestConnection(); public abstract bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port);
public abstract void SetServerInfo(string ServerUrl, string SendKey, string RecvKey); public abstract void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);
public abstract void AddNewSession(Login session); public abstract void AddNewSession(Login session);
public abstract void Close(); public abstract void Close();

View File

@ -1,67 +1,67 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<project name="OpenSim.Framework" default="build"> <project name="OpenSim.Framework" default="build">
<target name="build"> <target name="build">
<echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
<mkdir dir="${project::get-base-directory()}/${build.dir}" /> <mkdir dir="${project::get-base-directory()}/${build.dir}" />
<copy todir="${project::get-base-directory()}/${build.dir}"> <copy todir="${project::get-base-directory()}/${build.dir}">
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenSim.Framework" dynamicprefix="true" > <resources prefix="OpenSim.Framework" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="AgentCiruitData.cs" /> <include name="AgentCiruitData.cs" />
<include name="AgentInventory.cs" /> <include name="AgentInventory.cs" />
<include name="AssetBase.cs" /> <include name="AssetBase.cs" />
<include name="BlockingQueue.cs" /> <include name="BlockingQueue.cs" />
<include name="HeightMapGenHills.cs" /> <include name="HeightMapGenHills.cs" />
<include name="IAssetServer.cs" /> <include name="IAssetServer.cs" />
<include name="IConfig.cs" /> <include name="IConfig.cs" />
<include name="IGenericConfig.cs" /> <include name="IGenericConfig.cs" />
<include name="IGridConfig.cs" /> <include name="IGridConfig.cs" />
<include name="IGridServer.cs" /> <include name="IGridServer.cs" />
<include name="ILocalStorage.cs" /> <include name="ILocalStorage.cs" />
<include name="IUserConfig.cs" /> <include name="IUserConfig.cs" />
<include name="IUserServer.cs" /> <include name="IUserServer.cs" />
<include name="LocalGridBase.cs" /> <include name="LocalGridBase.cs" />
<include name="Login.cs" /> <include name="Login.cs" />
<include name="LoginService.cs" /> <include name="LoginService.cs" />
<include name="NeighbourInfo.cs" /> <include name="NeighbourInfo.cs" />
<include name="PrimData.cs" /> <include name="PrimData.cs" />
<include name="RemoteGridBase.cs" /> <include name="RemoteGridBase.cs" />
<include name="SimProfile.cs" /> <include name="SimProfile.cs" />
<include name="SimProfileBase.cs" /> <include name="SimProfileBase.cs" />
<include name="UserProfile.cs" /> <include name="UserProfile.cs" />
<include name="UserProfileManager.cs" /> <include name="UserProfileManager.cs" />
<include name="UserProfileManagerBase.cs" /> <include name="UserProfileManagerBase.cs" />
<include name="Util.cs" /> <include name="Util.cs" />
<include name="Properties/AssemblyInfo.cs" /> <include name="Properties/AssemblyInfo.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">
<lib> <lib>
<include name="${project::get-base-directory()}" /> <include name="${project::get-base-directory()}" />
<include name="${project::get-base-directory()}/${build.dir}" /> <include name="${project::get-base-directory()}/${build.dir}" />
</lib> </lib>
<include name="System.dll" /> <include name="System.dll" />
<include name="System.Xml.dll" /> <include name="System.Xml.dll" />
<include name="../bin/libsecondlife.dll" /> <include name="../bin/libsecondlife.dll" />
<include name="../bin/Db4objects.Db4o.dll" /> <include name="../bin/Db4objects.Db4o.dll" />
</references> </references>
</csc> </csc>
<echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
<mkdir dir="${project::get-base-directory()}/../bin/"/> <mkdir dir="${project::get-base-directory()}/../bin/"/>
<copy todir="${project::get-base-directory()}/../bin/"> <copy todir="${project::get-base-directory()}/../bin/">
<fileset basedir="${project::get-base-directory()}/${build.dir}/" > <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
<include name="*.dll"/> <include name="*.dll"/>
<include name="*.exe"/> <include name="*.exe"/>
</fileset> </fileset>
</copy> </copy>
</target> </target>
<target name="clean"> <target name="clean">
<delete dir="${bin.dir}" failonerror="false" /> <delete dir="${bin.dir}" failonerror="false" />
<delete dir="${obj.dir}" failonerror="false" /> <delete dir="${obj.dir}" failonerror="false" />
</target> </target>
<target name="doc" description="Creates documentation."> <target name="doc" description="Creates documentation.">
</target> </target>
</project> </project>

View File

@ -18,7 +18,7 @@ namespace OpenSim.Framework.Interfaces
public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
public abstract string GetName(); public abstract string GetName();
public abstract bool RequestConnection(); public abstract bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port);
public abstract void SetServerInfo(string ServerUrl, string SendKey, string RecvKey); public abstract void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);
public abstract void Close(); public abstract void Close();
} }

View File

@ -1,42 +1,42 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<project name="OpenSim.GenericConfig.Xml" default="build"> <project name="OpenSim.GenericConfig.Xml" default="build">
<target name="build"> <target name="build">
<echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
<mkdir dir="${project::get-base-directory()}/${build.dir}" /> <mkdir dir="${project::get-base-directory()}/${build.dir}" />
<copy todir="${project::get-base-directory()}/${build.dir}"> <copy todir="${project::get-base-directory()}/${build.dir}">
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenSim.GenericConfig.Xml" dynamicprefix="true" > <resources prefix="OpenSim.GenericConfig.Xml" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="XmlConfig.cs" /> <include name="XmlConfig.cs" />
<include name="Properties/AssemblyInfo.cs" /> <include name="Properties/AssemblyInfo.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">
<lib> <lib>
<include name="${project::get-base-directory()}" /> <include name="${project::get-base-directory()}" />
<include name="${project::get-base-directory()}/${build.dir}" /> <include name="${project::get-base-directory()}/${build.dir}" />
</lib> </lib>
<include name="System.dll" /> <include name="System.dll" />
<include name="System.Xml.dll" /> <include name="System.Xml.dll" />
<include name="../../bin/OpenSim.Framework.dll" /> <include name="../../bin/OpenSim.Framework.dll" />
</references> </references>
</csc> </csc>
<echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
<mkdir dir="${project::get-base-directory()}/../../bin/"/> <mkdir dir="${project::get-base-directory()}/../../bin/"/>
<copy todir="${project::get-base-directory()}/../../bin/"> <copy todir="${project::get-base-directory()}/../../bin/">
<fileset basedir="${project::get-base-directory()}/${build.dir}/" > <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
<include name="*.dll"/> <include name="*.dll"/>
<include name="*.exe"/> <include name="*.exe"/>
</fileset> </fileset>
</copy> </copy>
</target> </target>
<target name="clean"> <target name="clean">
<delete dir="${bin.dir}" failonerror="false" /> <delete dir="${bin.dir}" failonerror="false" />
<delete dir="${obj.dir}" failonerror="false" /> <delete dir="${obj.dir}" failonerror="false" />
</target> </target>
<target name="doc" description="Creates documentation."> <target name="doc" description="Creates documentation.">
</target> </target>
</project> </project>

View File

@ -63,7 +63,7 @@ namespace OpenSim.GridInterfaces.Local
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Local Grid Server class created"); OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Local Grid Server class created");
} }
public override bool RequestConnection() public override bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port)
{ {
return true; return true;
} }

View File

@ -1,46 +1,46 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<project name="OpenSim.GridInterfaces.Local" default="build"> <project name="OpenSim.GridInterfaces.Local" default="build">
<target name="build"> <target name="build">
<echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
<mkdir dir="${project::get-base-directory()}/${build.dir}" /> <mkdir dir="${project::get-base-directory()}/${build.dir}" />
<copy todir="${project::get-base-directory()}/${build.dir}"> <copy todir="${project::get-base-directory()}/${build.dir}">
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenSim.GridInterfaces.Local" dynamicprefix="true" > <resources prefix="OpenSim.GridInterfaces.Local" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="AssemblyInfo.cs" /> <include name="AssemblyInfo.cs" />
<include name="LocalAssetServer.cs" /> <include name="LocalAssetServer.cs" />
<include name="LocalGridServer.cs" /> <include name="LocalGridServer.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">
<lib> <lib>
<include name="${project::get-base-directory()}" /> <include name="${project::get-base-directory()}" />
<include name="${project::get-base-directory()}/${build.dir}" /> <include name="${project::get-base-directory()}/${build.dir}" />
</lib> </lib>
<include name="System.dll" /> <include name="System.dll" />
<include name="System.Xml.dll" /> <include name="System.Xml.dll" />
<include name="../../bin/Db4objects.Db4o.dll" /> <include name="../../bin/Db4objects.Db4o.dll" />
<include name="../../bin/libsecondlife.dll" /> <include name="../../bin/libsecondlife.dll" />
<include name="../../bin/OpenSim.Framework.dll" /> <include name="../../bin/OpenSim.Framework.dll" />
<include name="../../bin/OpenSim.Framework.Console.dll" /> <include name="../../bin/OpenSim.Framework.Console.dll" />
</references> </references>
</csc> </csc>
<echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
<mkdir dir="${project::get-base-directory()}/../../bin/"/> <mkdir dir="${project::get-base-directory()}/../../bin/"/>
<copy todir="${project::get-base-directory()}/../../bin/"> <copy todir="${project::get-base-directory()}/../../bin/">
<fileset basedir="${project::get-base-directory()}/${build.dir}/" > <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
<include name="*.dll"/> <include name="*.dll"/>
<include name="*.exe"/> <include name="*.exe"/>
</fileset> </fileset>
</copy> </copy>
</target> </target>
<target name="clean"> <target name="clean">
<delete dir="${bin.dir}" failonerror="false" /> <delete dir="${bin.dir}" failonerror="false" />
<delete dir="${obj.dir}" failonerror="false" /> <delete dir="${obj.dir}" failonerror="false" />
</target> </target>
<target name="doc" description="Creates documentation."> <target name="doc" description="Creates documentation.">
</target> </target>
</project> </project>

View File

@ -1,45 +1,45 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<project name="OpenSim.GridInterfaces.Remote" default="build"> <project name="OpenSim.GridInterfaces.Remote" default="build">
<target name="build"> <target name="build">
<echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
<mkdir dir="${project::get-base-directory()}/${build.dir}" /> <mkdir dir="${project::get-base-directory()}/${build.dir}" />
<copy todir="${project::get-base-directory()}/${build.dir}"> <copy todir="${project::get-base-directory()}/${build.dir}">
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenSim.GridInterfaces.Remote" dynamicprefix="true" > <resources prefix="OpenSim.GridInterfaces.Remote" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="AssemblyInfo.cs" /> <include name="AssemblyInfo.cs" />
<include name="RemoteAssetServer.cs" /> <include name="RemoteAssetServer.cs" />
<include name="RemoteGridServer.cs" /> <include name="RemoteGridServer.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">
<lib> <lib>
<include name="${project::get-base-directory()}" /> <include name="${project::get-base-directory()}" />
<include name="${project::get-base-directory()}/${build.dir}" /> <include name="${project::get-base-directory()}/${build.dir}" />
</lib> </lib>
<include name="System.dll" /> <include name="System.dll" />
<include name="System.Xml.dll" /> <include name="System.Xml.dll" />
<include name="../../bin/libsecondlife.dll" /> <include name="../../bin/libsecondlife.dll" />
<include name="../../bin/OpenSim.Framework.dll" /> <include name="../../bin/OpenSim.Framework.dll" />
<include name="../../bin/OpenSim.Framework.Console.dll" /> <include name="../../bin/OpenSim.Framework.Console.dll" />
</references> </references>
</csc> </csc>
<echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
<mkdir dir="${project::get-base-directory()}/../../bin/"/> <mkdir dir="${project::get-base-directory()}/../../bin/"/>
<copy todir="${project::get-base-directory()}/../../bin/"> <copy todir="${project::get-base-directory()}/../../bin/">
<fileset basedir="${project::get-base-directory()}/${build.dir}/" > <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
<include name="*.dll"/> <include name="*.dll"/>
<include name="*.exe"/> <include name="*.exe"/>
</fileset> </fileset>
</copy> </copy>
</target> </target>
<target name="clean"> <target name="clean">
<delete dir="${bin.dir}" failonerror="false" /> <delete dir="${bin.dir}" failonerror="false" />
<delete dir="${obj.dir}" failonerror="false" /> <delete dir="${obj.dir}" failonerror="false" />
</target> </target>
<target name="doc" description="Creates documentation."> <target name="doc" description="Creates documentation.">
</target> </target>
</project> </project>

View File

@ -25,12 +25,14 @@
* *
*/ */
using System; using System;
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading; using System.Threading;
using System.Net; using System.Net;
using System.Net.Sockets; using System.Net.Sockets;
using System.IO; using System.IO;
using libsecondlife; using libsecondlife;
using Nwc.XmlRpc;
using OpenSim.Framework.Interfaces; using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Assets; using OpenSim.Framework.Assets;
@ -54,10 +56,28 @@ namespace OpenSim.GridInterfaces.Remote
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Remote Grid Server class created"); OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Remote Grid Server class created");
} }
public override bool RequestConnection() public override bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port)
{ {
return true; Hashtable GridParams = new Hashtable();
} GridParams["authkey"]=GridSendKey;
GridParams["UUID"]=SimUUID.ToString();
GridParams["sim_ip"]=sim_ip;
GridParams["sim_port"]=sim_port.ToString();
ArrayList SendParams = new ArrayList();
SendParams.Add(GridParams);
XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);
XmlRpcResponse GridResp = GridReq.Send(this.GridServerUrl, 3000);
Hashtable GridRespData = (Hashtable)GridResp.Value;
if(GridRespData.ContainsKey("error")) {
string errorstring = (string)GridRespData["error"];
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Error connecting to grid:");
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(errorstring);
return false;
}
return true;
}
public override AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitcode) public override AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitcode)
{ {
@ -82,7 +102,7 @@ namespace OpenSim.GridInterfaces.Remote
user.LoginInfo.Agent = agentID; user.LoginInfo.Agent = agentID;
user.LoginInfo.Session = sessionID; user.LoginInfo.Session = sessionID;
user.LoginInfo.SecureSession = validcircuit.SecureSessionID; user.LoginInfo.SecureSession = validcircuit.SecureSessionID;
user.LoginInfo.First = validcircuit.firstname; user.LoginInfo.First = validcircuit.firstname;
user.LoginInfo.Last = validcircuit.lastname; user.LoginInfo.Last = validcircuit.lastname;
} }
else else

View File

@ -1,42 +1,42 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<project name="OpenSim.Physics.BasicPhysicsPlugin" default="build"> <project name="OpenSim.Physics.BasicPhysicsPlugin" default="build">
<target name="build"> <target name="build">
<echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
<mkdir dir="${project::get-base-directory()}/${build.dir}" /> <mkdir dir="${project::get-base-directory()}/${build.dir}" />
<copy todir="${project::get-base-directory()}/${build.dir}"> <copy todir="${project::get-base-directory()}/${build.dir}">
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenSim.Physics.BasicPhysicsPlugin" dynamicprefix="true" > <resources prefix="OpenSim.Physics.BasicPhysicsPlugin" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="AssemblyInfo.cs" /> <include name="AssemblyInfo.cs" />
<include name="BasicPhysicsPlugin.cs" /> <include name="BasicPhysicsPlugin.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">
<lib> <lib>
<include name="${project::get-base-directory()}" /> <include name="${project::get-base-directory()}" />
<include name="${project::get-base-directory()}/${build.dir}" /> <include name="${project::get-base-directory()}/${build.dir}" />
</lib> </lib>
<include name="System.dll" /> <include name="System.dll" />
<include name="../../bin/Axiom.MathLib.dll" /> <include name="../../bin/Axiom.MathLib.dll" />
<include name="../../bin/OpenSim.Physics.Manager.dll" /> <include name="../../bin/OpenSim.Physics.Manager.dll" />
</references> </references>
</csc> </csc>
<echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" /> <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" />
<mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/> <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/>
<copy todir="${project::get-base-directory()}/../../bin/Physics/"> <copy todir="${project::get-base-directory()}/../../bin/Physics/">
<fileset basedir="${project::get-base-directory()}/${build.dir}/" > <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
<include name="*.dll"/> <include name="*.dll"/>
<include name="*.exe"/> <include name="*.exe"/>
</fileset> </fileset>
</copy> </copy>
</target> </target>
<target name="clean"> <target name="clean">
<delete dir="${bin.dir}" failonerror="false" /> <delete dir="${bin.dir}" failonerror="false" />
<delete dir="${obj.dir}" failonerror="false" /> <delete dir="${obj.dir}" failonerror="false" />
</target> </target>
<target name="doc" description="Creates documentation."> <target name="doc" description="Creates documentation.">
</target> </target>
</project> </project>

View File

@ -1,47 +1,47 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<project name="OpenSim.Physics.Manager" default="build"> <project name="OpenSim.Physics.Manager" default="build">
<target name="build"> <target name="build">
<echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
<mkdir dir="${project::get-base-directory()}/${build.dir}" /> <mkdir dir="${project::get-base-directory()}/${build.dir}" />
<copy todir="${project::get-base-directory()}/${build.dir}"> <copy todir="${project::get-base-directory()}/${build.dir}">
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenSim.Physics.Manager" dynamicprefix="true" > <resources prefix="OpenSim.Physics.Manager" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="AssemblyInfo.cs" /> <include name="AssemblyInfo.cs" />
<include name="PhysicsActor.cs" /> <include name="PhysicsActor.cs" />
<include name="PhysicsManager.cs" /> <include name="PhysicsManager.cs" />
<include name="PhysicsScene.cs" /> <include name="PhysicsScene.cs" />
<include name="PhysicsVector.cs" /> <include name="PhysicsVector.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">
<lib> <lib>
<include name="${project::get-base-directory()}" /> <include name="${project::get-base-directory()}" />
<include name="${project::get-base-directory()}/${build.dir}" /> <include name="${project::get-base-directory()}/${build.dir}" />
</lib> </lib>
<include name="System.dll" /> <include name="System.dll" />
<include name="System.Xml.dll" /> <include name="System.Xml.dll" />
<include name="../../bin/Axiom.MathLib.dll" /> <include name="../../bin/Axiom.MathLib.dll" />
<include name="../../bin/OpenSim.Framework.dll" /> <include name="../../bin/OpenSim.Framework.dll" />
<include name="../../bin/OpenSim.Framework.Console.dll" /> <include name="../../bin/OpenSim.Framework.Console.dll" />
</references> </references>
</csc> </csc>
<echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
<mkdir dir="${project::get-base-directory()}/../../bin/"/> <mkdir dir="${project::get-base-directory()}/../../bin/"/>
<copy todir="${project::get-base-directory()}/../../bin/"> <copy todir="${project::get-base-directory()}/../../bin/">
<fileset basedir="${project::get-base-directory()}/${build.dir}/" > <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
<include name="*.dll"/> <include name="*.dll"/>
<include name="*.exe"/> <include name="*.exe"/>
</fileset> </fileset>
</copy> </copy>
</target> </target>
<target name="clean"> <target name="clean">
<delete dir="${bin.dir}" failonerror="false" /> <delete dir="${bin.dir}" failonerror="false" />
<delete dir="${obj.dir}" failonerror="false" /> <delete dir="${obj.dir}" failonerror="false" />
</target> </target>
<target name="doc" description="Creates documentation."> <target name="doc" description="Creates documentation.">
</target> </target>
</project> </project>

View File

@ -1,43 +1,43 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<project name="OpenSim.Physics.OdePlugin" default="build"> <project name="OpenSim.Physics.OdePlugin" default="build">
<target name="build"> <target name="build">
<echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
<mkdir dir="${project::get-base-directory()}/${build.dir}" /> <mkdir dir="${project::get-base-directory()}/${build.dir}" />
<copy todir="${project::get-base-directory()}/${build.dir}"> <copy todir="${project::get-base-directory()}/${build.dir}">
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenSim.Physics.OdePlugin" dynamicprefix="true" > <resources prefix="OpenSim.Physics.OdePlugin" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="AssemblyInfo.cs" /> <include name="AssemblyInfo.cs" />
<include name="OdePlugin.cs" /> <include name="OdePlugin.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">
<lib> <lib>
<include name="${project::get-base-directory()}" /> <include name="${project::get-base-directory()}" />
<include name="${project::get-base-directory()}/${build.dir}" /> <include name="${project::get-base-directory()}/${build.dir}" />
</lib> </lib>
<include name="System.dll" /> <include name="System.dll" />
<include name="../../bin/Axiom.MathLib.dll" /> <include name="../../bin/Axiom.MathLib.dll" />
<include name="../../bin/OpenSim.Physics.Manager.dll" /> <include name="../../bin/OpenSim.Physics.Manager.dll" />
<include name="../../bin/Ode.NET.dll" /> <include name="../../bin/Ode.NET.dll" />
</references> </references>
</csc> </csc>
<echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" /> <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" />
<mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/> <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/>
<copy todir="${project::get-base-directory()}/../../bin/Physics/"> <copy todir="${project::get-base-directory()}/../../bin/Physics/">
<fileset basedir="${project::get-base-directory()}/${build.dir}/" > <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
<include name="*.dll"/> <include name="*.dll"/>
<include name="*.exe"/> <include name="*.exe"/>
</fileset> </fileset>
</copy> </copy>
</target> </target>
<target name="clean"> <target name="clean">
<delete dir="${bin.dir}" failonerror="false" /> <delete dir="${bin.dir}" failonerror="false" />
<delete dir="${obj.dir}" failonerror="false" /> <delete dir="${obj.dir}" failonerror="false" />
</target> </target>
<target name="doc" description="Creates documentation."> <target name="doc" description="Creates documentation.">
</target> </target>
</project> </project>

View File

@ -1,43 +1,43 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<project name="OpenSim.Physics.PhysXPlugin" default="build"> <project name="OpenSim.Physics.PhysXPlugin" default="build">
<target name="build"> <target name="build">
<echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
<mkdir dir="${project::get-base-directory()}/${build.dir}" /> <mkdir dir="${project::get-base-directory()}/${build.dir}" />
<copy todir="${project::get-base-directory()}/${build.dir}"> <copy todir="${project::get-base-directory()}/${build.dir}">
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenSim.Physics.PhysXPlugin" dynamicprefix="true" > <resources prefix="OpenSim.Physics.PhysXPlugin" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="AssemblyInfo.cs" /> <include name="AssemblyInfo.cs" />
<include name="PhysXPlugin.cs" /> <include name="PhysXPlugin.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">
<lib> <lib>
<include name="${project::get-base-directory()}" /> <include name="${project::get-base-directory()}" />
<include name="${project::get-base-directory()}/${build.dir}" /> <include name="${project::get-base-directory()}/${build.dir}" />
</lib> </lib>
<include name="System.dll" /> <include name="System.dll" />
<include name="../../bin/Axiom.MathLib.dll" /> <include name="../../bin/Axiom.MathLib.dll" />
<include name="../../bin/PhysX_Wrapper_Dotnet.dll" /> <include name="../../bin/PhysX_Wrapper_Dotnet.dll" />
<include name="../../bin/OpenSim.Physics.Manager.dll" /> <include name="../../bin/OpenSim.Physics.Manager.dll" />
</references> </references>
</csc> </csc>
<echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" /> <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" />
<mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/> <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/>
<copy todir="${project::get-base-directory()}/../../bin/Physics/"> <copy todir="${project::get-base-directory()}/../../bin/Physics/">
<fileset basedir="${project::get-base-directory()}/${build.dir}/" > <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
<include name="*.dll"/> <include name="*.dll"/>
<include name="*.exe"/> <include name="*.exe"/>
</fileset> </fileset>
</copy> </copy>
</target> </target>
<target name="clean"> <target name="clean">
<delete dir="${bin.dir}" failonerror="false" /> <delete dir="${bin.dir}" failonerror="false" />
<delete dir="${obj.dir}" failonerror="false" /> <delete dir="${obj.dir}" failonerror="false" />
</target> </target>
<target name="doc" description="Creates documentation."> <target name="doc" description="Creates documentation.">
</target> </target>
</project> </project>

View File

@ -1,77 +1,77 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<project name="OpenSim.RegionServer" default="build"> <project name="OpenSim.RegionServer" default="build">
<target name="build"> <target name="build">
<echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
<mkdir dir="${project::get-base-directory()}/${build.dir}" /> <mkdir dir="${project::get-base-directory()}/${build.dir}" />
<copy todir="${project::get-base-directory()}/${build.dir}"> <copy todir="${project::get-base-directory()}/${build.dir}">
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenSim.RegionServer" dynamicprefix="true" > <resources prefix="OpenSim.RegionServer" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="AgentAssetUpload.cs" /> <include name="AgentAssetUpload.cs" />
<include name="ConsoleCmds.cs" /> <include name="ConsoleCmds.cs" />
<include name="Grid.cs" /> <include name="Grid.cs" />
<include name="OpenSimMain.cs" /> <include name="OpenSimMain.cs" />
<include name="OpenSimNetworkHandler.cs" /> <include name="OpenSimNetworkHandler.cs" />
<include name="PacketServer.cs" /> <include name="PacketServer.cs" />
<include name="QueItem.cs" /> <include name="QueItem.cs" />
<include name="RegionInfo.cs" /> <include name="RegionInfo.cs" />
<include name="SimClient.cs" /> <include name="SimClient.cs" />
<include name="SimConsole.cs" /> <include name="SimConsole.cs" />
<include name="VersionInfo.cs" /> <include name="VersionInfo.cs" />
<include name="Assets/AssetCache.cs" /> <include name="Assets/AssetCache.cs" />
<include name="Assets/InventoryCache.cs" /> <include name="Assets/InventoryCache.cs" />
<include name="CAPS/AdminWebFront.cs" /> <include name="CAPS/AdminWebFront.cs" />
<include name="types/Mesh.cs" /> <include name="types/Mesh.cs" />
<include name="types/Triangle.cs" /> <include name="types/Triangle.cs" />
<include name="world/Avatar.cs" /> <include name="world/Avatar.cs" />
<include name="world/AvatarAnimations.cs" /> <include name="world/AvatarAnimations.cs" />
<include name="world/Entity.cs" /> <include name="world/Entity.cs" />
<include name="world/Primitive.cs" /> <include name="world/Primitive.cs" />
<include name="world/ScriptEngine.cs" /> <include name="world/ScriptEngine.cs" />
<include name="world/SurfacePatch.cs" /> <include name="world/SurfacePatch.cs" />
<include name="world/World.cs" /> <include name="world/World.cs" />
<include name="world/scripting/IScript.cs" /> <include name="world/scripting/IScript.cs" />
<include name="world/scripting/IScriptContext.cs" /> <include name="world/scripting/IScriptContext.cs" />
<include name="world/scripting/IScriptEntity.cs" /> <include name="world/scripting/IScriptEntity.cs" />
<include name="world/scripting/IScriptHandler.cs" /> <include name="world/scripting/IScriptHandler.cs" />
<include name="world/scripting/Script.cs" /> <include name="world/scripting/Script.cs" />
<include name="world/scripting/ScriptFactory.cs" /> <include name="world/scripting/ScriptFactory.cs" />
<include name="world/scripting/Scripts/FollowRandomAvatar.cs" /> <include name="world/scripting/Scripts/FollowRandomAvatar.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">
<lib> <lib>
<include name="${project::get-base-directory()}" /> <include name="${project::get-base-directory()}" />
<include name="${project::get-base-directory()}/${build.dir}" /> <include name="${project::get-base-directory()}/${build.dir}" />
</lib> </lib>
<include name="System.dll" /> <include name="System.dll" />
<include name="System.Xml.dll" /> <include name="System.Xml.dll" />
<include name="../bin/libsecondlife.dll" /> <include name="../bin/libsecondlife.dll" />
<include name="../bin/Axiom.MathLib.dll" /> <include name="../bin/Axiom.MathLib.dll" />
<include name="../bin/Db4objects.Db4o.dll" /> <include name="../bin/Db4objects.Db4o.dll" />
<include name="../bin/OpenSim.Framework.dll" /> <include name="../bin/OpenSim.Framework.dll" />
<include name="../bin/OpenSim.Framework.Console.dll" /> <include name="../bin/OpenSim.Framework.Console.dll" />
<include name="../bin/OpenSim.GenericConfig.Xml.dll" /> <include name="../bin/OpenSim.GenericConfig.Xml.dll" />
<include name="../bin/OpenSim.Physics.Manager.dll" /> <include name="../bin/OpenSim.Physics.Manager.dll" />
<include name="../bin/OpenSim.Servers.dll" /> <include name="../bin/OpenSim.Servers.dll" />
</references> </references>
</csc> </csc>
<echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
<mkdir dir="${project::get-base-directory()}/../bin/"/> <mkdir dir="${project::get-base-directory()}/../bin/"/>
<copy todir="${project::get-base-directory()}/../bin/"> <copy todir="${project::get-base-directory()}/../bin/">
<fileset basedir="${project::get-base-directory()}/${build.dir}/" > <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
<include name="*.dll"/> <include name="*.dll"/>
<include name="*.exe"/> <include name="*.exe"/>
</fileset> </fileset>
</copy> </copy>
</target> </target>
<target name="clean"> <target name="clean">
<delete dir="${bin.dir}" failonerror="false" /> <delete dir="${bin.dir}" failonerror="false" />
<delete dir="${obj.dir}" failonerror="false" /> <delete dir="${obj.dir}" failonerror="false" />
</target> </target>
<target name="doc" description="Creates documentation."> <target name="doc" description="Creates documentation.">
</target> </target>
</project> </project>

View File

@ -54,7 +54,8 @@ namespace OpenSim
public class OpenSimMain : OpenSimNetworkHandler, conscmd_callback public class OpenSimMain : OpenSimNetworkHandler, conscmd_callback
{ {
//private SimConfig Cfg;
//private SimConfig Cfg;
private IGenericConfig localConfig; private IGenericConfig localConfig;
//private IGenericConfig remoteConfig; //private IGenericConfig remoteConfig;
private PhysicsManager physManager; private PhysicsManager physManager;

View File

@ -1,47 +1,47 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<project name="OpenSim.Storage.LocalStorageDb4o" default="build"> <project name="OpenSim.Storage.LocalStorageDb4o" default="build">
<target name="build"> <target name="build">
<echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
<mkdir dir="${project::get-base-directory()}/${build.dir}" /> <mkdir dir="${project::get-base-directory()}/${build.dir}" />
<copy todir="${project::get-base-directory()}/${build.dir}"> <copy todir="${project::get-base-directory()}/${build.dir}">
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenSim.Storage.LocalStorageDb4o" dynamicprefix="true" > <resources prefix="OpenSim.Storage.LocalStorageDb4o" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="AssemblyInfo.cs" /> <include name="AssemblyInfo.cs" />
<include name="Db4LocalStorage.cs" /> <include name="Db4LocalStorage.cs" />
<include name="MapStorage.cs" /> <include name="MapStorage.cs" />
<include name="UUIDQuery.cs" /> <include name="UUIDQuery.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">
<lib> <lib>
<include name="${project::get-base-directory()}" /> <include name="${project::get-base-directory()}" />
<include name="${project::get-base-directory()}/${build.dir}" /> <include name="${project::get-base-directory()}/${build.dir}" />
</lib> </lib>
<include name="System.dll" /> <include name="System.dll" />
<include name="System.Xml.dll" /> <include name="System.Xml.dll" />
<include name="../../bin/Db4objects.Db4o.dll" /> <include name="../../bin/Db4objects.Db4o.dll" />
<include name="../../bin/libsecondlife.dll" /> <include name="../../bin/libsecondlife.dll" />
<include name="../../bin/OpenSim.Framework.dll" /> <include name="../../bin/OpenSim.Framework.dll" />
<include name="../../bin/OpenSim.Framework.Console.dll" /> <include name="../../bin/OpenSim.Framework.Console.dll" />
</references> </references>
</csc> </csc>
<echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
<mkdir dir="${project::get-base-directory()}/../../bin/"/> <mkdir dir="${project::get-base-directory()}/../../bin/"/>
<copy todir="${project::get-base-directory()}/../../bin/"> <copy todir="${project::get-base-directory()}/../../bin/">
<fileset basedir="${project::get-base-directory()}/${build.dir}/" > <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
<include name="*.dll"/> <include name="*.dll"/>
<include name="*.exe"/> <include name="*.exe"/>
</fileset> </fileset>
</copy> </copy>
</target> </target>
<target name="clean"> <target name="clean">
<delete dir="${bin.dir}" failonerror="false" /> <delete dir="${bin.dir}" failonerror="false" />
<delete dir="${obj.dir}" failonerror="false" /> <delete dir="${obj.dir}" failonerror="false" />
</target> </target>
<target name="doc" description="Creates documentation."> <target name="doc" description="Creates documentation.">
</target> </target>
</project> </project>

View File

@ -1,118 +1,118 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<project name="OpenSim" default="build"> <project name="OpenSim" default="build">
<echo message="Using '${nant.settings.currentframework}' Framework"/> <echo message="Using '${nant.settings.currentframework}' Framework"/>
<property name="bin.dir" value="bin" /> <property name="bin.dir" value="bin" />
<property name="obj.dir" value="obj" /> <property name="obj.dir" value="obj" />
<property name="doc.dir" value="doc" /> <property name="doc.dir" value="doc" />
<property name="project.main.dir" value="${project::get-base-directory()}" /> <property name="project.main.dir" value="${project::get-base-directory()}" />
<property name="project.config" value="Release" />
<target name="Debug" description="">
<property name="project.config" value="Debug" /> <target name="Release" description="">
<property name="build.debug" value="true" /> <property name="project.config" value="Release" />
</target> <property name="build.debug" value="false" />
</target>
<property name="project.config" value="Release" />
<target name="Release" description=""> <target name="Debug" description="">
<property name="project.config" value="Release" /> <property name="project.config" value="Debug" />
<property name="build.debug" value="false" /> <property name="build.debug" value="true" />
</target> </target>
<target name="net-1.1" description="Sets framework to .NET 1.1"> <target name="net-1.1" description="Sets framework to .NET 1.1">
<property name="nant.settings.currentframework" value="net-1.1" /> <property name="nant.settings.currentframework" value="net-1.1" />
</target> </target>
<target name="net-2.0" description="Sets framework to .NET 2.0"> <target name="net-2.0" description="Sets framework to .NET 2.0">
<property name="nant.settings.currentframework" value="net-2.0" /> <property name="nant.settings.currentframework" value="net-2.0" />
</target> </target>
<target name="mono-2.0" description="Sets framework to mono 2.0"> <target name="mono-2.0" description="Sets framework to mono 2.0">
<property name="nant.settings.currentframework" value="mono-2.0" /> <property name="nant.settings.currentframework" value="mono-2.0" />
</target> </target>
<target name="mono-1.0" description="Sets framework to mono 1.0"> <target name="mono-1.0" description="Sets framework to mono 1.0">
<property name="nant.settings.currentframework" value="mono-1.0" /> <property name="nant.settings.currentframework" value="mono-1.0" />
</target> </target>
<target name="init" description=""> <target name="init" description="">
<call target="${project.config}" /> <call target="${project.config}" />
<sysinfo /> <sysinfo />
<echo message="Platform ${sys.os.platform}" /> <echo message="Platform ${sys.os.platform}" />
<property name="build.dir" value="${bin.dir}/${project.config}" /> <property name="build.dir" value="${bin.dir}/${project.config}" />
</target> </target>
<target name="clean" description=""> <target name="clean" description="">
<echo message="Deleting all builds from all configurations" /> <echo message="Deleting all builds from all configurations" />
<delete dir="${bin.dir}" failonerror="false" /> <delete dir="${bin.dir}" failonerror="false" />
<delete dir="${obj.dir}" failonerror="false" /> <delete dir="${obj.dir}" failonerror="false" />
<nant buildfile="OpenSim/OpenSim.exe.build" target="clean" /> <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" />
<nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" /> <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" />
<nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" /> <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" />
<nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="clean" /> <nant buildfile="Servers/OpenSim.Servers.dll.build" target="clean" />
<nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" /> <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" />
<nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" /> <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" />
<nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="clean" /> <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="clean" />
<nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" /> <nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="clean" />
<nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="clean" /> <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" />
<nant buildfile="Servers/OpenSim.Servers.dll.build" target="clean" /> <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="clean" />
<nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="clean" /> <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" />
<nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="clean" /> <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" />
<nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" /> <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="clean" />
<nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="clean" /> <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="clean" />
<nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" /> <nant buildfile="OpenSim/OpenSim.exe.build" target="clean" />
<nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="clean" /> <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" />
<nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" /> <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="clean" />
<nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" /> <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="clean" />
</target> </target>
<target name="build" depends="init" description=""> <target name="build" depends="init" description="">
<nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="build" /> <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="build" />
<nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="build" /> <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="build" />
<nant buildfile="Servers/OpenSim.Servers.dll.build" target="build" /> <nant buildfile="Servers/OpenSim.Servers.dll.build" target="build" />
<nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" /> <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" />
<nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" /> <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" />
<nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="build" /> <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="build" />
<nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="build" /> <nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="build" />
<nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="build" /> <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="build" />
<nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="build" /> <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="build" />
<nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="build" /> <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="build" />
<nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="build" /> <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="build" />
<nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="build" /> <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="build" />
<nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="build" /> <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="build" />
<nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="build" /> <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="build" />
<nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="build" /> <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="build" />
<nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="build" /> <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="build" />
<nant buildfile="OpenSim/OpenSim.exe.build" target="build" /> <nant buildfile="OpenSim/OpenSim.exe.build" target="build" />
<nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="build" /> <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="build" />
</target> </target>
<target name="build-release" depends="Release, init, build" description="Builds in Release mode" /> <target name="build-release" depends="Release, init, build" description="Builds in Release mode" />
<target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" /> <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" />
<target name="package" depends="clean, doc" description="Builds all" /> <target name="package" depends="clean, doc" description="Builds all" />
<target name="doc" depends="build-release"> <target name="doc" depends="build-release">
<echo message="Generating all documentation from all builds" /> <echo message="Generating all documentation from all builds" />
<nant buildfile="OpenSim/OpenSim.exe.build" target="doc" /> <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" />
<nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" /> <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" />
<nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" /> <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" />
<nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="doc" /> <nant buildfile="Servers/OpenSim.Servers.dll.build" target="doc" />
<nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" /> <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" />
<nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" /> <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" />
<nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="doc" /> <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="doc" />
<nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" /> <nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="doc" />
<nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="doc" /> <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" />
<nant buildfile="Servers/OpenSim.Servers.dll.build" target="doc" /> <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="doc" />
<nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="doc" /> <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" />
<nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="doc" /> <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" />
<nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" /> <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="doc" />
<nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="doc" /> <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="doc" />
<nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" /> <nant buildfile="OpenSim/OpenSim.exe.build" target="doc" />
<nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="doc" /> <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" />
<nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" /> <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="doc" />
<nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" /> <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="doc" />
</target> </target>
</project> </project>

View File

@ -1,48 +1,48 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<project name="OpenSim" default="build"> <project name="OpenSim" default="build">
<target name="build"> <target name="build">
<echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
<mkdir dir="${project::get-base-directory()}/${build.dir}" /> <mkdir dir="${project::get-base-directory()}/${build.dir}" />
<copy todir="${project::get-base-directory()}/${build.dir}"> <copy todir="${project::get-base-directory()}/${build.dir}">
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe"> <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
<resources prefix="OpenSim" dynamicprefix="true" > <resources prefix="OpenSim" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="Application.cs" /> <include name="Application.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">
<lib> <lib>
<include name="${project::get-base-directory()}" /> <include name="${project::get-base-directory()}" />
<include name="${project::get-base-directory()}/${build.dir}" /> <include name="${project::get-base-directory()}/${build.dir}" />
</lib> </lib>
<include name="System.dll" /> <include name="System.dll" />
<include name="System.Xml.dll" /> <include name="System.Xml.dll" />
<include name="../bin/libsecondlife.dll" /> <include name="../bin/libsecondlife.dll" />
<include name="../bin/Axiom.MathLib.dll" /> <include name="../bin/Axiom.MathLib.dll" />
<include name="../bin/Db4objects.Db4o.dll" /> <include name="../bin/Db4objects.Db4o.dll" />
<include name="../bin/OpenSim.Framework.dll" /> <include name="../bin/OpenSim.Framework.dll" />
<include name="../bin/OpenSim.Framework.Console.dll" /> <include name="../bin/OpenSim.Framework.Console.dll" />
<include name="../bin/OpenSim.Physics.Manager.dll" /> <include name="../bin/OpenSim.Physics.Manager.dll" />
<include name="../bin/OpenSim.Servers.dll" /> <include name="../bin/OpenSim.Servers.dll" />
<include name="../bin/OpenSim.RegionServer.dll" /> <include name="../bin/OpenSim.RegionServer.dll" />
</references> </references>
</csc> </csc>
<echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
<mkdir dir="${project::get-base-directory()}/../bin/"/> <mkdir dir="${project::get-base-directory()}/../bin/"/>
<copy todir="${project::get-base-directory()}/../bin/"> <copy todir="${project::get-base-directory()}/../bin/">
<fileset basedir="${project::get-base-directory()}/${build.dir}/" > <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
<include name="*.dll"/> <include name="*.dll"/>
<include name="*.exe"/> <include name="*.exe"/>
</fileset> </fileset>
</copy> </copy>
</target> </target>
<target name="clean"> <target name="clean">
<delete dir="${bin.dir}" failonerror="false" /> <delete dir="${bin.dir}" failonerror="false" />
<delete dir="${obj.dir}" failonerror="false" /> <delete dir="${obj.dir}" failonerror="false" />
</target> </target>
<target name="doc" description="Creates documentation."> <target name="doc" description="Creates documentation.">
</target> </target>
</project> </project>

View File

@ -1,46 +1,46 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<project name="OpenUser.Config.UserConfigDb4o" default="build"> <project name="OpenUser.Config.UserConfigDb4o" default="build">
<target name="build"> <target name="build">
<echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
<mkdir dir="${project::get-base-directory()}/${build.dir}" /> <mkdir dir="${project::get-base-directory()}/${build.dir}" />
<copy todir="${project::get-base-directory()}/${build.dir}"> <copy todir="${project::get-base-directory()}/${build.dir}">
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenUser.Config.UserConfigDb4o" dynamicprefix="true" > <resources prefix="OpenUser.Config.UserConfigDb4o" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="AssemblyInfo.cs" /> <include name="AssemblyInfo.cs" />
<include name="DbUserConfig.cs" /> <include name="DbUserConfig.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">
<lib> <lib>
<include name="${project::get-base-directory()}" /> <include name="${project::get-base-directory()}" />
<include name="${project::get-base-directory()}/${build.dir}" /> <include name="${project::get-base-directory()}/${build.dir}" />
</lib> </lib>
<include name="System.dll" /> <include name="System.dll" />
<include name="System.Data.dll.dll" /> <include name="System.Data.dll.dll" />
<include name="System.Xml.dll" /> <include name="System.Xml.dll" />
<include name="../../bin/libsecondlife.dll" /> <include name="../../bin/libsecondlife.dll" />
<include name="../../bin/Db4objects.Db4o.dll" /> <include name="../../bin/Db4objects.Db4o.dll" />
<include name="../../bin/OpenSim.Framework.dll" /> <include name="../../bin/OpenSim.Framework.dll" />
<include name="../../bin/OpenSim.Framework.Console.dll" /> <include name="../../bin/OpenSim.Framework.Console.dll" />
</references> </references>
</csc> </csc>
<echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
<mkdir dir="${project::get-base-directory()}/../../bin/"/> <mkdir dir="${project::get-base-directory()}/../../bin/"/>
<copy todir="${project::get-base-directory()}/../../bin/"> <copy todir="${project::get-base-directory()}/../../bin/">
<fileset basedir="${project::get-base-directory()}/${build.dir}/" > <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
<include name="*.dll"/> <include name="*.dll"/>
<include name="*.exe"/> <include name="*.exe"/>
</fileset> </fileset>
</copy> </copy>
</target> </target>
<target name="clean"> <target name="clean">
<delete dir="${bin.dir}" failonerror="false" /> <delete dir="${bin.dir}" failonerror="false" />
<delete dir="${obj.dir}" failonerror="false" /> <delete dir="${obj.dir}" failonerror="false" />
</target> </target>
<target name="doc" description="Creates documentation."> <target name="doc" description="Creates documentation.">
</target> </target>
</project> </project>

View File

@ -1,67 +1,67 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<project name="Prebuild" default="build"> <project name="Prebuild" default="build">
<echo message="Using '${nant.settings.currentframework}' Framework"/> <echo message="Using '${nant.settings.currentframework}' Framework"/>
<property name="bin.dir" value="bin" /> <property name="bin.dir" value="bin" />
<property name="obj.dir" value="obj" /> <property name="obj.dir" value="obj" />
<property name="doc.dir" value="doc" /> <property name="doc.dir" value="doc" />
<property name="project.main.dir" value="${project::get-base-directory()}" /> <property name="project.main.dir" value="${project::get-base-directory()}" />
<property name="project.config" value="Release" />
<target name="Debug" description="">
<property name="project.config" value="Debug" /> <target name="Release" description="">
<property name="build.debug" value="true" /> <property name="project.config" value="Release" />
</target> <property name="build.debug" value="false" />
</target>
<property name="project.config" value="Release" />
<target name="Release" description=""> <target name="Debug" description="">
<property name="project.config" value="Release" /> <property name="project.config" value="Debug" />
<property name="build.debug" value="false" /> <property name="build.debug" value="true" />
</target> </target>
<target name="net-1.1" description="Sets framework to .NET 1.1"> <target name="net-1.1" description="Sets framework to .NET 1.1">
<property name="nant.settings.currentframework" value="net-1.1" /> <property name="nant.settings.currentframework" value="net-1.1" />
</target> </target>
<target name="net-2.0" description="Sets framework to .NET 2.0"> <target name="net-2.0" description="Sets framework to .NET 2.0">
<property name="nant.settings.currentframework" value="net-2.0" /> <property name="nant.settings.currentframework" value="net-2.0" />
</target> </target>
<target name="mono-2.0" description="Sets framework to mono 2.0"> <target name="mono-2.0" description="Sets framework to mono 2.0">
<property name="nant.settings.currentframework" value="mono-2.0" /> <property name="nant.settings.currentframework" value="mono-2.0" />
</target> </target>
<target name="mono-1.0" description="Sets framework to mono 1.0"> <target name="mono-1.0" description="Sets framework to mono 1.0">
<property name="nant.settings.currentframework" value="mono-1.0" /> <property name="nant.settings.currentframework" value="mono-1.0" />
</target> </target>
<target name="init" description=""> <target name="init" description="">
<call target="${project.config}" /> <call target="${project.config}" />
<sysinfo /> <sysinfo />
<echo message="Platform ${sys.os.platform}" /> <echo message="Platform ${sys.os.platform}" />
<property name="build.dir" value="${bin.dir}/${project.config}" /> <property name="build.dir" value="${bin.dir}/${project.config}" />
</target> </target>
<target name="clean" description=""> <target name="clean" description="">
<echo message="Deleting all builds from all configurations" /> <echo message="Deleting all builds from all configurations" />
<delete dir="${bin.dir}" failonerror="false" /> <delete dir="${bin.dir}" failonerror="false" />
<delete dir="${obj.dir}" failonerror="false" /> <delete dir="${obj.dir}" failonerror="false" />
<nant buildfile="src/Prebuild.exe.build" target="clean" /> <nant buildfile="src/Prebuild.exe.build" target="clean" />
</target> </target>
<target name="build" depends="init" description=""> <target name="build" depends="init" description="">
<nant buildfile="src/Prebuild.exe.build" target="build" /> <nant buildfile="src/Prebuild.exe.build" target="build" />
</target> </target>
<target name="build-release" depends="Release, init, build" description="Builds in Release mode" /> <target name="build-release" depends="Release, init, build" description="Builds in Release mode" />
<target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" /> <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" />
<target name="package" depends="clean, doc" description="Builds all" /> <target name="package" depends="clean, doc" description="Builds all" />
<target name="doc" depends="build-release"> <target name="doc" depends="build-release">
<echo message="Generating all documentation from all builds" /> <echo message="Generating all documentation from all builds" />
<nant buildfile="src/Prebuild.exe.build" target="doc" /> <nant buildfile="src/Prebuild.exe.build" target="doc" />
</target> </target>
</project> </project>

View File

@ -1,80 +1,80 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<project name="Prebuild" default="build"> <project name="Prebuild" default="build">
<target name="build"> <target name="build">
<echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
<mkdir dir="${project::get-base-directory()}/${build.dir}" /> <mkdir dir="${project::get-base-directory()}/${build.dir}" />
<copy todir="${project::get-base-directory()}/${build.dir}"> <copy todir="${project::get-base-directory()}/${build.dir}">
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="exe" debug="${build.debug}" keyfile="Prebuild.snk" unsafe="False" define="DEBUG;TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe" win32icon="App.ico"> <csc target="exe" debug="${build.debug}" keyfile="Prebuild.snk" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe" win32icon="App.ico">
<resources prefix="Prebuild" dynamicprefix="true" > <resources prefix="Prebuild" dynamicprefix="true" >
<include name="App.ico" /> <include name="App.ico" />
<include name="data/prebuild-1.7.xsd" /> <include name="data/prebuild-1.7.xsd" />
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="Prebuild.cs" /> <include name="Prebuild.cs" />
<include name="Core/FatalException.cs" /> <include name="Core/FatalException.cs" />
<include name="Core/Kernel.cs" /> <include name="Core/Kernel.cs" />
<include name="Core/UnknownLanguageException.cs" /> <include name="Core/UnknownLanguageException.cs" />
<include name="Core/WarningException.cs" /> <include name="Core/WarningException.cs" />
<include name="Core/Attributes/DataNodeAttribute.cs" /> <include name="Core/Attributes/DataNodeAttribute.cs" />
<include name="Core/Attributes/OptionNodeAttribute.cs" /> <include name="Core/Attributes/OptionNodeAttribute.cs" />
<include name="Core/Attributes/TargetAttribute.cs" /> <include name="Core/Attributes/TargetAttribute.cs" />
<include name="Core/Interfaces/IDataNode.cs" /> <include name="Core/Interfaces/IDataNode.cs" />
<include name="Core/Interfaces/ITarget.cs" /> <include name="Core/Interfaces/ITarget.cs" />
<include name="Core/Nodes/ConfigurationNode.cs" /> <include name="Core/Nodes/ConfigurationNode.cs" />
<include name="Core/Nodes/DataNode.cs" /> <include name="Core/Nodes/DataNode.cs" />
<include name="Core/Nodes/ExcludeNode.cs" /> <include name="Core/Nodes/ExcludeNode.cs" />
<include name="Core/Nodes/FileNode.cs" /> <include name="Core/Nodes/FileNode.cs" />
<include name="Core/Nodes/FilesNode.cs" /> <include name="Core/Nodes/FilesNode.cs" />
<include name="Core/Nodes/MatchNode.cs" /> <include name="Core/Nodes/MatchNode.cs" />
<include name="Core/Nodes/OptionsNode.cs" /> <include name="Core/Nodes/OptionsNode.cs" />
<include name="Core/Nodes/ProcessNode.cs" /> <include name="Core/Nodes/ProcessNode.cs" />
<include name="Core/Nodes/ProjectNode.cs" /> <include name="Core/Nodes/ProjectNode.cs" />
<include name="Core/Nodes/ReferenceNode.cs" /> <include name="Core/Nodes/ReferenceNode.cs" />
<include name="Core/Nodes/ReferencePathNode.cs" /> <include name="Core/Nodes/ReferencePathNode.cs" />
<include name="Core/Nodes/SolutionNode.cs" /> <include name="Core/Nodes/SolutionNode.cs" />
<include name="Core/Parse/IfContext.cs" /> <include name="Core/Parse/IfContext.cs" />
<include name="Core/Parse/Preprocessor.cs" /> <include name="Core/Parse/Preprocessor.cs" />
<include name="Core/Targets/AutotoolsTarget.cs" /> <include name="Core/Targets/AutotoolsTarget.cs" />
<include name="Core/Targets/DebugTarget.cs" /> <include name="Core/Targets/DebugTarget.cs" />
<include name="Core/Targets/MonoDevelopTarget.cs" /> <include name="Core/Targets/MonoDevelopTarget.cs" />
<include name="Core/Targets/NAntTarget.cs" /> <include name="Core/Targets/NAntTarget.cs" />
<include name="Core/Targets/SharpDevelop2Target.cs" /> <include name="Core/Targets/SharpDevelop2Target.cs" />
<include name="Core/Targets/SharpDevelopTarget.cs" /> <include name="Core/Targets/SharpDevelopTarget.cs" />
<include name="Core/Targets/VS2002Target.cs" /> <include name="Core/Targets/VS2002Target.cs" />
<include name="Core/Targets/VS2003Target.cs" /> <include name="Core/Targets/VS2003Target.cs" />
<include name="Core/Targets/VS2005Target.cs" /> <include name="Core/Targets/VS2005Target.cs" />
<include name="Core/Utilities/CommandLineCollection.cs" /> <include name="Core/Utilities/CommandLineCollection.cs" />
<include name="Core/Utilities/CurrentDirectory.cs" /> <include name="Core/Utilities/CurrentDirectory.cs" />
<include name="Core/Utilities/Helper.cs" /> <include name="Core/Utilities/Helper.cs" />
<include name="Core/Utilities/Log.cs" /> <include name="Core/Utilities/Log.cs" />
<include name="Properties/AssemblyInfo.cs" /> <include name="Properties/AssemblyInfo.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">
<lib> <lib>
<include name="${project::get-base-directory()}" /> <include name="${project::get-base-directory()}" />
<include name="${project::get-base-directory()}/${build.dir}" /> <include name="${project::get-base-directory()}/${build.dir}" />
</lib> </lib>
<include name="System.EnterpriseServices.dll" /> <include name="System.EnterpriseServices.dll" />
<include name="System.Xml.dll" /> <include name="System.Xml.dll" />
<include name="System.dll" /> <include name="System.dll" />
</references> </references>
</csc> </csc>
<echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" /> <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
<mkdir dir="${project::get-base-directory()}/../../bin/"/> <mkdir dir="${project::get-base-directory()}/../../bin/"/>
<copy todir="${project::get-base-directory()}/../../bin/"> <copy todir="${project::get-base-directory()}/../../bin/">
<fileset basedir="${project::get-base-directory()}/${build.dir}/" > <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
<include name="*.dll"/> <include name="*.dll"/>
<include name="*.exe"/> <include name="*.exe"/>
</fileset> </fileset>
</copy> </copy>
</target> </target>
<target name="clean"> <target name="clean">
<delete dir="${bin.dir}" failonerror="false" /> <delete dir="${bin.dir}" failonerror="false" />
<delete dir="${obj.dir}" failonerror="false" /> <delete dir="${obj.dir}" failonerror="false" />
</target> </target>
<target name="doc" description="Creates documentation."> <target name="doc" description="Creates documentation.">
</target> </target>
</project> </project>

View File

@ -1,48 +1,48 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<project name="OpenSim.Servers" default="build"> <project name="OpenSim.Servers" default="build">
<target name="build"> <target name="build">
<echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
<mkdir dir="${project::get-base-directory()}/${build.dir}" /> <mkdir dir="${project::get-base-directory()}/${build.dir}" />
<copy todir="${project::get-base-directory()}/${build.dir}"> <copy todir="${project::get-base-directory()}/${build.dir}">
<fileset basedir="${project::get-base-directory()}"> <fileset basedir="${project::get-base-directory()}">
</fileset> </fileset>
</copy> </copy>
<csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
<resources prefix="OpenSim.Servers" dynamicprefix="true" > <resources prefix="OpenSim.Servers" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="BaseHttpServer.cs" /> <include name="BaseHttpServer.cs" />
<include name="IRestHandler.cs" /> <include name="IRestHandler.cs" />
<include name="LocalUserProfileManager.cs" /> <include name="LocalUserProfileManager.cs" />
<include name="LoginResponse.cs" /> <include name="LoginResponse.cs" />
<include name="LoginServer.cs" /> <include name="LoginServer.cs" />
<include name="XmlRpcMethod.cs" /> <include name="XmlRpcMethod.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">
<lib> <lib>
<include name="${project::get-base-directory()}" /> <include name="${project::get-base-directory()}" />
<include name="${project::get-base-directory()}/${build.dir}" /> <include name="${project::get-base-directory()}/${build.dir}" />
</lib> </lib>
<include name="System.dll" /> <include name="System.dll" />
<include name="System.Xml.dll" /> <include name="System.Xml.dll" />
<include name="../bin/OpenSim.Framework.dll" /> <include name="../bin/OpenSim.Framework.dll" />
<include name="../bin/OpenSim.Framework.Console.dll" /> <include name="../bin/OpenSim.Framework.Console.dll" />
<include name="../bin/libsecondlife.dll" /> <include name="../bin/libsecondlife.dll" />
</references> </references>
</csc> </csc>
<echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
<mkdir dir="${project::get-base-directory()}/../bin/"/> <mkdir dir="${project::get-base-directory()}/../bin/"/>
<copy todir="${project::get-base-directory()}/../bin/"> <copy todir="${project::get-base-directory()}/../bin/">
<fileset basedir="${project::get-base-directory()}/${build.dir}/" > <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
<include name="*.dll"/> <include name="*.dll"/>
<include name="*.exe"/> <include name="*.exe"/>
</fileset> </fileset>
</copy> </copy>
</target> </target>
<target name="clean"> <target name="clean">
<delete dir="${bin.dir}" failonerror="false" /> <delete dir="${bin.dir}" failonerror="false" />
<delete dir="${obj.dir}" failonerror="false" /> <delete dir="${obj.dir}" failonerror="false" />
</target> </target>
<target name="doc" description="Creates documentation."> <target name="doc" description="Creates documentation.">
</target> </target>
</project> </project>