diff options
author | lbsa71 | 2007-03-16 15:45:07 +0000 |
---|---|---|
committer | lbsa71 | 2007-03-16 15:45:07 +0000 |
commit | 623e9e991aee3f064ae04522852ad0de98715680 (patch) | |
tree | 9e1bef7b8d41bb2492999abb326d8e0dc42a230e | |
parent | Added Framework Project and Made buildfiles work on windows. (diff) | |
download | opensim-SC_OLD-623e9e991aee3f064ae04522852ad0de98715680.zip opensim-SC_OLD-623e9e991aee3f064ae04522852ad0de98715680.tar.gz opensim-SC_OLD-623e9e991aee3f064ae04522852ad0de98715680.tar.bz2 opensim-SC_OLD-623e9e991aee3f064ae04522852ad0de98715680.tar.xz |
* renamed Framework Project to OpenSim.Framework
-rw-r--r-- | opensim.build | 6 | ||||
-rw-r--r-- | src/GridInterfaces/default.build | 2 | ||||
-rw-r--r-- | src/GridServers/LoginServer.cs | 2 | ||||
-rw-r--r-- | src/OpenSim.Framework/AssemblyInfo.cs (renamed from src/OpenGrid.Framework/AssemblyInfo.cs) | 0 | ||||
-rw-r--r-- | src/OpenSim.Framework/LoginService.cs (renamed from src/OpenGrid.Framework/LoginService.cs) | 2 | ||||
-rw-r--r-- | src/OpenSim.Framework/OpenSim.Framework.csproj (renamed from src/OpenGrid.Framework/OpenGrid.Framework.csproj) | 2 | ||||
-rw-r--r-- | src/OpenSim.Framework/Properties/AssemblyInfo.cs (renamed from src/OpenGrid.Framework/Properties/AssemblyInfo.cs) | 0 | ||||
-rw-r--r-- | src/OpenSim.Framework/default.build (renamed from src/OpenGrid.Framework/default.build) | 8 | ||||
-rw-r--r-- | src/Second-server.csproj | 4 | ||||
-rw-r--r-- | src/opensim.sln | 2 |
10 files changed, 14 insertions, 14 deletions
diff --git a/opensim.build b/opensim.build index cb692dc..ed43a11 100644 --- a/opensim.build +++ b/opensim.build | |||
@@ -53,14 +53,14 @@ | |||
53 | <nant> | 53 | <nant> |
54 | <buildfiles> | 54 | <buildfiles> |
55 | <include name="src/GridInterfaces/default.build" /> | 55 | <include name="src/GridInterfaces/default.build" /> |
56 | <include name="src/OpenGrid.Framework/default.build" /> | 56 | <include name="src/OpenSim.Framework/default.build" /> |
57 | <include name="src/ServerConsole/default.build" /> | 57 | <include name="src/ServerConsole/default.build" /> |
58 | <include name="src/LocalServers/default.build" /> | 58 | <include name="src/LocalServers/default.build" /> |
59 | <include name="src/RemoteServers/default.build" /> | 59 | <include name="src/RemoteServers/default.build" /> |
60 | <include name="src/physics/default.build" /> | 60 | <include name="src/physics/default.build" /> |
61 | <include name="src/physics/plugins/default.build" /> | 61 | <include name="src/physics/plugins/default.build" /> |
62 | <include name="src/LocalStorage/default.build" /> | 62 | <include name="src/LocalStorage/default.build" /> |
63 | <include name="src/OpenGrid.Framework/default.build" /> | 63 | <include name="src/OpenSim.Framework/default.build" /> |
64 | </buildfiles> | 64 | </buildfiles> |
65 | </nant> | 65 | </nant> |
66 | 66 | ||
@@ -76,7 +76,7 @@ | |||
76 | <include name="ServerConsole.dll" /> | 76 | <include name="ServerConsole.dll" /> |
77 | <include name="GridInterfaces.dll" /> | 77 | <include name="GridInterfaces.dll" /> |
78 | <include name="PhysicsManager.dll" /> | 78 | <include name="PhysicsManager.dll" /> |
79 | <include name="OpenGrid.Framework.dll" /> | 79 | <include name="OpenSim.Framework.dll" /> |
80 | </references> | 80 | </references> |
81 | <sources basedir="src/"> | 81 | <sources basedir="src/"> |
82 | <include name="*.cs" /> | 82 | <include name="*.cs" /> |
diff --git a/src/GridInterfaces/default.build b/src/GridInterfaces/default.build index a1de6e5..dd02448 100644 --- a/src/GridInterfaces/default.build +++ b/src/GridInterfaces/default.build | |||
@@ -39,7 +39,7 @@ | |||
39 | <references basedir="../../bin" failonempty="true"> | 39 | <references basedir="../../bin" failonempty="true"> |
40 | <include name="System.dll" /> | 40 | <include name="System.dll" /> |
41 | <include name="System.Xml.dll" /> | 41 | <include name="System.Xml.dll" /> |
42 | <include name="OpenGrid.Framework.dll" /> | 42 | <include name="OpenSim.Framework.dll" /> |
43 | <include name="libsecondlife.dll" /> | 43 | <include name="libsecondlife.dll" /> |
44 | </references> | 44 | </references> |
45 | <sources basedir="./"> | 45 | <sources basedir="./"> |
diff --git a/src/GridServers/LoginServer.cs b/src/GridServers/LoginServer.cs index f96b9f9..9d33523 100644 --- a/src/GridServers/LoginServer.cs +++ b/src/GridServers/LoginServer.cs | |||
@@ -38,7 +38,7 @@ using System.Security.Cryptography; | |||
38 | using System.Xml; | 38 | using System.Xml; |
39 | using libsecondlife; | 39 | using libsecondlife; |
40 | using OpenSim; | 40 | using OpenSim; |
41 | using OpenGrid.Framework; | 41 | using OpenSim.Framework; |
42 | 42 | ||
43 | namespace OpenSim.GridServers | 43 | namespace OpenSim.GridServers |
44 | { | 44 | { |
diff --git a/src/OpenGrid.Framework/AssemblyInfo.cs b/src/OpenSim.Framework/AssemblyInfo.cs index 0ff408f..0ff408f 100644 --- a/src/OpenGrid.Framework/AssemblyInfo.cs +++ b/src/OpenSim.Framework/AssemblyInfo.cs | |||
diff --git a/src/OpenGrid.Framework/LoginService.cs b/src/OpenSim.Framework/LoginService.cs index d38c271..85fe761 100644 --- a/src/OpenGrid.Framework/LoginService.cs +++ b/src/OpenSim.Framework/LoginService.cs | |||
@@ -6,7 +6,7 @@ using Nwc.XmlRpc; | |||
6 | using OpenSim.GridServers; | 6 | using OpenSim.GridServers; |
7 | using libsecondlife; | 7 | using libsecondlife; |
8 | 8 | ||
9 | namespace OpenGrid.Framework | 9 | namespace OpenSim.Framework |
10 | { | 10 | { |
11 | public abstract class LoginService | 11 | public abstract class LoginService |
12 | { | 12 | { |
diff --git a/src/OpenGrid.Framework/OpenGrid.Framework.csproj b/src/OpenSim.Framework/OpenSim.Framework.csproj index efbbcfb..c8bba5d 100644 --- a/src/OpenGrid.Framework/OpenGrid.Framework.csproj +++ b/src/OpenSim.Framework/OpenSim.Framework.csproj | |||
@@ -7,7 +7,7 @@ | |||
7 | <ProjectGuid>{407CE85B-628C-4788-9DBC-49BCEFC3A84F}</ProjectGuid> | 7 | <ProjectGuid>{407CE85B-628C-4788-9DBC-49BCEFC3A84F}</ProjectGuid> |
8 | <OutputType>Library</OutputType> | 8 | <OutputType>Library</OutputType> |
9 | <AppDesignerFolder>Properties</AppDesignerFolder> | 9 | <AppDesignerFolder>Properties</AppDesignerFolder> |
10 | <RootNamespace>OpenGrid.Framework</RootNamespace> | 10 | <RootNamespace>OpenSim.Framework</RootNamespace> |
11 | <AssemblyName>OpenGrid.Framework</AssemblyName> | 11 | <AssemblyName>OpenGrid.Framework</AssemblyName> |
12 | </PropertyGroup> | 12 | </PropertyGroup> |
13 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | 13 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> |
diff --git a/src/OpenGrid.Framework/Properties/AssemblyInfo.cs b/src/OpenSim.Framework/Properties/AssemblyInfo.cs index 72e55b9..72e55b9 100644 --- a/src/OpenGrid.Framework/Properties/AssemblyInfo.cs +++ b/src/OpenSim.Framework/Properties/AssemblyInfo.cs | |||
diff --git a/src/OpenGrid.Framework/default.build b/src/OpenSim.Framework/default.build index ee398a0..57dfee8 100644 --- a/src/OpenGrid.Framework/default.build +++ b/src/OpenSim.Framework/default.build | |||
@@ -1,9 +1,9 @@ | |||
1 | <?xml version="1.0"?> | 1 | <?xml version="1.0"?> |
2 | <project name="OpenGrid.Framework" default="build" basedir="."> | 2 | <project name="OpenSim.Framework" default="build" basedir="."> |
3 | <description>nant buildfile for OpenGrid.Framework</description> | 3 | <description>nant buildfile for OpenSim.Framework</description> |
4 | <property name="debug" value="true" overwrite="false" /> | 4 | <property name="debug" value="true" overwrite="false" /> |
5 | <target name="clean" description="remove all generated files"> | 5 | <target name="clean" description="remove all generated files"> |
6 | <delete file="../../bin/OpenGrid.Framework.dll" failonerror="false" /> | 6 | <delete file="../../bin/OpenSim.Framework.dll" failonerror="false" /> |
7 | </target> | 7 | </target> |
8 | 8 | ||
9 | <target name="svnupdate" description="updates to latest SVN"> | 9 | <target name="svnupdate" description="updates to latest SVN"> |
@@ -35,7 +35,7 @@ | |||
35 | </attributes> | 35 | </attributes> |
36 | </asminfo> | 36 | </asminfo> |
37 | 37 | ||
38 | <csc target="library" output="../../bin/OpenGrid.Framework.dll" debug="${debug}" verbose="true" warninglevel="4"> | 38 | <csc target="library" output="../../bin/OpenSim.Framework.dll" debug="${debug}" verbose="true" warninglevel="4"> |
39 | <references basedir="../../bin" failonempty="true"> | 39 | <references basedir="../../bin" failonempty="true"> |
40 | <include name="System.dll" /> | 40 | <include name="System.dll" /> |
41 | <include name="System.Xml.dll" /> | 41 | <include name="System.Xml.dll" /> |
diff --git a/src/Second-server.csproj b/src/Second-server.csproj index be4a913..2dda6db 100644 --- a/src/Second-server.csproj +++ b/src/Second-server.csproj | |||
@@ -90,9 +90,9 @@ | |||
90 | <Project>{74784F23-B0FD-484C-82C1-96C0215733DC}</Project> | 90 | <Project>{74784F23-B0FD-484C-82C1-96C0215733DC}</Project> |
91 | <Name>Db4LocalStorage</Name> | 91 | <Name>Db4LocalStorage</Name> |
92 | </ProjectReference> | 92 | </ProjectReference> |
93 | <ProjectReference Include="OpenGrid.Framework\OpenGrid.Framework.csproj"> | 93 | <ProjectReference Include="OpenSim.Framework\OpenSim.Framework.csproj"> |
94 | <Project>{407CE85B-628C-4788-9DBC-49BCEFC3A84F}</Project> | 94 | <Project>{407CE85B-628C-4788-9DBC-49BCEFC3A84F}</Project> |
95 | <Name>OpenGrid.Framework</Name> | 95 | <Name>OpenSim.Framework</Name> |
96 | </ProjectReference> | 96 | </ProjectReference> |
97 | <ProjectReference Include="physics\PhysicsManager.csproj"> | 97 | <ProjectReference Include="physics\PhysicsManager.csproj"> |
98 | <Project>{3C86A846-7977-4EE7-A8DC-DD487FA5DC2B}</Project> | 98 | <Project>{3C86A846-7977-4EE7-A8DC-DD487FA5DC2B}</Project> |
diff --git a/src/opensim.sln b/src/opensim.sln index e9951b8..c4be551 100644 --- a/src/opensim.sln +++ b/src/opensim.sln | |||
@@ -21,7 +21,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BasicPhysicsplugin", "physi | |||
21 | EndProject | 21 | EndProject |
22 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RealPhysXplugin", "physics\RealPhysX\RealPhysXplugin\RealPhysXplugin.csproj", "{56C1D214-F389-4228-921A-0A3A0712C159}" | 22 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RealPhysXplugin", "physics\RealPhysX\RealPhysXplugin\RealPhysXplugin.csproj", "{56C1D214-F389-4228-921A-0A3A0712C159}" |
23 | EndProject | 23 | EndProject |
24 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGrid.Framework", "OpenGrid.Framework\OpenGrid.Framework.csproj", "{407CE85B-628C-4788-9DBC-49BCEFC3A84F}" | 24 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim.Framework\OpenSim.Framework.csproj", "{407CE85B-628C-4788-9DBC-49BCEFC3A84F}" |
25 | EndProject | 25 | EndProject |
26 | Global | 26 | Global |
27 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 27 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |