diff options
author | MW | 2007-04-02 12:56:35 +0000 |
---|---|---|
committer | MW | 2007-04-02 12:56:35 +0000 |
commit | 23ecc07caa19dce34bf56c6c3fac3e54cd2cdcff (patch) | |
tree | ace7dfc8b928c07ddb1f73b5a7b2c6de8a36687e /OpenSim.Framework | |
parent | minor bug (diff) | |
download | opensim-SC_OLD-23ecc07caa19dce34bf56c6c3fac3e54cd2cdcff.zip opensim-SC_OLD-23ecc07caa19dce34bf56c6c3fac3e54cd2cdcff.tar.gz opensim-SC_OLD-23ecc07caa19dce34bf56c6c3fac3e54cd2cdcff.tar.bz2 opensim-SC_OLD-23ecc07caa19dce34bf56c6c3fac3e54cd2cdcff.tar.xz |
Added OpenSim.GenericConfig.Xml project, so we can swap to a more generic configuration method, so that it is easier to load configuration data from a ogs server
Diffstat (limited to '')
-rw-r--r-- | OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build | 84 | ||||
-rw-r--r-- | OpenSim.Framework/OpenSim.Framework.csproj | 7 | ||||
-rw-r--r-- | OpenSim.Framework/OpenSim.Framework.dll.build | 133 |
3 files changed, 116 insertions, 108 deletions
diff --git a/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build b/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build index a3019ee..fa90bb6 100644 --- a/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build +++ b/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build | |||
@@ -1,42 +1,42 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Framework.Console" default="build"> | 2 | <project name="OpenSim.Framework.Console" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.Framework.Console" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Framework.Console" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="ConsoleBase.cs" /> | 15 | <include name="ConsoleBase.cs" /> |
16 | <include name="ConsoleCallbacksBase.cs" /> | 16 | <include name="ConsoleCallbacksBase.cs" /> |
17 | <include name="MainConsole.cs" /> | 17 | <include name="MainConsole.cs" /> |
18 | </sources> | 18 | </sources> |
19 | <references basedir="${project::get-base-directory()}"> | 19 | <references basedir="${project::get-base-directory()}"> |
20 | <lib> | 20 | <lib> |
21 | <include name="${project::get-base-directory()}" /> | 21 | <include name="${project::get-base-directory()}" /> |
22 | <include name="${project::get-base-directory()}/${build.dir}" /> | 22 | <include name="${project::get-base-directory()}/${build.dir}" /> |
23 | </lib> | 23 | </lib> |
24 | <include name="System.dll" /> | 24 | <include name="System.dll" /> |
25 | </references> | 25 | </references> |
26 | </csc> | 26 | </csc> |
27 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 27 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> |
28 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 28 | <mkdir dir="${project::get-base-directory()}/../bin/"/> |
29 | <copy todir="${project::get-base-directory()}/../bin/"> | 29 | <copy todir="${project::get-base-directory()}/../bin/"> |
30 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 30 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
31 | <include name="*.dll"/> | 31 | <include name="*.dll"/> |
32 | <include name="*.exe"/> | 32 | <include name="*.exe"/> |
33 | </fileset> | 33 | </fileset> |
34 | </copy> | 34 | </copy> |
35 | </target> | 35 | </target> |
36 | <target name="clean"> | 36 | <target name="clean"> |
37 | <delete dir="${bin.dir}" failonerror="false" /> | 37 | <delete dir="${bin.dir}" failonerror="false" /> |
38 | <delete dir="${obj.dir}" failonerror="false" /> | 38 | <delete dir="${obj.dir}" failonerror="false" /> |
39 | </target> | 39 | </target> |
40 | <target name="doc" description="Creates documentation."> | 40 | <target name="doc" description="Creates documentation."> |
41 | </target> | 41 | </target> |
42 | </project> | 42 | </project> |
diff --git a/OpenSim.Framework/OpenSim.Framework.csproj b/OpenSim.Framework/OpenSim.Framework.csproj index 53a20c1..4ce5af0 100644 --- a/OpenSim.Framework/OpenSim.Framework.csproj +++ b/OpenSim.Framework/OpenSim.Framework.csproj | |||
@@ -70,6 +70,10 @@ | |||
70 | <HintPath>..\bin\libsecondlife.dll</HintPath> | 70 | <HintPath>..\bin\libsecondlife.dll</HintPath> |
71 | <Private>False</Private> | 71 | <Private>False</Private> |
72 | </Reference> | 72 | </Reference> |
73 | <Reference Include="Db4objects.Db4o.dll" > | ||
74 | <HintPath>..\bin\Db4objects.Db4o.dll</HintPath> | ||
75 | <Private>False</Private> | ||
76 | </Reference> | ||
73 | </ItemGroup> | 77 | </ItemGroup> |
74 | <ItemGroup> | 78 | <ItemGroup> |
75 | </ItemGroup> | 79 | </ItemGroup> |
@@ -95,6 +99,9 @@ | |||
95 | <Compile Include="IConfig.cs"> | 99 | <Compile Include="IConfig.cs"> |
96 | <SubType>Code</SubType> | 100 | <SubType>Code</SubType> |
97 | </Compile> | 101 | </Compile> |
102 | <Compile Include="IGenericConfig.cs"> | ||
103 | <SubType>Code</SubType> | ||
104 | </Compile> | ||
98 | <Compile Include="IGridConfig.cs"> | 105 | <Compile Include="IGridConfig.cs"> |
99 | <SubType>Code</SubType> | 106 | <SubType>Code</SubType> |
100 | </Compile> | 107 | </Compile> |
diff --git a/OpenSim.Framework/OpenSim.Framework.dll.build b/OpenSim.Framework/OpenSim.Framework.dll.build index 43f4542..89010d2 100644 --- a/OpenSim.Framework/OpenSim.Framework.dll.build +++ b/OpenSim.Framework/OpenSim.Framework.dll.build | |||
@@ -1,66 +1,67 @@ | |||
1 | <?xml version="1.0" ?> | 1 | <?xml version="1.0" ?> |
2 | <project name="OpenSim.Framework" default="build"> | 2 | <project name="OpenSim.Framework" default="build"> |
3 | <target name="build"> | 3 | <target name="build"> |
4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> | 4 | <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" /> |
5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> | 5 | <mkdir dir="${project::get-base-directory()}/${build.dir}" /> |
6 | <copy todir="${project::get-base-directory()}/${build.dir}"> | 6 | <copy todir="${project::get-base-directory()}/${build.dir}"> |
7 | <fileset basedir="${project::get-base-directory()}"> | 7 | <fileset basedir="${project::get-base-directory()}"> |
8 | </fileset> | 8 | </fileset> |
9 | </copy> | 9 | </copy> |
10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> | 10 | <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll"> |
11 | <resources prefix="OpenSim.Framework" dynamicprefix="true" > | 11 | <resources prefix="OpenSim.Framework" dynamicprefix="true" > |
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AgentCiruitData.cs" /> | 14 | <include name="AgentCiruitData.cs" /> |
15 | <include name="AgentInventory.cs" /> | 15 | <include name="AgentInventory.cs" /> |
16 | <include name="AssetBase.cs" /> | 16 | <include name="AssetBase.cs" /> |
17 | <include name="BlockingQueue.cs" /> | 17 | <include name="BlockingQueue.cs" /> |
18 | <include name="HeightMapGenHills.cs" /> | 18 | <include name="HeightMapGenHills.cs" /> |
19 | <include name="IAssetServer.cs" /> | 19 | <include name="IAssetServer.cs" /> |
20 | <include name="IConfig.cs" /> | 20 | <include name="IConfig.cs" /> |
21 | <include name="IGridConfig.cs" /> | 21 | <include name="IGenericConfig.cs" /> |
22 | <include name="IGridServer.cs" /> | 22 | <include name="IGridConfig.cs" /> |
23 | <include name="ILocalStorage.cs" /> | 23 | <include name="IGridServer.cs" /> |
24 | <include name="IUserConfig.cs" /> | 24 | <include name="ILocalStorage.cs" /> |
25 | <include name="IUserServer.cs" /> | 25 | <include name="IUserConfig.cs" /> |
26 | <include name="LocalGridBase.cs" /> | 26 | <include name="IUserServer.cs" /> |
27 | <include name="Login.cs" /> | 27 | <include name="LocalGridBase.cs" /> |
28 | <include name="LoginService.cs" /> | 28 | <include name="Login.cs" /> |
29 | <include name="NeighbourInfo.cs" /> | 29 | <include name="LoginService.cs" /> |
30 | <include name="PrimData.cs" /> | 30 | <include name="NeighbourInfo.cs" /> |
31 | <include name="RemoteGridBase.cs" /> | 31 | <include name="PrimData.cs" /> |
32 | <include name="SimProfile.cs" /> | 32 | <include name="RemoteGridBase.cs" /> |
33 | <include name="SimProfileBase.cs" /> | 33 | <include name="SimProfile.cs" /> |
34 | <include name="UserProfile.cs" /> | 34 | <include name="SimProfileBase.cs" /> |
35 | <include name="UserProfileManager.cs" /> | 35 | <include name="UserProfile.cs" /> |
36 | <include name="UserProfileManagerBase.cs" /> | 36 | <include name="UserProfileManager.cs" /> |
37 | <include name="Util.cs" /> | 37 | <include name="UserProfileManagerBase.cs" /> |
38 | <include name="Properties/AssemblyInfo.cs" /> | 38 | <include name="Util.cs" /> |
39 | </sources> | 39 | <include name="Properties/AssemblyInfo.cs" /> |
40 | <references basedir="${project::get-base-directory()}"> | 40 | </sources> |
41 | <lib> | 41 | <references basedir="${project::get-base-directory()}"> |
42 | <include name="${project::get-base-directory()}" /> | 42 | <lib> |
43 | <include name="${project::get-base-directory()}/${build.dir}" /> | 43 | <include name="${project::get-base-directory()}" /> |
44 | </lib> | 44 | <include name="${project::get-base-directory()}/${build.dir}" /> |
45 | <include name="System.dll" /> | 45 | </lib> |
46 | <include name="System.Xml.dll" /> | 46 | <include name="System.dll" /> |
47 | <include name="../bin/libsecondlife.dll" /> | 47 | <include name="System.Xml.dll" /> |
48 | <include name="../bin/Db4objects.Db4o.dll" /> | 48 | <include name="../bin/libsecondlife.dll" /> |
49 | </references> | 49 | <include name="../bin/Db4objects.Db4o.dll" /> |
50 | </csc> | 50 | </references> |
51 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> | 51 | </csc> |
52 | <mkdir dir="${project::get-base-directory()}/../bin/"/> | 52 | <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" /> |
53 | <copy todir="${project::get-base-directory()}/../bin/"> | 53 | <mkdir dir="${project::get-base-directory()}/../bin/"/> |
54 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > | 54 | <copy todir="${project::get-base-directory()}/../bin/"> |
55 | <include name="*.dll"/> | 55 | <fileset basedir="${project::get-base-directory()}/${build.dir}/" > |
56 | <include name="*.exe"/> | 56 | <include name="*.dll"/> |
57 | </fileset> | 57 | <include name="*.exe"/> |
58 | </copy> | 58 | </fileset> |
59 | </target> | 59 | </copy> |
60 | <target name="clean"> | 60 | </target> |
61 | <delete dir="${bin.dir}" failonerror="false" /> | 61 | <target name="clean"> |
62 | <delete dir="${obj.dir}" failonerror="false" /> | 62 | <delete dir="${bin.dir}" failonerror="false" /> |
63 | </target> | 63 | <delete dir="${obj.dir}" failonerror="false" /> |
64 | <target name="doc" description="Creates documentation."> | 64 | </target> |
65 | </target> | 65 | <target name="doc" description="Creates documentation."> |
66 | </project> | 66 | </target> |
67 | </project> | ||