diff options
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | 38 | ||||
-rw-r--r-- | 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; | |||
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 | ||
@@ -395,9 +395,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | |||
395 | case enumCompileType.vb: | 395 | case enumCompileType.vb: |
396 | compileScript = CreateVBCompilerScript(compileScript); | 396 | compileScript = CreateVBCompilerScript(compileScript); |
397 | break; | 397 | break; |
398 | case enumCompileType.js: | 398 | // case enumCompileType.js: |
399 | compileScript = CreateJSCompilerScript(compileScript); | 399 | // compileScript = CreateJSCompilerScript(compileScript); |
400 | break; | 400 | // break; |
401 | case enumCompileType.yp: | 401 | case enumCompileType.yp: |
402 | compileScript = CreateYPCompilerScript(compileScript); | 402 | compileScript = CreateYPCompilerScript(compileScript); |
403 | break; | 403 | break; |
@@ -420,16 +420,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | |||
420 | } | 420 | } |
421 | } | 421 | } |
422 | 422 | ||
423 | private static string CreateJSCompilerScript(string compileScript) | 423 | // private static string CreateJSCompilerScript(string compileScript) |
424 | { | 424 | // { |
425 | compileScript = String.Empty + | 425 | // compileScript = String.Empty + |
426 | "import OpenSim.Region.ScriptEngine.Shared; import System.Collections.Generic;\r\n" + | 426 | // "import OpenSim.Region.ScriptEngine.Shared; import System.Collections.Generic;\r\n" + |
427 | "package SecondLife {\r\n" + | 427 | // "package SecondLife {\r\n" + |
428 | "class Script extends OpenSim.Region.ScriptEngine.Shared.ScriptBase.ScriptBaseClass { \r\n" + | 428 | // "class Script extends OpenSim.Region.ScriptEngine.Shared.ScriptBase.ScriptBaseClass { \r\n" + |
429 | compileScript + | 429 | // compileScript + |
430 | "} }\r\n"; | 430 | // "} }\r\n"; |
431 | return compileScript; | 431 | // return compileScript; |
432 | } | 432 | // } |
433 | 433 | ||
434 | private static string CreateCSCompilerScript(string compileScript) | 434 | private static string CreateCSCompilerScript(string compileScript) |
435 | { | 435 | { |
@@ -580,10 +580,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | |||
580 | } | 580 | } |
581 | } while (!complete); | 581 | } while (!complete); |
582 | break; | 582 | break; |
583 | case enumCompileType.js: | 583 | // case enumCompileType.js: |
584 | results = JScodeProvider.CompileAssemblyFromSource( | 584 | // results = JScodeProvider.CompileAssemblyFromSource( |
585 | parameters, Script); | 585 | // parameters, Script); |
586 | break; | 586 | // break; |
587 | case enumCompileType.yp: | 587 | case enumCompileType.yp: |
588 | results = YPcodeProvider.CompileAssemblyFromSource( | 588 | results = YPcodeProvider.CompileAssemblyFromSource( |
589 | parameters, Script); | 589 | parameters, Script); |
diff --git a/prebuild.xml b/prebuild.xml index 6b25792..66ab532 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -765,7 +765,6 @@ | |||
765 | <Reference name="OpenSim.Region.Physics.Manager"/> | 765 | <Reference name="OpenSim.Region.Physics.Manager"/> |
766 | 766 | ||
767 | <!-- For scripting in funny languages by default --> | 767 | <!-- For scripting in funny languages by default --> |
768 | <Reference name="Microsoft.JScript"/> | ||
769 | <Reference name="XMLRPC.dll"/> | 768 | <Reference name="XMLRPC.dll"/> |
770 | <Reference name="OpenSim.Framework.Communications"/> | 769 | <Reference name="OpenSim.Framework.Communications"/> |
771 | <Reference name="Nini.dll" /> | 770 | <Reference name="Nini.dll" /> |
@@ -1619,7 +1618,6 @@ | |||
1619 | <Reference name="GlynnTucker.Cache.dll"/> | 1618 | <Reference name="GlynnTucker.Cache.dll"/> |
1620 | 1619 | ||
1621 | <!-- For scripting in funny languages by default --> | 1620 | <!-- For scripting in funny languages by default --> |
1622 | <Reference name="Microsoft.JScript"/> | ||
1623 | <Reference name="XMLRPC.dll"/> | 1621 | <Reference name="XMLRPC.dll"/> |
1624 | <Reference name="OpenSim.Framework.Communications"/> | 1622 | <Reference name="OpenSim.Framework.Communications"/> |
1625 | <Reference name="Nini.dll" /> | 1623 | <Reference name="Nini.dll" /> |
@@ -1702,7 +1700,6 @@ | |||
1702 | <Reference name="Mono.Addins.dll" /> | 1700 | <Reference name="Mono.Addins.dll" /> |
1703 | 1701 | ||
1704 | <!-- For scripting in funny languages by default --> | 1702 | <!-- For scripting in funny languages by default --> |
1705 | <Reference name="Microsoft.JScript"/> | ||
1706 | <Reference name="XMLRPC.dll"/> | 1703 | <Reference name="XMLRPC.dll"/> |
1707 | <Reference name="OpenSim.Framework.Communications"/> | 1704 | <Reference name="OpenSim.Framework.Communications"/> |
1708 | <Reference name="Nini.dll" /> | 1705 | <Reference name="Nini.dll" /> |
@@ -2671,7 +2668,6 @@ | |||
2671 | 2668 | ||
2672 | <ReferencePath>../../../../../bin/</ReferencePath> | 2669 | <ReferencePath>../../../../../bin/</ReferencePath> |
2673 | <Reference name="System"/> | 2670 | <Reference name="System"/> |
2674 | <Reference name="Microsoft.JScript"/> | ||
2675 | <Reference name="OpenSim.Framework" /> | 2671 | <Reference name="OpenSim.Framework" /> |
2676 | <Reference name="OpenSim.Region.Framework" /> | 2672 | <Reference name="OpenSim.Region.Framework" /> |
2677 | <Reference name="OpenSim.Region.ScriptEngine.Shared"/> | 2673 | <Reference name="OpenSim.Region.ScriptEngine.Shared"/> |
@@ -2808,7 +2804,6 @@ | |||
2808 | <Reference name="Mono.Addins"/> | 2804 | <Reference name="Mono.Addins"/> |
2809 | 2805 | ||
2810 | <!-- For scripting in funny languages by default --> | 2806 | <!-- For scripting in funny languages by default --> |
2811 | <Reference name="Microsoft.JScript"/> | ||
2812 | <Reference name="XMLRPC.dll"/> | 2807 | <Reference name="XMLRPC.dll"/> |
2813 | <Reference name="OpenSim.Framework.Communications"/> | 2808 | <Reference name="OpenSim.Framework.Communications"/> |
2814 | <Reference name="Nini.dll" /> | 2809 | <Reference name="Nini.dll" /> |
@@ -3270,7 +3265,6 @@ | |||
3270 | <Reference name="nunit.framework.dll"/> | 3265 | <Reference name="nunit.framework.dll"/> |
3271 | 3266 | ||
3272 | <!-- For scripting in funny languages by default --> | 3267 | <!-- For scripting in funny languages by default --> |
3273 | <Reference name="Microsoft.JScript"/> | ||
3274 | <Reference name="XMLRPC.dll"/> | 3268 | <Reference name="XMLRPC.dll"/> |
3275 | <Reference name="OpenSim.Framework.Communications"/> | 3269 | <Reference name="OpenSim.Framework.Communications"/> |
3276 | <Reference name="Nini.dll" /> | 3270 | <Reference name="Nini.dll" /> |
@@ -3334,7 +3328,6 @@ | |||
3334 | <Reference name="nunit.framework.dll"/> | 3328 | <Reference name="nunit.framework.dll"/> |
3335 | 3329 | ||
3336 | <!-- For scripting in funny languages by default --> | 3330 | <!-- For scripting in funny languages by default --> |
3337 | <Reference name="Microsoft.JScript"/> | ||
3338 | <Reference name="XMLRPC.dll"/> | 3331 | <Reference name="XMLRPC.dll"/> |
3339 | <Reference name="OpenSim.Framework.Communications"/> | 3332 | <Reference name="OpenSim.Framework.Communications"/> |
3340 | <Reference name="Nini.dll" /> | 3333 | <Reference name="Nini.dll" /> |