OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Comment and remove JScript support. Mono 2.7Dev and 2.8 no longer include the 

needed libraries
0.6.9-post-fixes
Melanie 2010-06-01 14:19:26 +01:00
parent 992efdc283
commit f5ca701273
2 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
View File

@ -32,7 +32,7 @@ using System.Globalization;
using System.Reflection; using System.Reflection;
using System.IO; using System.IO;
using Microsoft.CSharp; using Microsoft.CSharp;
using Microsoft.JScript; //using Microsoft.JScript;
using Microsoft.VisualBasic; using Microsoft.VisualBasic;
using log4net; using log4net;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
@ -82,7 +82,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
private static CSharpCodeProvider CScodeProvider = new CSharpCodeProvider(); private static CSharpCodeProvider CScodeProvider = new CSharpCodeProvider();
private static VBCodeProvider VBcodeProvider = new VBCodeProvider(); 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 CSharpCodeProvider YPcodeProvider = new CSharpCodeProvider(); // YP is translated into CSharp
private static YP2CSConverter YP_Converter = new YP2CSConverter(); private static YP2CSConverter YP_Converter = new YP2CSConverter();
@ -395,9 +395,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
case enumCompileType.vb: case enumCompileType.vb:
compileScript = CreateVBCompilerScript(compileScript); compileScript = CreateVBCompilerScript(compileScript);
break; break;
case enumCompileType.js: // case enumCompileType.js:
compileScript = CreateJSCompilerScript(compileScript); // compileScript = CreateJSCompilerScript(compileScript);
break; // break;
case enumCompileType.yp: case enumCompileType.yp:
compileScript = CreateYPCompilerScript(compileScript); compileScript = CreateYPCompilerScript(compileScript);
break; break;
@ -420,16 +420,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
} }
} }
private static string CreateJSCompilerScript(string compileScript) // private static string CreateJSCompilerScript(string compileScript)
{ // {
compileScript = String.Empty + // compileScript = String.Empty +
"import OpenSim.Region.ScriptEngine.Shared; import System.Collections.Generic;\r\n" + // "import OpenSim.Region.ScriptEngine.Shared; import System.Collections.Generic;\r\n" +
"package SecondLife {\r\n" + // "package SecondLife {\r\n" +
"class Script extends OpenSim.Region.ScriptEngine.Shared.ScriptBase.ScriptBaseClass { \r\n" + // "class Script extends OpenSim.Region.ScriptEngine.Shared.ScriptBase.ScriptBaseClass { \r\n" +
compileScript + // compileScript +
"} }\r\n"; // "} }\r\n";
return compileScript; // return compileScript;
} // }
private static string CreateCSCompilerScript(string compileScript) private static string CreateCSCompilerScript(string compileScript)
{ {
@ -580,10 +580,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
} }
} while (!complete); } while (!complete);
break; break;
case enumCompileType.js: // case enumCompileType.js:
results = JScodeProvider.CompileAssemblyFromSource( // results = JScodeProvider.CompileAssemblyFromSource(
parameters, Script); // parameters, Script);
break; // break;
case enumCompileType.yp: case enumCompileType.yp:
results = YPcodeProvider.CompileAssemblyFromSource( results = YPcodeProvider.CompileAssemblyFromSource(
parameters, Script); parameters, Script);

7
prebuild.xml
View File

@ -765,7 +765,6 @@
<Reference name="OpenSim.Region.Physics.Manager"/> <Reference name="OpenSim.Region.Physics.Manager"/>
<!-- For scripting in funny languages by default --> <!-- For scripting in funny languages by default -->
<Reference name="Microsoft.JScript"/>
<Reference name="XMLRPC.dll"/> <Reference name="XMLRPC.dll"/>
<Reference name="OpenSim.Framework.Communications"/> <Reference name="OpenSim.Framework.Communications"/>
<Reference name="Nini.dll" /> <Reference name="Nini.dll" />
@ -1619,7 +1618,6 @@
<Reference name="GlynnTucker.Cache.dll"/> <Reference name="GlynnTucker.Cache.dll"/>
<!-- For scripting in funny languages by default --> <!-- For scripting in funny languages by default -->
<Reference name="Microsoft.JScript"/>
<Reference name="XMLRPC.dll"/> <Reference name="XMLRPC.dll"/>
<Reference name="OpenSim.Framework.Communications"/> <Reference name="OpenSim.Framework.Communications"/>
<Reference name="Nini.dll" /> <Reference name="Nini.dll" />
@ -1702,7 +1700,6 @@
<Reference name="Mono.Addins.dll" /> <Reference name="Mono.Addins.dll" />
<!-- For scripting in funny languages by default --> <!-- For scripting in funny languages by default -->
<Reference name="Microsoft.JScript"/>
<Reference name="XMLRPC.dll"/> <Reference name="XMLRPC.dll"/>
<Reference name="OpenSim.Framework.Communications"/> <Reference name="OpenSim.Framework.Communications"/>
<Reference name="Nini.dll" /> <Reference name="Nini.dll" />
@ -2671,7 +2668,6 @@
<ReferencePath>../../../../../bin/</ReferencePath> <ReferencePath>../../../../../bin/</ReferencePath>
<Reference name="System"/> <Reference name="System"/>
<Reference name="Microsoft.JScript"/>
<Reference name="OpenSim.Framework" /> <Reference name="OpenSim.Framework" />
<Reference name="OpenSim.Region.Framework" /> <Reference name="OpenSim.Region.Framework" />
<Reference name="OpenSim.Region.ScriptEngine.Shared"/> <Reference name="OpenSim.Region.ScriptEngine.Shared"/>
@ -2808,7 +2804,6 @@
<Reference name="Mono.Addins"/> <Reference name="Mono.Addins"/>
<!-- For scripting in funny languages by default --> <!-- For scripting in funny languages by default -->
<Reference name="Microsoft.JScript"/>
<Reference name="XMLRPC.dll"/> <Reference name="XMLRPC.dll"/>
<Reference name="OpenSim.Framework.Communications"/> <Reference name="OpenSim.Framework.Communications"/>
<Reference name="Nini.dll" /> <Reference name="Nini.dll" />
@ -3270,7 +3265,6 @@
<Reference name="nunit.framework.dll"/> <Reference name="nunit.framework.dll"/>
<!-- For scripting in funny languages by default --> <!-- For scripting in funny languages by default -->
<Reference name="Microsoft.JScript"/>
<Reference name="XMLRPC.dll"/> <Reference name="XMLRPC.dll"/>
<Reference name="OpenSim.Framework.Communications"/> <Reference name="OpenSim.Framework.Communications"/>
<Reference name="Nini.dll" /> <Reference name="Nini.dll" />
@ -3334,7 +3328,6 @@
<Reference name="nunit.framework.dll"/> <Reference name="nunit.framework.dll"/>
<!-- For scripting in funny languages by default --> <!-- For scripting in funny languages by default -->
<Reference name="Microsoft.JScript"/>
<Reference name="XMLRPC.dll"/> <Reference name="XMLRPC.dll"/>
<Reference name="OpenSim.Framework.Communications"/> <Reference name="OpenSim.Framework.Communications"/>
<Reference name="Nini.dll" /> <Reference name="Nini.dll" />