From f5ca70127347b20f9bfbb81fe777b9a602bfef0d Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 1 Jun 2010 14:19:26 +0100
Subject: Comment and remove JScript support. Mono 2.7Dev and 2.8 no longer
include the needed libraries
---
.../ScriptEngine/Shared/CodeTools/Compiler.cs | 38 +++++++++++-----------
prebuild.xml | 7 ----
2 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index d8c0ba5..959164b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -32,7 +32,7 @@ using System.Globalization;
using System.Reflection;
using System.IO;
using Microsoft.CSharp;
-using Microsoft.JScript;
+//using Microsoft.JScript;
using Microsoft.VisualBasic;
using log4net;
using OpenSim.Region.Framework.Interfaces;
@@ -82,7 +82,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
private static CSharpCodeProvider CScodeProvider = new CSharpCodeProvider();
private static VBCodeProvider VBcodeProvider = new VBCodeProvider();
- private static JScriptCodeProvider JScodeProvider = new JScriptCodeProvider();
+// private static JScriptCodeProvider JScodeProvider = new JScriptCodeProvider();
private static CSharpCodeProvider YPcodeProvider = new CSharpCodeProvider(); // YP is translated into CSharp
private static YP2CSConverter YP_Converter = new YP2CSConverter();
@@ -395,9 +395,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
case enumCompileType.vb:
compileScript = CreateVBCompilerScript(compileScript);
break;
- case enumCompileType.js:
- compileScript = CreateJSCompilerScript(compileScript);
- break;
+// case enumCompileType.js:
+// compileScript = CreateJSCompilerScript(compileScript);
+// break;
case enumCompileType.yp:
compileScript = CreateYPCompilerScript(compileScript);
break;
@@ -420,16 +420,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
}
}
- private static string CreateJSCompilerScript(string compileScript)
- {
- compileScript = String.Empty +
- "import OpenSim.Region.ScriptEngine.Shared; import System.Collections.Generic;\r\n" +
- "package SecondLife {\r\n" +
- "class Script extends OpenSim.Region.ScriptEngine.Shared.ScriptBase.ScriptBaseClass { \r\n" +
- compileScript +
- "} }\r\n";
- return compileScript;
- }
+// private static string CreateJSCompilerScript(string compileScript)
+// {
+// compileScript = String.Empty +
+// "import OpenSim.Region.ScriptEngine.Shared; import System.Collections.Generic;\r\n" +
+// "package SecondLife {\r\n" +
+// "class Script extends OpenSim.Region.ScriptEngine.Shared.ScriptBase.ScriptBaseClass { \r\n" +
+// compileScript +
+// "} }\r\n";
+// return compileScript;
+// }
private static string CreateCSCompilerScript(string compileScript)
{
@@ -580,10 +580,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
}
} while (!complete);
break;
- case enumCompileType.js:
- results = JScodeProvider.CompileAssemblyFromSource(
- parameters, Script);
- break;
+// case enumCompileType.js:
+// results = JScodeProvider.CompileAssemblyFromSource(
+// parameters, Script);
+// break;
case enumCompileType.yp:
results = YPcodeProvider.CompileAssemblyFromSource(
parameters, Script);
diff --git a/prebuild.xml b/prebuild.xml
index 6b25792..66ab532 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -765,7 +765,6 @@
<Reference name="OpenSim.Region.Physics.Manager"/>
<!-- For scripting in funny languages by default -->
- <Reference name="Microsoft.JScript"/>
<Reference name="XMLRPC.dll"/>
<Reference name="OpenSim.Framework.Communications"/>
<Reference name="Nini.dll" />
@@ -1619,7 +1618,6 @@
<Reference name="GlynnTucker.Cache.dll"/>
<!-- For scripting in funny languages by default -->
- <Reference name="Microsoft.JScript"/>
<Reference name="XMLRPC.dll"/>
<Reference name="OpenSim.Framework.Communications"/>
<Reference name="Nini.dll" />
@@ -1702,7 +1700,6 @@
<Reference name="Mono.Addins.dll" />
<!-- For scripting in funny languages by default -->
- <Reference name="Microsoft.JScript"/>
<Reference name="XMLRPC.dll"/>
<Reference name="OpenSim.Framework.Communications"/>
<Reference name="Nini.dll" />
@@ -2671,7 +2668,6 @@
<ReferencePath>../../../../../bin/</ReferencePath>
<Reference name="System"/>
- <Reference name="Microsoft.JScript"/>
<Reference name="OpenSim.Framework" />
<Reference name="OpenSim.Region.Framework" />
<Reference name="OpenSim.Region.ScriptEngine.Shared"/>
@@ -2808,7 +2804,6 @@
<Reference name="Mono.Addins"/>
<!-- For scripting in funny languages by default -->
- <Reference name="Microsoft.JScript"/>
<Reference name="XMLRPC.dll"/>
<Reference name="OpenSim.Framework.Communications"/>
<Reference name="Nini.dll" />
@@ -3270,7 +3265,6 @@
<Reference name="nunit.framework.dll"/>
<!-- For scripting in funny languages by default -->
- <Reference name="Microsoft.JScript"/>
<Reference name="XMLRPC.dll"/>
<Reference name="OpenSim.Framework.Communications"/>
<Reference name="Nini.dll" />
@@ -3334,7 +3328,6 @@
<Reference name="nunit.framework.dll"/>
<!-- For scripting in funny languages by default -->
- <Reference name="Microsoft.JScript"/>
<Reference name="XMLRPC.dll"/>
<Reference name="OpenSim.Framework.Communications"/>
<Reference name="Nini.dll" />
--
cgit v1.1