diff options
author | lbsa71 | 2007-03-16 15:19:32 +0000 |
---|---|---|
committer | lbsa71 | 2007-03-16 15:19:32 +0000 |
commit | c71cdbe46ea3bbd5a6e147d92ea9098f9c15ead5 (patch) | |
tree | e02c4f0da69bc98d7159e57f22ff7b36d8c31406 | |
parent | (no commit message) (diff) | |
download | opensim-SC_OLD-c71cdbe46ea3bbd5a6e147d92ea9098f9c15ead5.zip opensim-SC_OLD-c71cdbe46ea3bbd5a6e147d92ea9098f9c15ead5.tar.gz opensim-SC_OLD-c71cdbe46ea3bbd5a6e147d92ea9098f9c15ead5.tar.bz2 opensim-SC_OLD-c71cdbe46ea3bbd5a6e147d92ea9098f9c15ead5.tar.xz |
Added Framework Project and Made buildfiles work on windows.
* added nogenvers target to opensim.build - sets version to 0.0.0.1
* extracted core_build target
* FIX : csc gets confused over System.Xml ref - should be System.Xml.dll as there is a System.Xml file in same dir.
* Added OpenGrid.Framework project for great justice.
* Added LoginService as base class for LoginServer (GF)
* FIX: Plugins default.build now creates target dir, otherwise it fails.
* Added VERSION file to source control - it really should be circumvented as well.
28 files changed, 382 insertions, 227 deletions
@@ -27,3 +27,8 @@ secondlife.exe -loginuri http://localhost:8080/ | |||
27 | 27 | ||
28 | * cd to bin/ and run "mono OpenSim.exe -sandbox -loginserver" | 28 | * cd to bin/ and run "mono OpenSim.exe -sandbox -loginserver" |
29 | 29 | ||
30 | === Windows Nant Build === | ||
31 | |||
32 | * same as Linux/mono build, but use | ||
33 | nant nogenvers | ||
34 | to cicumvent bash invokation | ||
@@ -0,0 +1 @@ | |||
0.0.0.1 \ No newline at end of file | |||
diff --git a/opensim.build b/opensim.build index a08a486..cb692dc 100644 --- a/opensim.build +++ b/opensim.build | |||
@@ -16,11 +16,23 @@ | |||
16 | <target name="upgrade" description="updates from SVN and then builds" depends="clean,svnupdate,build"> | 16 | <target name="upgrade" description="updates from SVN and then builds" depends="clean,svnupdate,build"> |
17 | 17 | ||
18 | </target> | 18 | </target> |
19 | |||
20 | <target name="build" description="compiles the source code"> | ||
21 | 19 | ||
22 | <exec program="genvers.sh" /> | 20 | <target name="genvers"> |
23 | <loadfile file="VERSION" property="svnver"/> | 21 | <exec program="genvers.sh" /> |
22 | <loadfile file="VERSION" property="svnver"/> | ||
23 | </target> | ||
24 | |||
25 | <target name="setvers"> | ||
26 | <property name="svnver" value="0.0.0.1" /> | ||
27 | </target> | ||
28 | |||
29 | <target name="build" description="compiles the source code" depends="genvers, core_build"> | ||
30 | </target> | ||
31 | |||
32 | <target name="nogenvers" description="compiles the source code" depends="setvers, core_build"> | ||
33 | </target> | ||
34 | |||
35 | <target name="core_build" description="compiles the source code"> | ||
24 | 36 | ||
25 | <asminfo output="src/AssemblyInfo.cs" language="CSharp"> | 37 | <asminfo output="src/AssemblyInfo.cs" language="CSharp"> |
26 | <imports> | 38 | <imports> |
@@ -41,20 +53,22 @@ | |||
41 | <nant> | 53 | <nant> |
42 | <buildfiles> | 54 | <buildfiles> |
43 | <include name="src/GridInterfaces/default.build" /> | 55 | <include name="src/GridInterfaces/default.build" /> |
56 | <include name="src/OpenGrid.Framework/default.build" /> | ||
44 | <include name="src/ServerConsole/default.build" /> | 57 | <include name="src/ServerConsole/default.build" /> |
45 | <include name="src/LocalServers/default.build" /> | 58 | <include name="src/LocalServers/default.build" /> |
46 | <include name="src/RemoteServers/default.build" /> | 59 | <include name="src/RemoteServers/default.build" /> |
47 | <include name="src/physics/default.build" /> | 60 | <include name="src/physics/default.build" /> |
48 | <include name="src/physics/plugins/default.build" /> | 61 | <include name="src/physics/plugins/default.build" /> |
49 | <include name="src/LocalStorage/default.build" /> | 62 | <include name="src/LocalStorage/default.build" /> |
63 | <include name="src/OpenGrid.Framework/default.build" /> | ||
50 | </buildfiles> | 64 | </buildfiles> |
51 | </nant> | 65 | </nant> |
52 | 66 | ||
53 | <csc target="exe" output="bin/OpenSim.exe" debug="${debug}" verbose="true" warninglevel="4"> | 67 | <csc target="exe" output="bin/OpenSim.exe" debug="${debug}" verbose="true" warninglevel="4"> |
54 | <references basedir="bin/" failonempty="true"> | 68 | <references basedir="bin/" failonempty="true"> |
55 | <include name="System" /> | 69 | <include name="System.dll" /> |
56 | <include name="System.Data" /> | 70 | <include name="System.Data.dll" /> |
57 | <include name="System.Xml" /> | 71 | <include name="System.Xml.dll" /> |
58 | <include name="Axiom.MathLib.dll" /> | 72 | <include name="Axiom.MathLib.dll" /> |
59 | <include name="libsecondlife.dll" /> | 73 | <include name="libsecondlife.dll" /> |
60 | <include name="log4net.dll" /> | 74 | <include name="log4net.dll" /> |
@@ -62,6 +76,7 @@ | |||
62 | <include name="ServerConsole.dll" /> | 76 | <include name="ServerConsole.dll" /> |
63 | <include name="GridInterfaces.dll" /> | 77 | <include name="GridInterfaces.dll" /> |
64 | <include name="PhysicsManager.dll" /> | 78 | <include name="PhysicsManager.dll" /> |
79 | <include name="OpenGrid.Framework.dll" /> | ||
65 | </references> | 80 | </references> |
66 | <sources basedir="src/"> | 81 | <sources basedir="src/"> |
67 | <include name="*.cs" /> | 82 | <include name="*.cs" /> |
diff --git a/src/AssemblyInfo.cs b/src/AssemblyInfo.cs new file mode 100644 index 0000000..b88eb75 --- /dev/null +++ b/src/AssemblyInfo.cs | |||
@@ -0,0 +1,21 @@ | |||
1 | using System; | ||
2 | using System.Reflection; | ||
3 | using System.Runtime.InteropServices; | ||
4 | |||
5 | //------------------------------------------------------------------------------ | ||
6 | // <auto-generated> | ||
7 | // This code was generated by a tool. | ||
8 | // Runtime Version:2.0.50727.42 | ||
9 | // | ||
10 | // Changes to this file may cause incorrect behavior and will be lost if | ||
11 | // the code is regenerated. | ||
12 | // </auto-generated> | ||
13 | //------------------------------------------------------------------------------ | ||
14 | |||
15 | [assembly: ComVisibleAttribute(false)] | ||
16 | [assembly: CLSCompliantAttribute(false)] | ||
17 | [assembly: AssemblyVersionAttribute("0.0.0.1")] | ||
18 | [assembly: AssemblyTitleAttribute("opensim")] | ||
19 | [assembly: AssemblyDescriptionAttribute("The C# implementation of the simulator portion of OGS")] | ||
20 | [assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] | ||
21 | |||
diff --git a/src/Config/SimConfig/AssemblyInfo.cs b/src/Config/SimConfig/AssemblyInfo.cs index 96c3e73..f808f4c 100644 --- a/src/Config/SimConfig/AssemblyInfo.cs +++ b/src/Config/SimConfig/AssemblyInfo.cs | |||
@@ -1,31 +1,21 @@ | |||
1 | using System; | ||
1 | using System.Reflection; | 2 | using System.Reflection; |
2 | using System.Runtime.CompilerServices; | ||
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | 4 | ||
5 | // Information about this assembly is defined by the following | 5 | //------------------------------------------------------------------------------ |
6 | // attributes. | 6 | // <auto-generated> |
7 | // This code was generated by a tool. | ||
8 | // Runtime Version:2.0.50727.42 | ||
7 | // | 9 | // |
8 | // change them to the information which is associated with the assembly | 10 | // Changes to this file may cause incorrect behavior and will be lost if |
9 | // you compile. | 11 | // the code is regenerated. |
12 | // </auto-generated> | ||
13 | //------------------------------------------------------------------------------ | ||
10 | 14 | ||
11 | [assembly: AssemblyTitle("SimConfig")] | 15 | [assembly: ComVisibleAttribute(false)] |
12 | [assembly: AssemblyDescription("")] | 16 | [assembly: CLSCompliantAttribute(false)] |
13 | [assembly: AssemblyConfiguration("")] | 17 | [assembly: AssemblyVersionAttribute("0.0.0.1")] |
14 | [assembly: AssemblyCompany("")] | 18 | [assembly: AssemblyTitleAttribute("opensim-simconfig")] |
15 | [assembly: AssemblyProduct("SimConfig")] | 19 | [assembly: AssemblyDescriptionAttribute("The default configuration handler")] |
16 | [assembly: AssemblyCopyright("")] | 20 | [assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] |
17 | [assembly: AssemblyTrademark("")] | ||
18 | [assembly: AssemblyCulture("")] | ||
19 | 21 | ||
20 | // This sets the default COM visibility of types in the assembly to invisible. | ||
21 | // If you need to expose a type to COM, use [ComVisible(true)] on that type. | ||
22 | [assembly: ComVisible(false)] | ||
23 | |||
24 | // The assembly version has following format : | ||
25 | // | ||
26 | // Major.Minor.Build.Revision | ||
27 | // | ||
28 | // You can specify all values by your own or you can build default build and revision | ||
29 | // numbers with the '*' character (the default): | ||
30 | |||
31 | [assembly: AssemblyVersion("1.0.*")] | ||
diff --git a/src/Config/default.build b/src/Config/default.build index 2ee0c52..9e13ca6 100644 --- a/src/Config/default.build +++ b/src/Config/default.build | |||
@@ -37,10 +37,11 @@ | |||
37 | 37 | ||
38 | <csc target="library" output="../../bin/SimConfig.dll" debug="${debug}" verbose="true" warninglevel="4"> | 38 | <csc target="library" output="../../bin/SimConfig.dll" debug="${debug}" verbose="true" warninglevel="4"> |
39 | <references basedir="../../bin/" failonempty="true"> | 39 | <references basedir="../../bin/" failonempty="true"> |
40 | <include name="System" /> | 40 | <include name="System.dll" /> |
41 | <include name="System.Data" /> | 41 | <include name="System.Data.dll" /> |
42 | <include name="System.Xml" /> | 42 | <include name="System.Xml.dll" /> |
43 | <include name="ServerConsole.dll" /> | 43 | <include name="ServerConsole.dll" /> |
44 | <include name="GridInterfaces.dll" /> | ||
44 | <include name="OpenSim.exe" /> | 45 | <include name="OpenSim.exe" /> |
45 | <include name="Db4objects.Db4o.dll" /> | 46 | <include name="Db4objects.Db4o.dll" /> |
46 | </references> | 47 | </references> |
diff --git a/src/GridInterfaces/AssemblyInfo.cs b/src/GridInterfaces/AssemblyInfo.cs index 89731a1..0ff408f 100644 --- a/src/GridInterfaces/AssemblyInfo.cs +++ b/src/GridInterfaces/AssemblyInfo.cs | |||
@@ -1,31 +1,21 @@ | |||
1 | using System; | ||
1 | using System.Reflection; | 2 | using System.Reflection; |
2 | using System.Runtime.CompilerServices; | ||
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | 4 | ||
5 | // Information about this assembly is defined by the following | 5 | //------------------------------------------------------------------------------ |
6 | // attributes. | 6 | // <auto-generated> |
7 | // This code was generated by a tool. | ||
8 | // Runtime Version:2.0.50727.42 | ||
7 | // | 9 | // |
8 | // change them to the information which is associated with the assembly | 10 | // Changes to this file may cause incorrect behavior and will be lost if |
9 | // you compile. | 11 | // the code is regenerated. |
12 | // </auto-generated> | ||
13 | //------------------------------------------------------------------------------ | ||
10 | 14 | ||
11 | [assembly: AssemblyTitle("GridInterfaces")] | 15 | [assembly: ComVisibleAttribute(false)] |
12 | [assembly: AssemblyDescription("")] | 16 | [assembly: CLSCompliantAttribute(false)] |
13 | [assembly: AssemblyConfiguration("")] | 17 | [assembly: AssemblyVersionAttribute("0.0.0.1")] |
14 | [assembly: AssemblyCompany("")] | 18 | [assembly: AssemblyTitleAttribute("opensim-gridinterfaces")] |
15 | [assembly: AssemblyProduct("GridInterfaces")] | 19 | [assembly: AssemblyDescriptionAttribute("Definitions for OGS interface")] |
16 | [assembly: AssemblyCopyright("")] | 20 | [assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] |
17 | [assembly: AssemblyTrademark("")] | ||
18 | [assembly: AssemblyCulture("")] | ||
19 | 21 | ||
20 | // This sets the default COM visibility of types in the assembly to invisible. | ||
21 | // If you need to expose a type to COM, use [ComVisible(true)] on that type. | ||
22 | [assembly: ComVisible(false)] | ||
23 | |||
24 | // The assembly version has following format : | ||
25 | // | ||
26 | // Major.Minor.Build.Revision | ||
27 | // | ||
28 | // You can specify all values by your own or you can build default build and revision | ||
29 | // numbers with the '*' character (the default): | ||
30 | |||
31 | [assembly: AssemblyVersion("1.0.*")] | ||
diff --git a/src/GridInterfaces/default.build b/src/GridInterfaces/default.build index f29f108..a1de6e5 100644 --- a/src/GridInterfaces/default.build +++ b/src/GridInterfaces/default.build | |||
@@ -37,8 +37,9 @@ | |||
37 | 37 | ||
38 | <csc target="library" output="../../bin/GridInterfaces.dll" debug="${debug}" verbose="true" warninglevel="4"> | 38 | <csc target="library" output="../../bin/GridInterfaces.dll" debug="${debug}" verbose="true" warninglevel="4"> |
39 | <references basedir="../../bin" failonempty="true"> | 39 | <references basedir="../../bin" failonempty="true"> |
40 | <include name="System" /> | 40 | <include name="System.dll" /> |
41 | <include name="System.Xml" /> | 41 | <include name="System.Xml.dll" /> |
42 | <include name="OpenGrid.Framework.dll" /> | ||
42 | <include name="libsecondlife.dll" /> | 43 | <include name="libsecondlife.dll" /> |
43 | </references> | 44 | </references> |
44 | <sources basedir="./"> | 45 | <sources basedir="./"> |
diff --git a/src/GridServers/LoginServer.cs b/src/GridServers/LoginServer.cs index f63e077..f96b9f9 100644 --- a/src/GridServers/LoginServer.cs +++ b/src/GridServers/LoginServer.cs | |||
@@ -38,6 +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 | 42 | ||
42 | namespace OpenSim.GridServers | 43 | namespace OpenSim.GridServers |
43 | { | 44 | { |
@@ -45,7 +46,7 @@ namespace OpenSim.GridServers | |||
45 | /// <summary> | 46 | /// <summary> |
46 | /// When running in local (default) mode , handles client logins. | 47 | /// When running in local (default) mode , handles client logins. |
47 | /// </summary> | 48 | /// </summary> |
48 | public class LoginServer | 49 | public class LoginServer : LoginService |
49 | { | 50 | { |
50 | public LoginServer(IGridServer gridServer) | 51 | public LoginServer(IGridServer gridServer) |
51 | { | 52 | { |
diff --git a/src/LocalServers/LocalGridServers/AssemblyInfo.cs b/src/LocalServers/LocalGridServers/AssemblyInfo.cs index 103b49a..3ca41e4 100644 --- a/src/LocalServers/LocalGridServers/AssemblyInfo.cs +++ b/src/LocalServers/LocalGridServers/AssemblyInfo.cs | |||
@@ -1,31 +1,21 @@ | |||
1 | using System; | ||
1 | using System.Reflection; | 2 | using System.Reflection; |
2 | using System.Runtime.CompilerServices; | ||
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | 4 | ||
5 | // Information about this assembly is defined by the following | 5 | //------------------------------------------------------------------------------ |
6 | // attributes. | 6 | // <auto-generated> |
7 | // This code was generated by a tool. | ||
8 | // Runtime Version:2.0.50727.42 | ||
7 | // | 9 | // |
8 | // change them to the information which is associated with the assembly | 10 | // Changes to this file may cause incorrect behavior and will be lost if |
9 | // you compile. | 11 | // the code is regenerated. |
12 | // </auto-generated> | ||
13 | //------------------------------------------------------------------------------ | ||
10 | 14 | ||
11 | [assembly: AssemblyTitle("LocalGridServers")] | 15 | [assembly: ComVisibleAttribute(false)] |
12 | [assembly: AssemblyDescription("")] | 16 | [assembly: CLSCompliantAttribute(false)] |
13 | [assembly: AssemblyConfiguration("")] | 17 | [assembly: AssemblyVersionAttribute("0.0.0.1")] |
14 | [assembly: AssemblyCompany("")] | 18 | [assembly: AssemblyTitleAttribute("opensim-localservers")] |
15 | [assembly: AssemblyProduct("LocalGridServers")] | 19 | [assembly: AssemblyDescriptionAttribute("local grid servers")] |
16 | [assembly: AssemblyCopyright("")] | 20 | [assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] |
17 | [assembly: AssemblyTrademark("")] | ||
18 | [assembly: AssemblyCulture("")] | ||
19 | 21 | ||
20 | // This sets the default COM visibility of types in the assembly to invisible. | ||
21 | // If you need to expose a type to COM, use [ComVisible(true)] on that type. | ||
22 | [assembly: ComVisible(false)] | ||
23 | |||
24 | // The assembly version has following format : | ||
25 | // | ||
26 | // Major.Minor.Build.Revision | ||
27 | // | ||
28 | // You can specify all values by your own or you can build default build and revision | ||
29 | // numbers with the '*' character (the default): | ||
30 | |||
31 | [assembly: AssemblyVersion("1.0.*")] | ||
diff --git a/src/LocalServers/default.build b/src/LocalServers/default.build index 06bfcaa..14c52cd 100644 --- a/src/LocalServers/default.build +++ b/src/LocalServers/default.build | |||
@@ -37,8 +37,8 @@ | |||
37 | 37 | ||
38 | <csc target="library" output="../../bin/LocalGridServers.dll" debug="${debug}" verbose="true" warninglevel="4"> | 38 | <csc target="library" output="../../bin/LocalGridServers.dll" debug="${debug}" verbose="true" warninglevel="4"> |
39 | <references basedir="../../bin" failonempty="true"> | 39 | <references basedir="../../bin" failonempty="true"> |
40 | <include name="System" /> | 40 | <include name="System.dll" /> |
41 | <include name="System.Xml" /> | 41 | <include name="System.Xml.dll" /> |
42 | <include name="libsecondlife.dll" /> | 42 | <include name="libsecondlife.dll" /> |
43 | <include name="GridInterfaces.dll" /> | 43 | <include name="GridInterfaces.dll" /> |
44 | <include name="ServerConsole.dll" /> | 44 | <include name="ServerConsole.dll" /> |
diff --git a/src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs b/src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs index 6610606..79ad036 100644 --- a/src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs +++ b/src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs | |||
@@ -1,31 +1,21 @@ | |||
1 | using System; | ||
1 | using System.Reflection; | 2 | using System.Reflection; |
2 | using System.Runtime.CompilerServices; | ||
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | 4 | ||
5 | // Information about this assembly is defined by the following | 5 | //------------------------------------------------------------------------------ |
6 | // attributes. | 6 | // <auto-generated> |
7 | // This code was generated by a tool. | ||
8 | // Runtime Version:2.0.50727.42 | ||
7 | // | 9 | // |
8 | // change them to the information which is associated with the assembly | 10 | // Changes to this file may cause incorrect behavior and will be lost if |
9 | // you compile. | 11 | // the code is regenerated. |
12 | // </auto-generated> | ||
13 | //------------------------------------------------------------------------------ | ||
10 | 14 | ||
11 | [assembly: AssemblyTitle("Db4LocalStorage")] | 15 | [assembly: ComVisibleAttribute(false)] |
12 | [assembly: AssemblyDescription("")] | 16 | [assembly: CLSCompliantAttribute(false)] |
13 | [assembly: AssemblyConfiguration("")] | 17 | [assembly: AssemblyVersionAttribute("0.0.0.1")] |
14 | [assembly: AssemblyCompany("")] | 18 | [assembly: AssemblyTitleAttribute("opensim-localstorage")] |
15 | [assembly: AssemblyProduct("Db4LocalStorage")] | 19 | [assembly: AssemblyDescriptionAttribute("The local storage handler")] |
16 | [assembly: AssemblyCopyright("")] | 20 | [assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] |
17 | [assembly: AssemblyTrademark("")] | ||
18 | [assembly: AssemblyCulture("")] | ||
19 | 21 | ||
20 | // This sets the default COM visibility of types in the assembly to invisible. | ||
21 | // If you need to expose a type to COM, use [ComVisible(true)] on that type. | ||
22 | [assembly: ComVisible(false)] | ||
23 | |||
24 | // The assembly version has following format : | ||
25 | // | ||
26 | // Major.Minor.Build.Revision | ||
27 | // | ||
28 | // You can specify all values by your own or you can build default build and revision | ||
29 | // numbers with the '*' character (the default): | ||
30 | |||
31 | [assembly: AssemblyVersion("1.0.*")] | ||
diff --git a/src/LocalStorage/default.build b/src/LocalStorage/default.build index e40eae7..5ed183e 100644 --- a/src/LocalStorage/default.build +++ b/src/LocalStorage/default.build | |||
@@ -37,9 +37,9 @@ | |||
37 | 37 | ||
38 | <csc target="library" output="../../bin/Db4LocalStorage.dll" debug="${debug}" verbose="true" warninglevel="4"> | 38 | <csc target="library" output="../../bin/Db4LocalStorage.dll" debug="${debug}" verbose="true" warninglevel="4"> |
39 | <references basedir="../../bin/" failonempty="true"> | 39 | <references basedir="../../bin/" failonempty="true"> |
40 | <include name="System" /> | 40 | <include name="System.dll" /> |
41 | <include name="System.Data" /> | 41 | <include name="System.Data.dll" /> |
42 | <include name="System.Xml" /> | 42 | <include name="System.Xml.dll" /> |
43 | <include name="libsecondlife.dll" /> | 43 | <include name="libsecondlife.dll" /> |
44 | <include name="GridInterfaces.dll" /> | 44 | <include name="GridInterfaces.dll" /> |
45 | <include name="ServerConsole.dll" /> | 45 | <include name="ServerConsole.dll" /> |
diff --git a/src/OpenGrid.Framework/AssemblyInfo.cs b/src/OpenGrid.Framework/AssemblyInfo.cs new file mode 100644 index 0000000..0ff408f --- /dev/null +++ b/src/OpenGrid.Framework/AssemblyInfo.cs | |||
@@ -0,0 +1,21 @@ | |||
1 | using System; | ||
2 | using System.Reflection; | ||
3 | using System.Runtime.InteropServices; | ||
4 | |||
5 | //------------------------------------------------------------------------------ | ||
6 | // <auto-generated> | ||
7 | // This code was generated by a tool. | ||
8 | // Runtime Version:2.0.50727.42 | ||
9 | // | ||
10 | // Changes to this file may cause incorrect behavior and will be lost if | ||
11 | // the code is regenerated. | ||
12 | // </auto-generated> | ||
13 | //------------------------------------------------------------------------------ | ||
14 | |||
15 | [assembly: ComVisibleAttribute(false)] | ||
16 | [assembly: CLSCompliantAttribute(false)] | ||
17 | [assembly: AssemblyVersionAttribute("0.0.0.1")] | ||
18 | [assembly: AssemblyTitleAttribute("opensim-gridinterfaces")] | ||
19 | [assembly: AssemblyDescriptionAttribute("Definitions for OGS interface")] | ||
20 | [assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] | ||
21 | |||
diff --git a/src/OpenGrid.Framework/LoginService.cs b/src/OpenGrid.Framework/LoginService.cs new file mode 100644 index 0000000..d38c271 --- /dev/null +++ b/src/OpenGrid.Framework/LoginService.cs | |||
@@ -0,0 +1,15 @@ | |||
1 | using System; | ||
2 | using System.Collections; | ||
3 | using System.Collections.Generic; | ||
4 | using System.Text; | ||
5 | using Nwc.XmlRpc; | ||
6 | using OpenSim.GridServers; | ||
7 | using libsecondlife; | ||
8 | |||
9 | namespace OpenGrid.Framework | ||
10 | { | ||
11 | public abstract class LoginService | ||
12 | { | ||
13 | |||
14 | } | ||
15 | } | ||
diff --git a/src/OpenGrid.Framework/OpenGrid.Framework.csproj b/src/OpenGrid.Framework/OpenGrid.Framework.csproj new file mode 100644 index 0000000..efbbcfb --- /dev/null +++ b/src/OpenGrid.Framework/OpenGrid.Framework.csproj | |||
@@ -0,0 +1,57 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
2 | <PropertyGroup> | ||
3 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
4 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
5 | <ProductVersion>8.0.50727</ProductVersion> | ||
6 | <SchemaVersion>2.0</SchemaVersion> | ||
7 | <ProjectGuid>{407CE85B-628C-4788-9DBC-49BCEFC3A84F}</ProjectGuid> | ||
8 | <OutputType>Library</OutputType> | ||
9 | <AppDesignerFolder>Properties</AppDesignerFolder> | ||
10 | <RootNamespace>OpenGrid.Framework</RootNamespace> | ||
11 | <AssemblyName>OpenGrid.Framework</AssemblyName> | ||
12 | </PropertyGroup> | ||
13 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> | ||
14 | <DebugSymbols>true</DebugSymbols> | ||
15 | <DebugType>full</DebugType> | ||
16 | <Optimize>false</Optimize> | ||
17 | <OutputPath>bin\Debug\</OutputPath> | ||
18 | <DefineConstants>DEBUG;TRACE</DefineConstants> | ||
19 | <ErrorReport>prompt</ErrorReport> | ||
20 | <WarningLevel>4</WarningLevel> | ||
21 | </PropertyGroup> | ||
22 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
23 | <DebugType>pdbonly</DebugType> | ||
24 | <Optimize>true</Optimize> | ||
25 | <OutputPath>bin\Release\</OutputPath> | ||
26 | <DefineConstants>TRACE</DefineConstants> | ||
27 | <ErrorReport>prompt</ErrorReport> | ||
28 | <WarningLevel>4</WarningLevel> | ||
29 | </PropertyGroup> | ||
30 | <ItemGroup> | ||
31 | <Reference Include="libsecondlife, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
32 | <SpecificVersion>False</SpecificVersion> | ||
33 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> | ||
34 | </Reference> | ||
35 | <Reference Include="System" /> | ||
36 | <Reference Include="System.Data" /> | ||
37 | <Reference Include="System.Xml" /> | ||
38 | </ItemGroup> | ||
39 | <ItemGroup> | ||
40 | <Compile Include="LoginService.cs" /> | ||
41 | <Compile Include="Properties\AssemblyInfo.cs" /> | ||
42 | </ItemGroup> | ||
43 | <ItemGroup> | ||
44 | <ProjectReference Include="..\GridInterfaces\GridInterfaces.csproj"> | ||
45 | <Project>{5DA3174D-42F9-416D-9F0B-AF41FA2BE2F9}</Project> | ||
46 | <Name>GridInterfaces</Name> | ||
47 | </ProjectReference> | ||
48 | </ItemGroup> | ||
49 | <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> | ||
50 | <!-- To modify your build process, add your task inside one of the targets below and uncomment it. | ||
51 | Other similar extension points exist, see Microsoft.Common.targets. | ||
52 | <Target Name="BeforeBuild"> | ||
53 | </Target> | ||
54 | <Target Name="AfterBuild"> | ||
55 | </Target> | ||
56 | --> | ||
57 | </Project> \ No newline at end of file | ||
diff --git a/src/OpenGrid.Framework/Properties/AssemblyInfo.cs b/src/OpenGrid.Framework/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..72e55b9 --- /dev/null +++ b/src/OpenGrid.Framework/Properties/AssemblyInfo.cs | |||
@@ -0,0 +1,35 @@ | |||
1 | using System.Reflection; | ||
2 | using System.Runtime.CompilerServices; | ||
3 | using System.Runtime.InteropServices; | ||
4 | |||
5 | // General Information about an assembly is controlled through the following | ||
6 | // set of attributes. Change these attribute values to modify the information | ||
7 | // associated with an assembly. | ||
8 | [assembly: AssemblyTitle("OpenGrid.Framework")] | ||
9 | [assembly: AssemblyDescription("")] | ||
10 | [assembly: AssemblyConfiguration("")] | ||
11 | [assembly: AssemblyCompany("Playahead AB")] | ||
12 | [assembly: AssemblyProduct("OpenGrid.Framework")] | ||
13 | [assembly: AssemblyCopyright("Copyright © Playahead AB 2007")] | ||
14 | [assembly: AssemblyTrademark("")] | ||
15 | [assembly: AssemblyCulture("")] | ||
16 | |||
17 | // Setting ComVisible to false makes the types in this assembly not visible | ||
18 | // to COM components. If you need to access a type in this assembly from | ||
19 | // COM, set the ComVisible attribute to true on that type. | ||
20 | [assembly: ComVisible(false)] | ||
21 | |||
22 | // The following GUID is for the ID of the typelib if this project is exposed to COM | ||
23 | [assembly: Guid("67d2b810-0969-4550-ab2b-d2f5ac191191")] | ||
24 | |||
25 | // Version information for an assembly consists of the following four values: | ||
26 | // | ||
27 | // Major Version | ||
28 | // Minor Version | ||
29 | // Build Number | ||
30 | // Revision | ||
31 | // | ||
32 | // You can specify all the values or you can default the Revision and Build Numbers | ||
33 | // by using the '*' as shown below: | ||
34 | [assembly: AssemblyVersion("1.0.0.0")] | ||
35 | [assembly: AssemblyFileVersion("1.0.0.0")] | ||
diff --git a/src/OpenGrid.Framework/default.build b/src/OpenGrid.Framework/default.build new file mode 100644 index 0000000..ee398a0 --- /dev/null +++ b/src/OpenGrid.Framework/default.build | |||
@@ -0,0 +1,50 @@ | |||
1 | <?xml version="1.0"?> | ||
2 | <project name="OpenGrid.Framework" default="build" basedir="."> | ||
3 | <description>nant buildfile for OpenGrid.Framework</description> | ||
4 | <property name="debug" value="true" overwrite="false" /> | ||
5 | <target name="clean" description="remove all generated files"> | ||
6 | <delete file="../../bin/OpenGrid.Framework.dll" failonerror="false" /> | ||
7 | </target> | ||
8 | |||
9 | <target name="svnupdate" description="updates to latest SVN"> | ||
10 | <exec program="svn"> | ||
11 | <arg value="update" /> | ||
12 | </exec> | ||
13 | </target> | ||
14 | |||
15 | <target name="upgrade" description="updates from SVN and then builds" depends="clean,svnupdate,build"> | ||
16 | |||
17 | </target> | ||
18 | |||
19 | <target name="build" description="compiles the source code"> | ||
20 | |||
21 | <loadfile file="../../VERSION" property="svnver"/> | ||
22 | <asminfo output="AssemblyInfo.cs" language="CSharp"> | ||
23 | <imports> | ||
24 | <import namespace="System" /> | ||
25 | <import namespace="System.Reflection" /> | ||
26 | <import namespace="System.Runtime.InteropServices" /> | ||
27 | </imports> | ||
28 | <attributes> | ||
29 | <attribute type="ComVisibleAttribute" value="false" /> | ||
30 | <attribute type="CLSCompliantAttribute" value="false" /> | ||
31 | <attribute type="AssemblyVersionAttribute" value="${svnver}" /> | ||
32 | <attribute type="AssemblyTitleAttribute" value="opensim-gridinterfaces" /> | ||
33 | <attribute type="AssemblyDescriptionAttribute" value="Definitions for OGS interface" /> | ||
34 | <attribute type="AssemblyCopyrightAttribute" value="Copyright © OGS development team 2007"/> | ||
35 | </attributes> | ||
36 | </asminfo> | ||
37 | |||
38 | <csc target="library" output="../../bin/OpenGrid.Framework.dll" debug="${debug}" verbose="true" warninglevel="4"> | ||
39 | <references basedir="../../bin" failonempty="true"> | ||
40 | <include name="System.dll" /> | ||
41 | <include name="System.Xml.dll" /> | ||
42 | <include name="libsecondlife.dll" /> | ||
43 | <include name="GridInterfaces.dll" /> | ||
44 | </references> | ||
45 | <sources basedir="./"> | ||
46 | <include name="*.cs" /> | ||
47 | </sources> | ||
48 | </csc> | ||
49 | </target> | ||
50 | </project> | ||
diff --git a/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs b/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs index 0fa7d6e..4e8fb00 100644 --- a/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs +++ b/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs | |||
@@ -1,31 +1,21 @@ | |||
1 | using System; | ||
1 | using System.Reflection; | 2 | using System.Reflection; |
2 | using System.Runtime.CompilerServices; | ||
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | 4 | ||
5 | // Information about this assembly is defined by the following | 5 | //------------------------------------------------------------------------------ |
6 | // attributes. | 6 | // <auto-generated> |
7 | // This code was generated by a tool. | ||
8 | // Runtime Version:2.0.50727.42 | ||
7 | // | 9 | // |
8 | // change them to the information which is associated with the assembly | 10 | // Changes to this file may cause incorrect behavior and will be lost if |
9 | // you compile. | 11 | // the code is regenerated. |
12 | // </auto-generated> | ||
13 | //------------------------------------------------------------------------------ | ||
10 | 14 | ||
11 | [assembly: AssemblyTitle("RemoteGridServers")] | 15 | [assembly: ComVisibleAttribute(false)] |
12 | [assembly: AssemblyDescription("")] | 16 | [assembly: CLSCompliantAttribute(false)] |
13 | [assembly: AssemblyConfiguration("")] | 17 | [assembly: AssemblyVersionAttribute("0.0.0.1")] |
14 | [assembly: AssemblyCompany("")] | 18 | [assembly: AssemblyTitleAttribute("opensim-remoteservers")] |
15 | [assembly: AssemblyProduct("RemoteGridServers")] | 19 | [assembly: AssemblyDescriptionAttribute("Connects to remote OGS installation")] |
16 | [assembly: AssemblyCopyright("")] | 20 | [assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] |
17 | [assembly: AssemblyTrademark("")] | ||
18 | [assembly: AssemblyCulture("")] | ||
19 | 21 | ||
20 | // This sets the default COM visibility of types in the assembly to invisible. | ||
21 | // If you need to expose a type to COM, use [ComVisible(true)] on that type. | ||
22 | [assembly: ComVisible(false)] | ||
23 | |||
24 | // The assembly version has following format : | ||
25 | // | ||
26 | // Major.Minor.Build.Revision | ||
27 | // | ||
28 | // You can specify all values by your own or you can build default build and revision | ||
29 | // numbers with the '*' character (the default): | ||
30 | |||
31 | [assembly: AssemblyVersion("1.0.*")] | ||
diff --git a/src/RemoteServers/default.build b/src/RemoteServers/default.build index 8819600..f8e6977 100644 --- a/src/RemoteServers/default.build +++ b/src/RemoteServers/default.build | |||
@@ -37,8 +37,8 @@ | |||
37 | 37 | ||
38 | <csc target="library" output="../../bin/RemoteGridServers.dll" debug="${debug}" verbose="true" warninglevel="4"> | 38 | <csc target="library" output="../../bin/RemoteGridServers.dll" debug="${debug}" verbose="true" warninglevel="4"> |
39 | <references basedir="../../bin" failonempty="true"> | 39 | <references basedir="../../bin" failonempty="true"> |
40 | <include name="System" /> | 40 | <include name="System.dll" /> |
41 | <include name="System.Xml" /> | 41 | <include name="System.Xml.dll" /> |
42 | <include name="libsecondlife.dll" /> | 42 | <include name="libsecondlife.dll" /> |
43 | <include name="GridInterfaces.dll" /> | 43 | <include name="GridInterfaces.dll" /> |
44 | <include name="ServerConsole.dll" /> | 44 | <include name="ServerConsole.dll" /> |
diff --git a/src/Second-server.csproj b/src/Second-server.csproj index c4e6ef8..be4a913 100644 --- a/src/Second-server.csproj +++ b/src/Second-server.csproj | |||
@@ -90,6 +90,10 @@ | |||
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"> | ||
94 | <Project>{407CE85B-628C-4788-9DBC-49BCEFC3A84F}</Project> | ||
95 | <Name>OpenGrid.Framework</Name> | ||
96 | </ProjectReference> | ||
93 | <ProjectReference Include="physics\PhysicsManager.csproj"> | 97 | <ProjectReference Include="physics\PhysicsManager.csproj"> |
94 | <Project>{3C86A846-7977-4EE7-A8DC-DD487FA5DC2B}</Project> | 98 | <Project>{3C86A846-7977-4EE7-A8DC-DD487FA5DC2B}</Project> |
95 | <Name>PhysicsManager</Name> | 99 | <Name>PhysicsManager</Name> |
diff --git a/src/ServerConsole/ServerConsole/AssemblyInfo.cs b/src/ServerConsole/ServerConsole/AssemblyInfo.cs index 00a9b7d..99da873 100644 --- a/src/ServerConsole/ServerConsole/AssemblyInfo.cs +++ b/src/ServerConsole/ServerConsole/AssemblyInfo.cs | |||
@@ -1,31 +1,21 @@ | |||
1 | using System; | ||
1 | using System.Reflection; | 2 | using System.Reflection; |
2 | using System.Runtime.CompilerServices; | ||
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | 4 | ||
5 | // Information about this assembly is defined by the following | 5 | //------------------------------------------------------------------------------ |
6 | // attributes. | 6 | // <auto-generated> |
7 | // This code was generated by a tool. | ||
8 | // Runtime Version:2.0.50727.42 | ||
7 | // | 9 | // |
8 | // change them to the information which is associated with the assembly | 10 | // Changes to this file may cause incorrect behavior and will be lost if |
9 | // you compile. | 11 | // the code is regenerated. |
12 | // </auto-generated> | ||
13 | //------------------------------------------------------------------------------ | ||
10 | 14 | ||
11 | [assembly: AssemblyTitle("ServerConsole")] | 15 | [assembly: ComVisibleAttribute(false)] |
12 | [assembly: AssemblyDescription("")] | 16 | [assembly: CLSCompliantAttribute(false)] |
13 | [assembly: AssemblyConfiguration("")] | 17 | [assembly: AssemblyVersionAttribute("0.0.0.1")] |
14 | [assembly: AssemblyCompany("")] | 18 | [assembly: AssemblyTitleAttribute("opensim-serverconsole")] |
15 | [assembly: AssemblyProduct("ServerConsole")] | 19 | [assembly: AssemblyDescriptionAttribute("The default server console")] |
16 | [assembly: AssemblyCopyright("")] | 20 | [assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] |
17 | [assembly: AssemblyTrademark("")] | ||
18 | [assembly: AssemblyCulture("")] | ||
19 | 21 | ||
20 | // This sets the default COM visibility of types in the assembly to invisible. | ||
21 | // If you need to expose a type to COM, use [ComVisible(true)] on that type. | ||
22 | [assembly: ComVisible(false)] | ||
23 | |||
24 | // The assembly version has following format : | ||
25 | // | ||
26 | // Major.Minor.Build.Revision | ||
27 | // | ||
28 | // You can specify all values by your own or you can build default build and revision | ||
29 | // numbers with the '*' character (the default): | ||
30 | |||
31 | [assembly: AssemblyVersion("1.0.*")] | ||
diff --git a/src/ServerConsole/default.build b/src/ServerConsole/default.build index a6f6dc2..0de930a 100644 --- a/src/ServerConsole/default.build +++ b/src/ServerConsole/default.build | |||
@@ -37,8 +37,8 @@ | |||
37 | 37 | ||
38 | <csc target="library" output="../../bin/ServerConsole.dll" debug="${debug}" verbose="true" warninglevel="4"> | 38 | <csc target="library" output="../../bin/ServerConsole.dll" debug="${debug}" verbose="true" warninglevel="4"> |
39 | <references> | 39 | <references> |
40 | <include name="System" /> | 40 | <include name="System.dll" /> |
41 | <include name="System.Xml" /> | 41 | <include name="System.Xml.dll" /> |
42 | </references> | 42 | </references> |
43 | <sources basedir="ServerConsole/"> | 43 | <sources basedir="ServerConsole/"> |
44 | <include name="*.cs" /> | 44 | <include name="*.cs" /> |
diff --git a/src/opensim.sln b/src/opensim.sln index 3f86420..e9951b8 100644 --- a/src/opensim.sln +++ b/src/opensim.sln | |||
@@ -1,6 +1,6 @@ | |||
1 |  | 1 |  |
2 | Microsoft Visual Studio Solution File, Format Version 9.00 | 2 | Microsoft Visual Studio Solution File, Format Version 9.00 |
3 | # Visual C# Express 2005 | 3 | # Visual Studio 2005 |
4 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Second-server", "Second-server.csproj", "{132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}" | 4 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Second-server", "Second-server.csproj", "{132A6E3E-8F2D-4BF5-BDFB-8555F53F334E}" |
5 | EndProject | 5 | EndProject |
6 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GridInterfaces", "GridInterfaces\GridInterfaces.csproj", "{5DA3174D-42F9-416D-9F0B-AF41FA2BE2F9}" | 6 | Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GridInterfaces", "GridInterfaces\GridInterfaces.csproj", "{5DA3174D-42F9-416D-9F0B-AF41FA2BE2F9}" |
@@ -21,6 +21,8 @@ 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}" | ||
25 | EndProject | ||
24 | Global | 26 | Global |
25 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | 27 | GlobalSection(SolutionConfigurationPlatforms) = preSolution |
26 | Debug|Any CPU = Debug|Any CPU | 28 | Debug|Any CPU = Debug|Any CPU |
@@ -67,6 +69,10 @@ Global | |||
67 | {56C1D214-F389-4228-921A-0A3A0712C159}.Debug|Any CPU.Build.0 = Debug|Any CPU | 69 | {56C1D214-F389-4228-921A-0A3A0712C159}.Debug|Any CPU.Build.0 = Debug|Any CPU |
68 | {56C1D214-F389-4228-921A-0A3A0712C159}.Release|Any CPU.ActiveCfg = Release|Any CPU | 70 | {56C1D214-F389-4228-921A-0A3A0712C159}.Release|Any CPU.ActiveCfg = Release|Any CPU |
69 | {56C1D214-F389-4228-921A-0A3A0712C159}.Release|Any CPU.Build.0 = Release|Any CPU | 71 | {56C1D214-F389-4228-921A-0A3A0712C159}.Release|Any CPU.Build.0 = Release|Any CPU |
72 | {407CE85B-628C-4788-9DBC-49BCEFC3A84F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
73 | {407CE85B-628C-4788-9DBC-49BCEFC3A84F}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
74 | {407CE85B-628C-4788-9DBC-49BCEFC3A84F}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
75 | {407CE85B-628C-4788-9DBC-49BCEFC3A84F}.Release|Any CPU.Build.0 = Release|Any CPU | ||
70 | EndGlobalSection | 76 | EndGlobalSection |
71 | GlobalSection(SolutionProperties) = preSolution | 77 | GlobalSection(SolutionProperties) = preSolution |
72 | HideSolutionNode = FALSE | 78 | HideSolutionNode = FALSE |
diff --git a/src/physics/AssemblyInfo.cs b/src/physics/AssemblyInfo.cs index 57a8913..b16bac9 100644 --- a/src/physics/AssemblyInfo.cs +++ b/src/physics/AssemblyInfo.cs | |||
@@ -1,31 +1,21 @@ | |||
1 | using System; | ||
1 | using System.Reflection; | 2 | using System.Reflection; |
2 | using System.Runtime.CompilerServices; | ||
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | 4 | ||
5 | // Information about this assembly is defined by the following | 5 | //------------------------------------------------------------------------------ |
6 | // attributes. | 6 | // <auto-generated> |
7 | // This code was generated by a tool. | ||
8 | // Runtime Version:2.0.50727.42 | ||
7 | // | 9 | // |
8 | // change them to the information which is associated with the assembly | 10 | // Changes to this file may cause incorrect behavior and will be lost if |
9 | // you compile. | 11 | // the code is regenerated. |
12 | // </auto-generated> | ||
13 | //------------------------------------------------------------------------------ | ||
10 | 14 | ||
11 | [assembly: AssemblyTitle("PhysicsManager")] | 15 | [assembly: ComVisibleAttribute(false)] |
12 | [assembly: AssemblyDescription("")] | 16 | [assembly: CLSCompliantAttribute(false)] |
13 | [assembly: AssemblyConfiguration("")] | 17 | [assembly: AssemblyVersionAttribute("0.0.0.1")] |
14 | [assembly: AssemblyCompany("")] | 18 | [assembly: AssemblyTitleAttribute("opensim-physicsmanager")] |
15 | [assembly: AssemblyProduct("PhysicsManager")] | 19 | [assembly: AssemblyDescriptionAttribute("Handles physics plugins")] |
16 | [assembly: AssemblyCopyright("")] | 20 | [assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] |
17 | [assembly: AssemblyTrademark("")] | ||
18 | [assembly: AssemblyCulture("")] | ||
19 | 21 | ||
20 | // This sets the default COM visibility of types in the assembly to invisible. | ||
21 | // If you need to expose a type to COM, use [ComVisible(true)] on that type. | ||
22 | [assembly: ComVisible(false)] | ||
23 | |||
24 | // The assembly version has following format : | ||
25 | // | ||
26 | // Major.Minor.Build.Revision | ||
27 | // | ||
28 | // You can specify all values by your own or you can build default build and revision | ||
29 | // numbers with the '*' character (the default): | ||
30 | |||
31 | [assembly: AssemblyVersion("1.0.*")] | ||
diff --git a/src/physics/default.build b/src/physics/default.build index d39e62b..01d2415 100644 --- a/src/physics/default.build +++ b/src/physics/default.build | |||
@@ -37,8 +37,8 @@ | |||
37 | 37 | ||
38 | <csc target="library" output="../../bin/PhysicsManager.dll" debug="${debug}" verbose="true" warninglevel="4"> | 38 | <csc target="library" output="../../bin/PhysicsManager.dll" debug="${debug}" verbose="true" warninglevel="4"> |
39 | <references basedir="../../bin" failonempty="true"> | 39 | <references basedir="../../bin" failonempty="true"> |
40 | <include name="System" /> | 40 | <include name="System.dll" /> |
41 | <include name="System.Xml" /> | 41 | <include name="System.Xml.dll" /> |
42 | <include name="ServerConsole.dll" /> | 42 | <include name="ServerConsole.dll" /> |
43 | </references> | 43 | </references> |
44 | <sources basedir="./"> | 44 | <sources basedir="./"> |
diff --git a/src/physics/plugins/AssemblyInfo.cs b/src/physics/plugins/AssemblyInfo.cs index 0c9c06c..125d417 100644 --- a/src/physics/plugins/AssemblyInfo.cs +++ b/src/physics/plugins/AssemblyInfo.cs | |||
@@ -1,31 +1,21 @@ | |||
1 | using System; | ||
1 | using System.Reflection; | 2 | using System.Reflection; |
2 | using System.Runtime.CompilerServices; | ||
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | 4 | ||
5 | // Information about this assembly is defined by the following | 5 | //------------------------------------------------------------------------------ |
6 | // attributes. | 6 | // <auto-generated> |
7 | // This code was generated by a tool. | ||
8 | // Runtime Version:2.0.50727.42 | ||
7 | // | 9 | // |
8 | // change them to the information which is associated with the assembly | 10 | // Changes to this file may cause incorrect behavior and will be lost if |
9 | // you compile. | 11 | // the code is regenerated. |
12 | // </auto-generated> | ||
13 | //------------------------------------------------------------------------------ | ||
10 | 14 | ||
11 | [assembly: AssemblyTitle("PhysXplugin")] | 15 | [assembly: ComVisibleAttribute(false)] |
12 | [assembly: AssemblyDescription("")] | 16 | [assembly: CLSCompliantAttribute(false)] |
13 | [assembly: AssemblyConfiguration("")] | 17 | [assembly: AssemblyVersionAttribute("0.0.0.1")] |
14 | [assembly: AssemblyCompany("")] | 18 | [assembly: AssemblyTitleAttribute("opensim-physicsmanager-physx")] |
15 | [assembly: AssemblyProduct("PhysXplugin")] | 19 | [assembly: AssemblyDescriptionAttribute("PhysX plugin for OpenSim")] |
16 | [assembly: AssemblyCopyright("")] | 20 | [assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] |
17 | [assembly: AssemblyTrademark("")] | ||
18 | [assembly: AssemblyCulture("")] | ||
19 | 21 | ||
20 | // This sets the default COM visibility of types in the assembly to invisible. | ||
21 | // If you need to expose a type to COM, use [ComVisible(true)] on that type. | ||
22 | [assembly: ComVisible(false)] | ||
23 | |||
24 | // The assembly version has following format : | ||
25 | // | ||
26 | // Major.Minor.Build.Revision | ||
27 | // | ||
28 | // You can specify all values by your own or you can build default build and revision | ||
29 | // numbers with the '*' character (the default): | ||
30 | |||
31 | [assembly: AssemblyVersion("1.0.*")] | ||
diff --git a/src/physics/plugins/default.build b/src/physics/plugins/default.build index c40fea1..66056a5 100644 --- a/src/physics/plugins/default.build +++ b/src/physics/plugins/default.build | |||
@@ -35,10 +35,12 @@ | |||
35 | </attributes> | 35 | </attributes> |
36 | </asminfo> | 36 | </asminfo> |
37 | 37 | ||
38 | <mkdir dir="../../../bin/Physics"/> | ||
39 | |||
38 | <csc target="library" output="../../../bin/Physics/PhysXplugin.dll" debug="${debug}" verbose="true" warninglevel="4"> | 40 | <csc target="library" output="../../../bin/Physics/PhysXplugin.dll" debug="${debug}" verbose="true" warninglevel="4"> |
39 | <references basedir="../../../bin" failonempty="true"> | 41 | <references basedir="../../../bin" failonempty="true"> |
40 | <include name="System" /> | 42 | <include name="System.dll" /> |
41 | <include name="System.Xml" /> | 43 | <include name="System.Xml.dll" /> |
42 | <include name="PhysicsManager.dll" /> | 44 | <include name="PhysicsManager.dll" /> |
43 | </references> | 45 | </references> |
44 | <sources basedir="./"> | 46 | <sources basedir="./"> |