diff options
author | Melanie | 2010-06-01 14:19:26 +0100 |
---|---|---|
committer | Melanie | 2010-06-01 14:20:39 +0100 |
commit | 5270e5426867877e84e4c148759dad8c20de76ea (patch) | |
tree | 04dbaae46b43a00e888ad1f1337dc741004850fe /OpenSim | |
parent | Fix prim returns I broke earlier (diff) | |
download | opensim-SC-5270e5426867877e84e4c148759dad8c20de76ea.zip opensim-SC-5270e5426867877e84e4c148759dad8c20de76ea.tar.gz opensim-SC-5270e5426867877e84e4c148759dad8c20de76ea.tar.bz2 opensim-SC-5270e5426867877e84e4c148759dad8c20de76ea.tar.xz |
Comment and remove JScript support. Mono 2.7Dev and 2.8 no longer include the
needed libraries
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs index f719683..cd8c67e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | |||
@@ -32,7 +32,7 @@ using System.Globalization; | |||
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using System.IO; | 33 | using System.IO; |
34 | using Microsoft.CSharp; | 34 | using Microsoft.CSharp; |
35 | using Microsoft.JScript; | 35 | //using Microsoft.JScript; |
36 | using Microsoft.VisualBasic; | 36 | using Microsoft.VisualBasic; |
37 | using log4net; | 37 | using log4net; |
38 | using OpenSim.Region.Framework.Interfaces; | 38 | using OpenSim.Region.Framework.Interfaces; |
@@ -82,7 +82,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | |||
82 | 82 | ||
83 | private static CSharpCodeProvider CScodeProvider = new CSharpCodeProvider(); | 83 | private static CSharpCodeProvider CScodeProvider = new CSharpCodeProvider(); |
84 | private static VBCodeProvider VBcodeProvider = new VBCodeProvider(); | 84 | private static VBCodeProvider VBcodeProvider = new VBCodeProvider(); |
85 | private static JScriptCodeProvider JScodeProvider = new JScriptCodeProvider(); | 85 | // private static JScriptCodeProvider JScodeProvider = new JScriptCodeProvider(); |
86 | private static CSharpCodeProvider YPcodeProvider = new CSharpCodeProvider(); // YP is translated into CSharp | 86 | private static CSharpCodeProvider YPcodeProvider = new CSharpCodeProvider(); // YP is translated into CSharp |
87 | private static YP2CSConverter YP_Converter = new YP2CSConverter(); | 87 | private static YP2CSConverter YP_Converter = new YP2CSConverter(); |
88 | 88 | ||
@@ -398,9 +398,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | |||
398 | case enumCompileType.vb: | 398 | case enumCompileType.vb: |
399 | compileScript = CreateVBCompilerScript(compileScript); | 399 | compileScript = CreateVBCompilerScript(compileScript); |
400 | break; | 400 | break; |
401 | case enumCompileType.js: | 401 | // case enumCompileType.js: |
402 | compileScript = CreateJSCompilerScript(compileScript); | 402 | // compileScript = CreateJSCompilerScript(compileScript); |
403 | break; | 403 | // break; |
404 | case enumCompileType.yp: | 404 | case enumCompileType.yp: |
405 | compileScript = CreateYPCompilerScript(compileScript); | 405 | compileScript = CreateYPCompilerScript(compileScript); |
406 | break; | 406 | break; |
@@ -423,16 +423,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | |||
423 | } | 423 | } |
424 | } | 424 | } |
425 | 425 | ||
426 | private static string CreateJSCompilerScript(string compileScript) | 426 | // private static string CreateJSCompilerScript(string compileScript) |
427 | { | 427 | // { |
428 | compileScript = String.Empty + | 428 | // compileScript = String.Empty + |
429 | "import OpenSim.Region.ScriptEngine.Shared; import System.Collections.Generic;\r\n" + | 429 | // "import OpenSim.Region.ScriptEngine.Shared; import System.Collections.Generic;\r\n" + |
430 | "package SecondLife {\r\n" + | 430 | // "package SecondLife {\r\n" + |
431 | "class Script extends OpenSim.Region.ScriptEngine.Shared.ScriptBase.ScriptBaseClass { \r\n" + | 431 | // "class Script extends OpenSim.Region.ScriptEngine.Shared.ScriptBase.ScriptBaseClass { \r\n" + |
432 | compileScript + | 432 | // compileScript + |
433 | "} }\r\n"; | 433 | // "} }\r\n"; |
434 | return compileScript; | 434 | // return compileScript; |
435 | } | 435 | // } |
436 | 436 | ||
437 | private static string CreateCSCompilerScript(string compileScript) | 437 | private static string CreateCSCompilerScript(string compileScript) |
438 | { | 438 | { |
@@ -583,10 +583,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | |||
583 | } | 583 | } |
584 | } while (!complete); | 584 | } while (!complete); |
585 | break; | 585 | break; |
586 | case enumCompileType.js: | 586 | // case enumCompileType.js: |
587 | results = JScodeProvider.CompileAssemblyFromSource( | 587 | // results = JScodeProvider.CompileAssemblyFromSource( |
588 | parameters, Script); | 588 | // parameters, Script); |
589 | break; | 589 | // break; |
590 | case enumCompileType.yp: | 590 | case enumCompileType.yp: |
591 | results = YPcodeProvider.CompileAssemblyFromSource( | 591 | results = YPcodeProvider.CompileAssemblyFromSource( |
592 | parameters, Script); | 592 | parameters, Script); |