[Monodevelop-patches-list] r1452 - in trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding: . Gui Project
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Tue Apr 13 14:28:32 EDT 2004
Author: pawel
Date: 2004-04-13 14:28:32 -0400 (Tue, 13 Apr 2004)
New Revision: 1452
Added:
trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/ChangeLog
Modified:
trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Gui/CodeGenerationPanel.cs
trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Gui/OutputPanel.cs
trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingCompilerServices.cs
trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingExecutionServices.cs
trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/NemerleLanguageBinding.cs
trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Project/NemerleParameters.cs
trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Project/NemerleProject.cs
Log:
DOS endings stripped
Added: trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/ChangeLog 2004-04-12 23:09:56 UTC (rev 1451)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/ChangeLog 2004-04-13 18:28:32 UTC (rev 1452)
@@ -0,0 +1,3 @@
+2004-04-13 Pawel Rozanski <tokugawa at afn.no-ip.org>
+
+ stripped DOS '\r' from newlines
Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Gui/CodeGenerationPanel.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Gui/CodeGenerationPanel.cs 2004-04-12 23:09:56 UTC (rev 1451)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Gui/CodeGenerationPanel.cs 2004-04-13 18:28:32 UTC (rev 1452)
@@ -1,70 +1,70 @@
-using System;
-using System.IO;
-using System.Drawing;
-
-using MonoDevelop.Internal.Project;
-using MonoDevelop.Internal.ExternalTool;
-using MonoDevelop.Gui.Dialogs;
-using MonoDevelop.Core.Services;
-using MonoDevelop.Core.Properties;
-using MonoDevelop.Core.AddIns.Codons;
-
-using Gtk;
-using MonoDevelop.Gui.Widgets;
-
-namespace NemerleBinding
-{
- public class CodeGenerationPanel : AbstractOptionPanel
- {
- class CodeGenerationPanelWidget : GladeWidgetExtract
- {
- [Glade.Widget] OptionMenu target;
- [Glade.Widget] CheckButton nostdmacros;
- [Glade.Widget] CheckButton nostdlib;
- [Glade.Widget] CheckButton ot;
- [Glade.Widget] CheckButton obcm;
- [Glade.Widget] CheckButton oocm;
- [Glade.Widget] CheckButton oscm;
-
- NemerleParameters compilerParameters = null;
-
- public CodeGenerationPanelWidget(IProperties CustomizationObject) : base ("Nemerle.glade", "CodeGenerationPanel")
- {
- compilerParameters = (NemerleParameters)((IProperties)CustomizationObject).GetProperty("Config");
-
- target.SetHistory ( (uint) compilerParameters.Target);
-
- nostdmacros.Active = compilerParameters.Nostdmacros;
- nostdlib.Active = compilerParameters.Nostdlib;
- ot.Active = compilerParameters.Ot;
- obcm.Active = compilerParameters.Obcm;
- oocm.Active = compilerParameters.Oocm;
- oscm.Active = compilerParameters.Oscm;
- }
-
- public bool Store ()
- {
- compilerParameters.Target = (NemerleBinding.CompileTarget)target.History;
- compilerParameters.Nostdmacros = nostdmacros.Active;
- compilerParameters.Nostdlib = nostdlib.Active;
- compilerParameters.Ot = ot.Active;
- compilerParameters.Obcm = obcm.Active;
- compilerParameters.Oocm = oocm.Active;
- compilerParameters.Oscm = oscm.Active;
- return true;
- }
- }
-
- CodeGenerationPanelWidget widget;
-
- public override void LoadPanelContents()
- {
- Add (widget = new CodeGenerationPanelWidget ((IProperties) CustomizationObject));
- }
-
- public override bool StorePanelContents()
- {
- return widget.Store ();
- }
- }
-}
+using System;
+using System.IO;
+using System.Drawing;
+
+using MonoDevelop.Internal.Project;
+using MonoDevelop.Internal.ExternalTool;
+using MonoDevelop.Gui.Dialogs;
+using MonoDevelop.Core.Services;
+using MonoDevelop.Core.Properties;
+using MonoDevelop.Core.AddIns.Codons;
+
+using Gtk;
+using MonoDevelop.Gui.Widgets;
+
+namespace NemerleBinding
+{
+ public class CodeGenerationPanel : AbstractOptionPanel
+ {
+ class CodeGenerationPanelWidget : GladeWidgetExtract
+ {
+ [Glade.Widget] OptionMenu target;
+ [Glade.Widget] CheckButton nostdmacros;
+ [Glade.Widget] CheckButton nostdlib;
+ [Glade.Widget] CheckButton ot;
+ [Glade.Widget] CheckButton obcm;
+ [Glade.Widget] CheckButton oocm;
+ [Glade.Widget] CheckButton oscm;
+
+ NemerleParameters compilerParameters = null;
+
+ public CodeGenerationPanelWidget(IProperties CustomizationObject) : base ("Nemerle.glade", "CodeGenerationPanel")
+ {
+ compilerParameters = (NemerleParameters)((IProperties)CustomizationObject).GetProperty("Config");
+
+ target.SetHistory ( (uint) compilerParameters.Target);
+
+ nostdmacros.Active = compilerParameters.Nostdmacros;
+ nostdlib.Active = compilerParameters.Nostdlib;
+ ot.Active = compilerParameters.Ot;
+ obcm.Active = compilerParameters.Obcm;
+ oocm.Active = compilerParameters.Oocm;
+ oscm.Active = compilerParameters.Oscm;
+ }
+
+ public bool Store ()
+ {
+ compilerParameters.Target = (NemerleBinding.CompileTarget)target.History;
+ compilerParameters.Nostdmacros = nostdmacros.Active;
+ compilerParameters.Nostdlib = nostdlib.Active;
+ compilerParameters.Ot = ot.Active;
+ compilerParameters.Obcm = obcm.Active;
+ compilerParameters.Oocm = oocm.Active;
+ compilerParameters.Oscm = oscm.Active;
+ return true;
+ }
+ }
+
+ CodeGenerationPanelWidget widget;
+
+ public override void LoadPanelContents()
+ {
+ Add (widget = new CodeGenerationPanelWidget ((IProperties) CustomizationObject));
+ }
+
+ public override bool StorePanelContents()
+ {
+ return widget.Store ();
+ }
+ }
+}
Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Gui/OutputPanel.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Gui/OutputPanel.cs 2004-04-12 23:09:56 UTC (rev 1451)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Gui/OutputPanel.cs 2004-04-13 18:28:32 UTC (rev 1452)
@@ -1,71 +1,71 @@
-using System;
-using System.IO;
-using System.Drawing;
-
-using MonoDevelop.Internal.Project;
-using MonoDevelop.Internal.ExternalTool;
-using MonoDevelop.Gui.Dialogs;
-using MonoDevelop.Core.Services;
-using MonoDevelop.Core.Properties;
-using MonoDevelop.Core.AddIns.Codons;
-
-using Gtk;
-using MonoDevelop.Gui.Widgets;
-
-namespace NemerleBinding
-{
- public class OutputPanel : AbstractOptionPanel
- {
- class OutputPanelWidget : GladeWidgetExtract
- {
- [Glade.Widget] Entry assemblyName;
- [Glade.Widget] Entry outputPath;
- [Glade.Widget] Entry parameters;
- [Glade.Widget] Entry executeCommand;
- [Glade.Widget] Button outputPathButton;
-
- NemerleParameters compilerParameters = null;
-
- public OutputPanelWidget(IProperties CustomizationObject) : base ("Nemerle.glade", "OutputPanel")
- {
- compilerParameters = (NemerleParameters)((IProperties)CustomizationObject).GetProperty("Config");
-
- outputPathButton.Clicked += new EventHandler(SelectFolder);
- assemblyName.Text = compilerParameters.AssemblyName;
- outputPath.Text = compilerParameters.OutputPath;
- parameters.Text = compilerParameters.Parameters;
- executeCommand.Text = compilerParameters.ExecuteCommand;
- }
-
- public bool Store ()
- {
- compilerParameters.AssemblyName = assemblyName.Text;
- compilerParameters.OutputPath = outputPath.Text;
- compilerParameters.Parameters = parameters.Text;
- compilerParameters.ExecuteCommand = executeCommand.Text;
- return true;
- }
- void SelectFolder(object sender, EventArgs e)
- {
- using (FileSelection fdiag = new FileSelection ("Output Path"))
- {
- if (fdiag.Run () == (int) ResponseType.Ok)
- outputPath.Text = fdiag.Filename;
- fdiag.Hide();
- }
- }
- }
-
- OutputPanelWidget widget;
-
- public override void LoadPanelContents()
- {
- Add (widget = new OutputPanelWidget ((IProperties) CustomizationObject));
- }
-
- public override bool StorePanelContents()
- {
- return widget.Store ();
- }
- }
-}
+using System;
+using System.IO;
+using System.Drawing;
+
+using MonoDevelop.Internal.Project;
+using MonoDevelop.Internal.ExternalTool;
+using MonoDevelop.Gui.Dialogs;
+using MonoDevelop.Core.Services;
+using MonoDevelop.Core.Properties;
+using MonoDevelop.Core.AddIns.Codons;
+
+using Gtk;
+using MonoDevelop.Gui.Widgets;
+
+namespace NemerleBinding
+{
+ public class OutputPanel : AbstractOptionPanel
+ {
+ class OutputPanelWidget : GladeWidgetExtract
+ {
+ [Glade.Widget] Entry assemblyName;
+ [Glade.Widget] Entry outputPath;
+ [Glade.Widget] Entry parameters;
+ [Glade.Widget] Entry executeCommand;
+ [Glade.Widget] Button outputPathButton;
+
+ NemerleParameters compilerParameters = null;
+
+ public OutputPanelWidget(IProperties CustomizationObject) : base ("Nemerle.glade", "OutputPanel")
+ {
+ compilerParameters = (NemerleParameters)((IProperties)CustomizationObject).GetProperty("Config");
+
+ outputPathButton.Clicked += new EventHandler(SelectFolder);
+ assemblyName.Text = compilerParameters.AssemblyName;
+ outputPath.Text = compilerParameters.OutputPath;
+ parameters.Text = compilerParameters.Parameters;
+ executeCommand.Text = compilerParameters.ExecuteCommand;
+ }
+
+ public bool Store ()
+ {
+ compilerParameters.AssemblyName = assemblyName.Text;
+ compilerParameters.OutputPath = outputPath.Text;
+ compilerParameters.Parameters = parameters.Text;
+ compilerParameters.ExecuteCommand = executeCommand.Text;
+ return true;
+ }
+ void SelectFolder(object sender, EventArgs e)
+ {
+ using (FileSelection fdiag = new FileSelection ("Output Path"))
+ {
+ if (fdiag.Run () == (int) ResponseType.Ok)
+ outputPath.Text = fdiag.Filename;
+ fdiag.Hide();
+ }
+ }
+ }
+
+ OutputPanelWidget widget;
+
+ public override void LoadPanelContents()
+ {
+ Add (widget = new OutputPanelWidget ((IProperties) CustomizationObject));
+ }
+
+ public override bool StorePanelContents()
+ {
+ return widget.Store ();
+ }
+ }
+}
Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingCompilerServices.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingCompilerServices.cs 2004-04-12 23:09:56 UTC (rev 1451)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingCompilerServices.cs 2004-04-13 18:28:32 UTC (rev 1452)
@@ -1,163 +1,163 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.CodeDom.Compiler;
-
-using MonoDevelop.Core.Services;
-using MonoDevelop.Internal.Project;
-
-namespace NemerleBinding
-{
- public class NemerleBindingCompilerServices
- {
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
- static string ncc = "ncc -q -no-color";
-
- private string GetOptionsString(NemerleParameters cp)
- {
- string options = "";
- if (cp.Nostdmacros)
- options += " -no-stdmacros";
- if (cp.Nostdlib)
- options += " -no-stdlib";
- if (cp.Ot)
- options += " -Ot";
- if (cp.Obcm)
- options += " -Obcm";
- if (cp.Oocm)
- options += " -Oocm";
- if (cp.Oscm)
- options += " -Oscm";
- if ((int)cp.Target == 1)
- options += " -tdll";
-
- return options;
- }
-
- public bool CanCompile(string fileName)
- {
- return Path.GetExtension(fileName) == ".n";
- }
-
- public ICompilerResult CompileFile(string fileName)
- {
- throw new ApplicationException("No CompileFile");
- }
-
- public string GetCompiledOutputName(string fileName)
- {
- throw new ApplicationException("No CompileFile");
- }
-
- public string GetCompiledOutputName(IProject project)
- {
- NemerleParameters cp = (NemerleParameters)project.ActiveConfiguration;
-
- return fileUtilityService.GetDirectoryNameWithSeparator(cp.OutputPath)
- + cp.AssemblyName + ((int)cp.Target == 0?".exe":".dll");
- }
-
- public ICompilerResult CompileProject(IProject project)
- {
- NemerleParameters cp = (NemerleParameters)project.ActiveConfiguration;
-
- string references = "";
- string files = "";
-
- foreach (ProjectReference lib in project.ProjectReferences)
- references += " -r \"" + lib.GetReferencedFileName(project) + "\"";
-
- foreach (ProjectFile f in project.ProjectFiles)
- if (f.Subtype != Subtype.Directory)
- switch (f.BuildAction)
- {
- case BuildAction.Compile:
- files += " \"" + f.Name + "\"";
- break;
- }
-
- if (!Directory.Exists(cp.OutputPath))
- Directory.CreateDirectory(cp.OutputPath);
-
- string outstr = ncc + GetOptionsString(cp) + references + files + " -o " + GetCompiledOutputName(project);
- string output = "";
- string error = "";
- TempFileCollection tf = new TempFileCollection ();
-// Executor.ExecWaitWithCapture(outstr, tf, ref error , ref output);
- DoCompilation (outstr, tf, ref output, ref error);
- ICompilerResult cr = ParseOutput (tf, output);
- File.Delete(output);
- File.Delete(error);
- return cr;
- }
-
- private void DoCompilation(string outstr, TempFileCollection tf, ref string output, ref string error)
- {
- output = Path.GetTempFileName();
- error = Path.GetTempFileName();
-
- string arguments = outstr + " > " + output + " 2> " + error;
- string command = arguments;
- ProcessStartInfo si = new ProcessStartInfo("/bin/sh -c \"" + command + "\"");
- si.RedirectStandardOutput = true;
- si.RedirectStandardError = true;
- si.UseShellExecute = false;
- Process p = new Process();
- p.StartInfo = si;
- p.Start();
- p.WaitForExit();
- }
-
- ICompilerResult ParseOutput(TempFileCollection tf, string file)
- {
- string compilerOutput = "";
- string l;
- StreamReader sr = new StreamReader(file, System.Text.Encoding.Default);
- CompilerResults cr = new CompilerResults(tf);
-
- while ((l = sr.ReadLine())!=null)
- {
- compilerOutput += l + "\n";
-
- if ((l.IndexOf(".n:") < 0) &&
- (l.IndexOf(":0:0:") < 0))
- continue;
-
- CompilerError error = new CompilerError();
-
- int s1 = l.IndexOf(':')+1;
- int s2 = l.IndexOf(':',s1)+1;
- int s3 = l.IndexOf(':',s2)+1;
- int s4 = l.IndexOf(':',s3)+1;
-
- error.FileName = l.Substring(0, s1-1);
- error.Line = Int32.Parse(l.Substring(s1, s2-s1-1));
- error.Column = Int32.Parse(l.Substring(s2, s3-s2-1));
- error.ErrorNumber = String.Empty;
- error.ErrorText = "";
- switch(l.Substring(s3+1, s4-s3-2))
- {
- case "error":
- error.IsWarning = false;
- break;
- case "warning":
- error.IsWarning = true;
- break;
- case "hint":
- error.IsWarning = true;
- error.ErrorText = "hint: ";
- break;
- default:
- error.IsWarning = false;
- error.ErrorText = "unknown: ";
- break;
- }
- error.ErrorText += l.Substring(s4+1);
-
- cr.Errors.Add(error);
- }
- sr.Close();
- return new DefaultCompilerResult(cr, compilerOutput);
- }
- }
-}
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.CodeDom.Compiler;
+
+using MonoDevelop.Core.Services;
+using MonoDevelop.Internal.Project;
+
+namespace NemerleBinding
+{
+ public class NemerleBindingCompilerServices
+ {
+ FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ static string ncc = "ncc -q -no-color";
+
+ private string GetOptionsString(NemerleParameters cp)
+ {
+ string options = "";
+ if (cp.Nostdmacros)
+ options += " -no-stdmacros";
+ if (cp.Nostdlib)
+ options += " -no-stdlib";
+ if (cp.Ot)
+ options += " -Ot";
+ if (cp.Obcm)
+ options += " -Obcm";
+ if (cp.Oocm)
+ options += " -Oocm";
+ if (cp.Oscm)
+ options += " -Oscm";
+ if ((int)cp.Target == 1)
+ options += " -tdll";
+
+ return options;
+ }
+
+ public bool CanCompile(string fileName)
+ {
+ return Path.GetExtension(fileName) == ".n";
+ }
+
+ public ICompilerResult CompileFile(string fileName)
+ {
+ throw new ApplicationException("No CompileFile");
+ }
+
+ public string GetCompiledOutputName(string fileName)
+ {
+ throw new ApplicationException("No CompileFile");
+ }
+
+ public string GetCompiledOutputName(IProject project)
+ {
+ NemerleParameters cp = (NemerleParameters)project.ActiveConfiguration;
+
+ return fileUtilityService.GetDirectoryNameWithSeparator(cp.OutputPath)
+ + cp.AssemblyName + ((int)cp.Target == 0?".exe":".dll");
+ }
+
+ public ICompilerResult CompileProject(IProject project)
+ {
+ NemerleParameters cp = (NemerleParameters)project.ActiveConfiguration;
+
+ string references = "";
+ string files = "";
+
+ foreach (ProjectReference lib in project.ProjectReferences)
+ references += " -r \"" + lib.GetReferencedFileName(project) + "\"";
+
+ foreach (ProjectFile f in project.ProjectFiles)
+ if (f.Subtype != Subtype.Directory)
+ switch (f.BuildAction)
+ {
+ case BuildAction.Compile:
+ files += " \"" + f.Name + "\"";
+ break;
+ }
+
+ if (!Directory.Exists(cp.OutputPath))
+ Directory.CreateDirectory(cp.OutputPath);
+
+ string outstr = ncc + GetOptionsString(cp) + references + files + " -o " + GetCompiledOutputName(project);
+ string output = "";
+ string error = "";
+ TempFileCollection tf = new TempFileCollection ();
+// Executor.ExecWaitWithCapture(outstr, tf, ref error , ref output);
+ DoCompilation (outstr, tf, ref output, ref error);
+ ICompilerResult cr = ParseOutput (tf, output);
+ File.Delete(output);
+ File.Delete(error);
+ return cr;
+ }
+
+ private void DoCompilation(string outstr, TempFileCollection tf, ref string output, ref string error)
+ {
+ output = Path.GetTempFileName();
+ error = Path.GetTempFileName();
+
+ string arguments = outstr + " > " + output + " 2> " + error;
+ string command = arguments;
+ ProcessStartInfo si = new ProcessStartInfo("/bin/sh -c \"" + command + "\"");
+ si.RedirectStandardOutput = true;
+ si.RedirectStandardError = true;
+ si.UseShellExecute = false;
+ Process p = new Process();
+ p.StartInfo = si;
+ p.Start();
+ p.WaitForExit();
+ }
+
+ ICompilerResult ParseOutput(TempFileCollection tf, string file)
+ {
+ string compilerOutput = "";
+ string l;
+ StreamReader sr = new StreamReader(file, System.Text.Encoding.Default);
+ CompilerResults cr = new CompilerResults(tf);
+
+ while ((l = sr.ReadLine())!=null)
+ {
+ compilerOutput += l + "\n";
+
+ if ((l.IndexOf(".n:") < 0) &&
+ (l.IndexOf(":0:0:") < 0))
+ continue;
+
+ CompilerError error = new CompilerError();
+
+ int s1 = l.IndexOf(':')+1;
+ int s2 = l.IndexOf(':',s1)+1;
+ int s3 = l.IndexOf(':',s2)+1;
+ int s4 = l.IndexOf(':',s3)+1;
+
+ error.FileName = l.Substring(0, s1-1);
+ error.Line = Int32.Parse(l.Substring(s1, s2-s1-1));
+ error.Column = Int32.Parse(l.Substring(s2, s3-s2-1));
+ error.ErrorNumber = String.Empty;
+ error.ErrorText = "";
+ switch(l.Substring(s3+1, s4-s3-2))
+ {
+ case "error":
+ error.IsWarning = false;
+ break;
+ case "warning":
+ error.IsWarning = true;
+ break;
+ case "hint":
+ error.IsWarning = true;
+ error.ErrorText = "hint: ";
+ break;
+ default:
+ error.IsWarning = false;
+ error.ErrorText = "unknown: ";
+ break;
+ }
+ error.ErrorText += l.Substring(s4+1);
+
+ cr.Errors.Add(error);
+ }
+ sr.Close();
+ return new DefaultCompilerResult(cr, compilerOutput);
+ }
+ }
+}
Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingExecutionServices.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingExecutionServices.cs 2004-04-12 23:09:56 UTC (rev 1451)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingExecutionServices.cs 2004-04-13 18:28:32 UTC (rev 1452)
@@ -1,61 +1,61 @@
-using System;
-using System.IO;
-using System.Diagnostics;
-using System.Collections;
-using System.Reflection;
-using System.Resources;
-using System.Xml;
-using System.CodeDom.Compiler;
-using System.Threading;
-
-using MonoDevelop.Internal.Project;
-using MonoDevelop.Gui;
-using MonoDevelop.Core.Services;
-
-namespace NemerleBinding
-{
- public class NemerleBindingExecutionServices
- {
-
- public void Execute(string filename)
- {
- throw new ApplicationException("No ExecuteFile");
- }
-
- public void Execute(IProject project)
- {
-
- NemerleParameters p = (NemerleParameters)project.ActiveConfiguration;
- FileUtilityService fus = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
- string dir = fus.GetDirectoryNameWithSeparator(p.OutputPath);
- string exe;
-
- if (p.ExecuteCommand == String.Empty)
- {
- exe = "mono --debug";
- } else
- {
- exe = p.ExecuteCommand;
- }
-
- exe += " " + p.AssemblyName + ".exe " + p.Parameters;
-
- try {
- string currentDir = Directory.GetCurrentDirectory();
- Directory.SetCurrentDirectory(dir);
-
- ProcessStartInfo psi = new ProcessStartInfo(exe);
- psi.WorkingDirectory = dir;
- psi.UseShellExecute = false;
-
- Process pr = new Process();
- pr.StartInfo = psi;
- pr.Start();
- Directory.SetCurrentDirectory(currentDir);
- } catch (Exception) {
- throw new ApplicationException("Can not execute");
- }
- }
-
- }
-}
+using System;
+using System.IO;
+using System.Diagnostics;
+using System.Collections;
+using System.Reflection;
+using System.Resources;
+using System.Xml;
+using System.CodeDom.Compiler;
+using System.Threading;
+
+using MonoDevelop.Internal.Project;
+using MonoDevelop.Gui;
+using MonoDevelop.Core.Services;
+
+namespace NemerleBinding
+{
+ public class NemerleBindingExecutionServices
+ {
+
+ public void Execute(string filename)
+ {
+ throw new ApplicationException("No ExecuteFile");
+ }
+
+ public void Execute(IProject project)
+ {
+
+ NemerleParameters p = (NemerleParameters)project.ActiveConfiguration;
+ FileUtilityService fus = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));
+ string dir = fus.GetDirectoryNameWithSeparator(p.OutputPath);
+ string exe;
+
+ if (p.ExecuteCommand == String.Empty)
+ {
+ exe = "mono --debug";
+ } else
+ {
+ exe = p.ExecuteCommand;
+ }
+
+ exe += " " + p.AssemblyName + ".exe " + p.Parameters;
+
+ try {
+ string currentDir = Directory.GetCurrentDirectory();
+ Directory.SetCurrentDirectory(dir);
+
+ ProcessStartInfo psi = new ProcessStartInfo(exe);
+ psi.WorkingDirectory = dir;
+ psi.UseShellExecute = false;
+
+ Process pr = new Process();
+ pr.StartInfo = psi;
+ pr.Start();
+ Directory.SetCurrentDirectory(currentDir);
+ } catch (Exception) {
+ throw new ApplicationException("Can not execute");
+ }
+ }
+
+ }
+}
Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/NemerleLanguageBinding.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/NemerleLanguageBinding.cs 2004-04-12 23:09:56 UTC (rev 1451)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/NemerleLanguageBinding.cs 2004-04-13 18:28:32 UTC (rev 1452)
@@ -1,79 +1,79 @@
-using System;
-using System.IO;
-using System.Diagnostics;
-using System.Collections;
-using System.Reflection;
-using System.Resources;
-using System.Xml;
-
-using MonoDevelop.Internal.Project;
-using MonoDevelop.Internal.Templates;
-using MonoDevelop.Gui;
-
-namespace NemerleBinding
-{
- /// <summary>
- /// This class describes the main functionalaty of a language binding
- /// </summary>
- public class NemerleLanguageBinding : ILanguageBinding
- {
- public const string LanguageName = "Nemerle";
-
- NemerleBindingCompilerServices compilerServices = new NemerleBindingCompilerServices();
- NemerleBindingExecutionServices executionServices = new NemerleBindingExecutionServices();
-
- public string Language {
- get { return LanguageName; }
- }
-
- public void Execute (string filename)
- {
- executionServices.Execute(filename);
- }
-
- public void Execute (IProject project)
- {
- executionServices.Execute (project);
- }
-
- public string GetCompiledOutputName(string fileName)
- {
- return compilerServices.GetCompiledOutputName(fileName);
- }
-
- public string GetCompiledOutputName(IProject project)
- {
- return compilerServices.GetCompiledOutputName(project);
- }
-
- public bool CanCompile(string fileName)
- {
- return compilerServices.CanCompile(fileName);
- }
-
- public ICompilerResult CompileFile(string fileName)
- {
- return compilerServices.CompileFile(fileName);
- }
-
- public ICompilerResult CompileProject(IProject project)
+using System;
+using System.IO;
+using System.Diagnostics;
+using System.Collections;
+using System.Reflection;
+using System.Resources;
+using System.Xml;
+
+using MonoDevelop.Internal.Project;
+using MonoDevelop.Internal.Templates;
+using MonoDevelop.Gui;
+
+namespace NemerleBinding
+{
+ /// <summary>
+ /// This class describes the main functionalaty of a language binding
+ /// </summary>
+ public class NemerleLanguageBinding : ILanguageBinding
+ {
+ public const string LanguageName = "Nemerle";
+
+ NemerleBindingCompilerServices compilerServices = new NemerleBindingCompilerServices();
+ NemerleBindingExecutionServices executionServices = new NemerleBindingExecutionServices();
+
+ public string Language {
+ get { return LanguageName; }
+ }
+
+ public void Execute (string filename)
{
- return compilerServices.CompileProject(project);
- }
-
- public ICompilerResult RecompileProject(IProject project)
+ executionServices.Execute(filename);
+ }
+
+ public void Execute (IProject project)
{
- return CompileProject(project);
- }
-
- public IProject CreateProject(ProjectCreateInformation info, XmlElement projectOptions)
+ executionServices.Execute (project);
+ }
+
+ public string GetCompiledOutputName(string fileName)
{
- return new NemerleProject(info, projectOptions);
- }
-
- public void DebugProject (IProject project)
- {
- throw new ApplicationException("No Nemele debug");
- }
- }
-}
+ return compilerServices.GetCompiledOutputName(fileName);
+ }
+
+ public string GetCompiledOutputName(IProject project)
+ {
+ return compilerServices.GetCompiledOutputName(project);
+ }
+
+ public bool CanCompile(string fileName)
+ {
+ return compilerServices.CanCompile(fileName);
+ }
+
+ public ICompilerResult CompileFile(string fileName)
+ {
+ return compilerServices.CompileFile(fileName);
+ }
+
+ public ICompilerResult CompileProject(IProject project)
+ {
+ return compilerServices.CompileProject(project);
+ }
+
+ public ICompilerResult RecompileProject(IProject project)
+ {
+ return CompileProject(project);
+ }
+
+ public IProject CreateProject(ProjectCreateInformation info, XmlElement projectOptions)
+ {
+ return new NemerleProject(info, projectOptions);
+ }
+
+ public void DebugProject (IProject project)
+ {
+ throw new ApplicationException("No Nemele debug");
+ }
+ }
+}
Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Project/NemerleParameters.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Project/NemerleParameters.cs 2004-04-12 23:09:56 UTC (rev 1451)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Project/NemerleParameters.cs 2004-04-13 18:28:32 UTC (rev 1452)
@@ -1,35 +1,35 @@
-using System;
-using System.Xml;
-using System.Diagnostics;
-
-using MonoDevelop.Internal.Project;
-
-namespace NemerleBinding
-{
+using System;
+using System.Xml;
+using System.Diagnostics;
+
+using MonoDevelop.Internal.Project;
+
+namespace NemerleBinding
+{
public enum CompileTarget
{
Executable,
Library
};
-
- public class NemerleParameters : AbstractProjectConfiguration
+
+ public class NemerleParameters : AbstractProjectConfiguration
{
- [XmlNodeName("CodeGeneration")]
- class CodeGeneration
+ [XmlNodeName("CodeGeneration")]
+ class CodeGeneration
{
[XmlAttribute("target")]
- public CompileTarget target = CompileTarget.Executable;
- [XmlAttribute("nostdmacros")]
- public bool nostdmacros = false;
- [XmlAttribute("nostdlib")]
- public bool nostdlib = false;
- [XmlAttribute("ot")]
- public bool ot = true;
- [XmlAttribute("obcm")]
- public bool obcm = true;
- [XmlAttribute("oocm")]
- public bool oocm = true;
- [XmlAttribute("oscm")]
+ public CompileTarget target = CompileTarget.Executable;
+ [XmlAttribute("nostdmacros")]
+ public bool nostdmacros = false;
+ [XmlAttribute("nostdlib")]
+ public bool nostdlib = false;
+ [XmlAttribute("ot")]
+ public bool ot = true;
+ [XmlAttribute("obcm")]
+ public bool obcm = true;
+ [XmlAttribute("oocm")]
+ public bool oocm = true;
+ [XmlAttribute("oscm")]
public bool oscm = true;
[XmlAttribute("assemblyname")]
@@ -38,25 +38,25 @@
public string outputpath = String.Empty;
[XmlAttribute("parameters")]
public string parameters = String.Empty;
- }
-
- [XmlNodeName("Execution")]
- class Execution
- {
- [XmlAttribute("executecommand")]
- public string executecommand = String.Empty;
}
-
-
- CodeGeneration codeGeneration = new CodeGeneration();
-
- Execution execution = new Execution();
-
+
+ [XmlNodeName("Execution")]
+ class Execution
+ {
+ [XmlAttribute("executecommand")]
+ public string executecommand = String.Empty;
+ }
+
+
+ CodeGeneration codeGeneration = new CodeGeneration();
+
+ Execution execution = new Execution();
+
public CompileTarget Target
{
get { return codeGeneration.target; }
set { codeGeneration.target = value; }
- }
+ }
public bool Nostdmacros
{
get { return codeGeneration.nostdmacros; }
@@ -66,12 +66,12 @@
{
get { return codeGeneration.nostdlib; }
set { codeGeneration.nostdlib = value; }
- }
+ }
public bool Ot
{
get { return codeGeneration.ot; }
set { codeGeneration.ot = value; }
- }
+ }
public bool Obcm
{
get { return codeGeneration.obcm; }
@@ -81,7 +81,7 @@
{
get { return codeGeneration.oocm; }
set { codeGeneration.oocm = value; }
- }
+ }
public bool Oscm
{
get { return codeGeneration.oscm; }
@@ -103,20 +103,20 @@
get { return codeGeneration.parameters; }
set { codeGeneration.parameters = value; }
}
-
+
public string ExecuteCommand
{
get { return execution.executecommand; }
set { execution.executecommand = value; }
}
-
- public NemerleParameters()
- {
- }
- public NemerleParameters(string name)
- {
- this.name = name;
- }
- }
-}
+
+ public NemerleParameters()
+ {
+ }
+ public NemerleParameters(string name)
+ {
+ this.name = name;
+ }
+ }
+}
Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Project/NemerleProject.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Project/NemerleProject.cs 2004-04-12 23:09:56 UTC (rev 1451)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Project/NemerleProject.cs 2004-04-13 18:28:32 UTC (rev 1452)
@@ -1,47 +1,47 @@
-using System;
-using System.IO;
-using System.Collections;
-using System.Diagnostics;
-using System.ComponentModel;
-using System.Xml;
-
-using MonoDevelop.Internal.Project;
-using MonoDevelop.Internal.Templates;
-
-namespace NemerleBinding
-{
- public class NemerleProject : AbstractProject
- {
- public override string ProjectType {
- get {
- return NemerleLanguageBinding.LanguageName;
- }
- }
-
- public override IConfiguration CreateConfiguration()
- {
- return new NemerleParameters();
- }
-
- public NemerleProject()
- {
- }
-
- public NemerleProject(ProjectCreateInformation info, XmlElement projectOptions)
- {
+using System;
+using System.IO;
+using System.Collections;
+using System.Diagnostics;
+using System.ComponentModel;
+using System.Xml;
+
+using MonoDevelop.Internal.Project;
+using MonoDevelop.Internal.Templates;
+
+namespace NemerleBinding
+{
+ public class NemerleProject : AbstractProject
+ {
+ public override string ProjectType {
+ get {
+ return NemerleLanguageBinding.LanguageName;
+ }
+ }
+
+ public override IConfiguration CreateConfiguration()
+ {
+ return new NemerleParameters();
+ }
+
+ public NemerleProject()
+ {
+ }
+
+ public NemerleProject(ProjectCreateInformation info, XmlElement projectOptions)
+ {
if (info != null)
- {
- Name = info.ProjectName;
-
- Configurations.Add(CreateConfiguration("Debug"));
+ {
+ Name = info.ProjectName;
+
+ Configurations.Add(CreateConfiguration("Debug"));
Configurations.Add(CreateConfiguration("Release"));
foreach (NemerleParameters p in Configurations)
{
p.OutputPath = info.BinPath + Path.DirectorySeparatorChar + p.Name;
p.AssemblyName = Name;
- }
- }
- }
- }
-}
+ }
+ }
+ }
+ }
+}
More information about the Monodevelop-patches-list
mailing list