From 1b1808d45db249dbc9a82ca60dfdc852f51e958c Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Fri, 14 Sep 2007 09:25:07 +0000
Subject: * fixed script compilation * reversed //c# - if * rightifyed
what's actually converted
---
.../DotNetEngine/Compiler/LSL/Compiler.cs | 226 ++++++++++-----------
.../DotNetEngine/Compiler/c_sharp_example.txt | 12 ++
2 files changed, 125 insertions(+), 113 deletions(-)
create mode 100644 OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/c_sharp_example.txt
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
index bbfd097..78cfd21 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
@@ -1,120 +1,120 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-using Microsoft.CSharp;
-using System.CodeDom.Compiler;
-using System.Reflection;
-
-namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
-{
-
- public class Compiler
- {
- private LSL2CSConverter LSL_Converter = new LSL2CSConverter();
- private CSharpCodeProvider codeProvider = new CSharpCodeProvider();
- private static UInt64 scriptCompileCounter = 0;
- //private ICodeCompiler icc = codeProvider.CreateCompiler();
- public string CompileFromFile(string LSOFileName)
- {
- switch (System.IO.Path.GetExtension(LSOFileName).ToLower())
- {
- case ".txt":
- case ".lsl":
- Common.SendToDebug("Source code is LSL, converting to CS");
- return CompileFromLSLText(File.ReadAllText(LSOFileName));
- case ".cs":
- Common.SendToDebug("Source code is CS");
- return CompileFromCSText(File.ReadAllText(LSOFileName));
- default:
- throw new Exception("Unknown script type.");
- }
- }
- ///
- /// Converts script from LSL to CS and calls CompileFromCSText
- ///
- /// LSL script
- /// Filename to .dll assembly
- public string CompileFromLSLText(string Script)
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.IO;
+using Microsoft.CSharp;
+using System.CodeDom.Compiler;
+using System.Reflection;
+
+namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
+{
+
+ public class Compiler
+ {
+ private LSL2CSConverter LSL_Converter = new LSL2CSConverter();
+ private CSharpCodeProvider codeProvider = new CSharpCodeProvider();
+ private static UInt64 scriptCompileCounter = 0;
+ //private ICodeCompiler icc = codeProvider.CreateCompiler();
+ public string CompileFromFile(string LSOFileName)
+ {
+ switch (System.IO.Path.GetExtension(LSOFileName).ToLower())
+ {
+ case ".txt":
+ case ".lsl":
+ Common.SendToDebug("Source code is LSL, converting to CS");
+ return CompileFromLSLText(File.ReadAllText(LSOFileName));
+ case ".cs":
+ Common.SendToDebug("Source code is CS");
+ return CompileFromCSText(File.ReadAllText(LSOFileName));
+ default:
+ throw new Exception("Unknown script type.");
+ }
+ }
+ ///
+ /// Converts script from LSL to CS and calls CompileFromCSText
+ ///
+ /// LSL script
+ /// Filename to .dll assembly
+ public string CompileFromLSLText(string Script)
{
if (Script.Substring(0, 4).ToLower() == "//c#")
{
- return LSL_Converter.Convert(Script);
+ return CompileFromCSText( Script );
}
else
{
return CompileFromCSText(LSL_Converter.Convert(Script));
- }
- }
- ///
- /// Compile CS script to .Net assembly (.dll)
- ///
- /// CS script
- /// Filename to .dll assembly
- public string CompileFromCSText(string Script)
- {
-
-
- // Output assembly name
- scriptCompileCounter++;
- string OutFile = Path.Combine("ScriptEngines", "Script_" + scriptCompileCounter + ".dll");
- try
- {
- System.IO.File.Delete(OutFile);
- }
- catch (Exception e)
- {
- Console.WriteLine("Exception attempting to delete old compiled script: " + e.ToString());
- }
- //string OutFile = Path.Combine("ScriptEngines", "SecondLife.Script.dll");
-
- // DEBUG - write source to disk
- try
- {
- File.WriteAllText(Path.Combine("ScriptEngines", "debug_" + Path.GetFileNameWithoutExtension(OutFile) + ".cs"), Script);
- }
- catch { }
-
- // Do actual compile
- System.CodeDom.Compiler.CompilerParameters parameters = new CompilerParameters();
- parameters.IncludeDebugInformation = true;
- // Add all available assemblies
- foreach (Assembly asm in AppDomain.CurrentDomain.GetAssemblies())
- {
- //Console.WriteLine("Adding assembly: " + asm.Location);
- //parameters.ReferencedAssemblies.Add(asm.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(rootPathSE, "OpenSim.Region.ScriptEngine.DotNetEngine.dll"));
-
- //parameters.ReferencedAssemblies.Add("OpenSim.Region.Environment");
- parameters.GenerateExecutable = false;
- parameters.OutputAssembly = OutFile;
- parameters.IncludeDebugInformation = false;
- CompilerResults results = codeProvider.CompileAssemblyFromSource(parameters, Script);
-
- // Go through errors
- // TODO: Return errors to user somehow
- if (results.Errors.Count > 0)
- {
-
- string errtext = "";
- foreach (CompilerError CompErr in results.Errors)
- {
- errtext += "Line number " + (CompErr.Line - 1) +
- ", Error Number: " + CompErr.ErrorNumber +
- ", '" + CompErr.ErrorText + "'\r\n";
- }
- throw new Exception(errtext);
- }
-
-
- return OutFile;
- }
-
- }
-}
+ }
+ }
+ ///
+ /// Compile CS script to .Net assembly (.dll)
+ ///
+ /// CS script
+ /// Filename to .dll assembly
+ public string CompileFromCSText(string Script)
+ {
+
+
+ // Output assembly name
+ scriptCompileCounter++;
+ string OutFile = Path.Combine("ScriptEngines", "Script_" + scriptCompileCounter + ".dll");
+ try
+ {
+ System.IO.File.Delete(OutFile);
+ }
+ catch (Exception e)
+ {
+ Console.WriteLine("Exception attempting to delete old compiled script: " + e.ToString());
+ }
+ //string OutFile = Path.Combine("ScriptEngines", "SecondLife.Script.dll");
+
+ // DEBUG - write source to disk
+ try
+ {
+ File.WriteAllText(Path.Combine("ScriptEngines", "debug_" + Path.GetFileNameWithoutExtension(OutFile) + ".cs"), Script);
+ }
+ catch { }
+
+ // Do actual compile
+ System.CodeDom.Compiler.CompilerParameters parameters = new CompilerParameters();
+ parameters.IncludeDebugInformation = true;
+ // Add all available assemblies
+ foreach (Assembly asm in AppDomain.CurrentDomain.GetAssemblies())
+ {
+ //Console.WriteLine("Adding assembly: " + asm.Location);
+ //parameters.ReferencedAssemblies.Add(asm.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(rootPathSE, "OpenSim.Region.ScriptEngine.DotNetEngine.dll"));
+
+ //parameters.ReferencedAssemblies.Add("OpenSim.Region.Environment");
+ parameters.GenerateExecutable = false;
+ parameters.OutputAssembly = OutFile;
+ parameters.IncludeDebugInformation = false;
+ CompilerResults results = codeProvider.CompileAssemblyFromSource(parameters, Script);
+
+ // Go through errors
+ // TODO: Return errors to user somehow
+ if (results.Errors.Count > 0)
+ {
+
+ string errtext = "";
+ foreach (CompilerError CompErr in results.Errors)
+ {
+ errtext += "Line number " + (CompErr.Line - 1) +
+ ", Error Number: " + CompErr.ErrorNumber +
+ ", '" + CompErr.ErrorText + "'\r\n";
+ }
+ throw new Exception(errtext);
+ }
+
+
+ return OutFile;
+ }
+
+ }
+}
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/c_sharp_example.txt b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/c_sharp_example.txt
new file mode 100644
index 0000000..a39d1db
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/c_sharp_example.txt
@@ -0,0 +1,12 @@
+//c#
+namespace SecondLife {
+ public class Script : OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL.LSL_BaseClass
+{
+ public Script() { }
+
+ public void default_event_state_entry( )
+ {
+ llSay(0, "testing, I've been touched");
+ }
+
+}}
\ No newline at end of file
--
cgit v1.1