From 7466ef0525f5465596c415684000bd994055b280 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 30 Dec 2014 12:53:31 -0800
Subject: This cleans up versioning. Specifically: - It establishes 4 digits
for opensim versions - It uses the same number between opensim releases and
mono addins versions
It also eliminates the last addin.xml files that were still there, for consistency.
---
OpenSim/Region/Application/Properties/AssemblyInfo.cs | 2 +-
.../Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs | 4 ++--
OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs | 4 ++--
OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | 4 ++--
OpenSim/Region/Framework/Properties/AssemblyInfo.cs | 2 +-
OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs | 4 ++--
.../Region/RegionCombinerModule/Properties/AssemblyInfo.cs | 3 +++
.../RegionCombinerModule/RegionCombinerPermissionModule.cs | 4 +++-
.../Resources/RegionCombinerModule.addin.xml | 14 --------------
.../Region/ScriptEngine/XEngine/Properties/AssemblyInfo.cs | 3 +++
.../ScriptEngine/XEngine/Resources/XEngine.addin.xml | 13 -------------
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 2 ++
OpenSim/Region/UserStatistics/WebStatsModule.cs | 4 ++--
13 files changed, 23 insertions(+), 40 deletions(-)
delete mode 100644 OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml
delete mode 100644 OpenSim/Region/ScriptEngine/XEngine/Resources/XEngine.addin.xml
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/Application/Properties/AssemblyInfo.cs b/OpenSim/Region/Application/Properties/AssemblyInfo.cs
index 3e61575..9d186e8 100644
--- a/OpenSim/Region/Application/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Application/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using Mono.Addins;
//
[assembly: AssemblyVersion("0.8.1.*")]
-[assembly: AddinRoot("OpenSim", "0.8.1")]
+[assembly: AddinRoot("OpenSim", OpenSim.VersionInfo.VERSION_NUMBER)]
[assembly: ImportAddinAssembly("Opensim.Framework.dll")]
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
index b05af22..d7287cc 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCapsModule.cs
@@ -40,8 +40,8 @@ using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using Caps = OpenSim.Framework.Capabilities.Caps;
-[assembly: Addin("LindenCaps", "0.1")]
-[assembly: AddinDependency("OpenSim.Region.Framework", "0.8.1")]
+[assembly: Addin("LindenCaps", OpenSim.VersionInfo.VERSION_NUMBER)]
+[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VERSION_NUMBER)]
namespace OpenSim.Region.ClientStack.Linden
{
diff --git a/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs b/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs
index 8cafa12..03f4b2f 100644
--- a/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/CoreModules/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@ using Mono.Addins;
[assembly: AssemblyVersion("0.8.1.*")]
-[assembly: Addin("OpenSim.Region.CoreModules", "0.1")]
-[assembly: AddinDependency("OpenSim.Region.Framework", "0.8.1")]
+[assembly: Addin("OpenSim.Region.CoreModules", OpenSim.VersionInfo.VERSION_NUMBER)]
+[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VERSION_NUMBER)]
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index 9d3ae5e..4a3f821 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -42,8 +42,8 @@ using OpenSim.Region.DataSnapshot.Interfaces;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
-[assembly: Addin("DataSnapshot", "0.1")]
-[assembly: AddinDependency("OpenSim.Region.Framework", "0.8.1")]
+[assembly: Addin("DataSnapshot", OpenSim.VersionInfo.VERSION_NUMBER)]
+[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VERSION_NUMBER)]
namespace OpenSim.Region.DataSnapshot
{
diff --git a/OpenSim/Region/Framework/Properties/AssemblyInfo.cs b/OpenSim/Region/Framework/Properties/AssemblyInfo.cs
index 6fe2892..1dbe063 100644
--- a/OpenSim/Region/Framework/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/Framework/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using Mono.Addins;
// Revision
//
[assembly: AssemblyVersion("0.8.1.*")]
-[assembly: AddinRoot("OpenSim.Region.Framework", "0.8.1")]
+[assembly: AddinRoot("OpenSim.Region.Framework", OpenSim.VersionInfo.VERSION_NUMBER)]
diff --git a/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs b/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs
index 3f53229..3578266 100644
--- a/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs
@@ -33,5 +33,5 @@ using Mono.Addins;
[assembly: AssemblyVersion("0.8.1.*")]
-[assembly: Addin("OpenSim.Region.OptionalModules", "0.1")]
-[assembly: AddinDependency("OpenSim.Region.Framework", "0.8.1")]
+[assembly: Addin("OpenSim.Region.OptionalModules", OpenSim.VersionInfo.VERSION_NUMBER)]
+[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VERSION_NUMBER)]
diff --git a/OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs b/OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs
index 78bb186..9a07c5e 100644
--- a/OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/RegionCombinerModule/Properties/AssemblyInfo.cs
@@ -1,6 +1,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
+using Mono.Addins;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
@@ -31,3 +32,5 @@ using System.Runtime.InteropServices;
//
[assembly: AssemblyVersion("0.8.1.*")]
+[assembly: Addin("OpenSim.RegionModules.RegionCombinerModule", OpenSim.VersionInfo.VERSION_NUMBER)]
+[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VERSION_NUMBER)]
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs
index 7c662c9..40d6903 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerPermissionModule.cs
@@ -31,10 +31,12 @@ using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
+using Mono.Addins;
namespace OpenSim.Region.RegionCombinerModule
{
- public class RegionCombinerPermissionModule
+ [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RegionCombinerModule")]
+ public class RegionCombinerPermissionModule
{
private Scene m_rootScene;
diff --git a/OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml b/OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml
deleted file mode 100644
index 5891903..0000000
--- a/OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/OpenSim/Region/ScriptEngine/XEngine/Properties/AssemblyInfo.cs b/OpenSim/Region/ScriptEngine/XEngine/Properties/AssemblyInfo.cs
index 12ca3d6..daf73a8 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/Properties/AssemblyInfo.cs
@@ -1,6 +1,7 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
+using Mono.Addins;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
@@ -31,3 +32,5 @@ using System.Runtime.InteropServices;
//
[assembly: AssemblyVersion("0.8.1.*")]
+[assembly: Addin("OpenSim.Region.ScriptEngine.XEngine", OpenSim.VersionInfo.VERSION_NUMBER)]
+[assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VERSION_NUMBER)]
diff --git a/OpenSim/Region/ScriptEngine/XEngine/Resources/XEngine.addin.xml b/OpenSim/Region/ScriptEngine/XEngine/Resources/XEngine.addin.xml
deleted file mode 100644
index eb18bf7..0000000
--- a/OpenSim/Region/ScriptEngine/XEngine/Resources/XEngine.addin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 906c6ee..f87d631 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -42,6 +42,7 @@ using OpenMetaverse.StructuredData;
using log4net;
using Nini.Config;
using Amib.Threading;
+using Mono.Addins;
using OpenSim.Framework;
using OpenSim.Framework.Console;
using OpenSim.Region.Framework.Scenes;
@@ -60,6 +61,7 @@ using ScriptCompileQueue = OpenSim.Framework.LocklessQueue