Moved OpenSim.Region.ScriptEngine.Common.dll from bin\ScriptEngine\ to bin\ folder - hopefully solves compile problem on Linux.

3 files changed, 9 insertions, 6 deletions

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
index c29b9f4..435ee08 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
@@ -59,10 +59,11 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
                 //parameters.ReferencedAssemblies.Add(asm.Location);

             }

 

-            string rootPath = Path.GetDirectoryName(this.GetType().Assembly.Location);

+            string rootPath = Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory);

+            string rootPathSE = Path.GetDirectoryName(this.GetType().Assembly.Location);

             Console.WriteLine("Assembly location: " + rootPath);

             parameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Common.dll"));

-            parameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.DotNetEngine.dll"));

+            parameters.ReferencedAssemblies.Add(Path.Combine(rootPathSE, "OpenSim.Region.ScriptEngine.DotNetEngine.dll"));

             

             //parameters.ReferencedAssemblies.Add("OpenSim.Region.Environment");

             parameters.GenerateExecutable = false;

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
index 2cbdfd3..8e0b277 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs
@@ -35,6 +35,7 @@ using System.Runtime.Remoting;
 using OpenSim.Region.Environment.Scenes;

 using OpenSim.Region.Environment.Scenes.Scripting;

 using OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL;

+using OpenSim.Region.ScriptEngine.Common;

 

 namespace OpenSim.Region.ScriptEngine.DotNetEngine

 {

@@ -227,14 +228,15 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
             //LSL_BaseClass mbrt = (LSL_BaseClass)FreeAppDomain.CreateInstanceAndUnwrap(FileName, "SecondLife.Script");

             Console.WriteLine("Base directory: " + AppDomain.CurrentDomain.BaseDirectory);

 

-            LSL_BaseClass mbrt = (LSL_BaseClass)FreeAppDomain.CreateInstanceFromAndUnwrap(FileName, "SecondLife.Script");

+            //LSL_BaseClass mbrt = (LSL_BaseClass)FreeAppDomain.CreateInstanceFromAndUnwrap(FileName, "SecondLife.Script");

+            LSL_BuiltIn_Commands_Interface mbrt = (LSL_BuiltIn_Commands_Interface)FreeAppDomain.CreateInstanceFromAndUnwrap(FileName, "SecondLife.Script");

             Type mytype = mbrt.GetType();

 

             Console.WriteLine("is proxy={0}", RemotingServices.IsTransparentProxy(mbrt));

 

 

             //mbrt.Start();

-            return mbrt;

+            return (LSL_BaseClass)mbrt;

 

 

 

diff --git a/prebuild.xml b/prebuild.xml
index c358142..71d996b 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -940,12 +940,12 @@
     <Project name="OpenSim.Region.ScriptEngine.Common" path="OpenSim/Region/ScriptEngine/Common" type="Library">
       <Configuration name="Debug">
         <Options>
-          <OutputPath>../../../../bin/ScriptEngines/</OutputPath>
+          <OutputPath>../../../../bin/</OutputPath>
         </Options>
       </Configuration>
       <Configuration name="Release">
         <Options>
-          <OutputPath>../../../../bin/ScriptEngines/</OutputPath>
+          <OutputPath>../../../../bin/</OutputPath>
         </Options>
       </Configuration>