[Monodevelop-patches-list] r2129 - in trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding: . Gui Project
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Thu Jan 13 19:28:06 EST 2005
Author: lluis
Date: 2005-01-13 19:28:05 -0500 (Thu, 13 Jan 2005)
New Revision: 2129
Removed:
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Gui/OutputPanel.cs
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingExecutionServices.cs.in
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Project/NemerleProject.cs
Modified:
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/ChangeLog
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Gui/CodeGenerationPanel.cs
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Makefile.am
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Nemerle.glade
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleBinding.addin.xml
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingCompilerServices.cs
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleLanguageBinding.cs
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Project/NemerleParameters.cs
Log:
2005-01-11 Lluis Sanchez Gual <lluis at novell.com>
* NemerleBinding.addin.xml:
* Gui/CodeGenerationPanel.cs:
* NemerleLanguageBinding.cs:
* NemerleBindingCompilerServices.cs: Follow architecture changes.
* Project/NemerleParameters.cs: Moved some common parameters to
DotNetProjectConfiguration.
* Gui/OutputPanel.cs:
* Nemerle.glade: Removed dialog now implemented in Monodevelop.Base.
* Project/NemerleProject.cs:
* NemerleBindingExecutionServices.cs.in: Removed.
* Makefile.am: Updated.
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/ChangeLog 2005-01-14 00:27:48 UTC (rev 2128)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/ChangeLog 2005-01-14 00:28:05 UTC (rev 2129)
@@ -1,3 +1,20 @@
+2005-01-11 Lluis Sanchez Gual <lluis at novell.com>
+
+ * NemerleBinding.addin.xml:
+ * Gui/CodeGenerationPanel.cs:
+ * NemerleLanguageBinding.cs:
+ * NemerleBindingCompilerServices.cs: Follow architecture changes.
+
+ * Project/NemerleParameters.cs: Moved some common parameters to
+ DotNetProjectConfiguration.
+
+ * Gui/OutputPanel.cs:
+ * Nemerle.glade: Removed dialog now implemented in Monodevelop.Base.
+
+ * Project/NemerleProject.cs:
+ * NemerleBindingExecutionServices.cs.in: Removed.
+ * Makefile.am: Updated.
+
2004-12-13 Lluis Sanchez Gual <lluis at novell.com>
* NemerleBindingCompilerServices.cs: StatusBarService.ProgressMonitor is
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Gui/CodeGenerationPanel.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Gui/CodeGenerationPanel.cs 2005-01-14 00:27:48 UTC (rev 2128)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Gui/CodeGenerationPanel.cs 2005-01-14 00:28:05 UTC (rev 2129)
@@ -28,16 +28,18 @@
[Glade.Widget] CheckButton oscm;
NemerleParameters compilerParameters = null;
+ DotNetProjectConfiguration configuration;
public CodeGenerationPanelWidget(IProperties CustomizationObject) : base ("Nemerle.glade", "CodeGenerationPanel")
{
- compilerParameters = (NemerleParameters)((IProperties)CustomizationObject).GetProperty("Config");
+ configuration = (DotNetProjectConfiguration) ((IProperties)CustomizationObject).GetProperty("Config");
+ compilerParameters = (NemerleParameters) configuration.CompilationParameters;
- target.SetHistory ( (uint) compilerParameters.Target);
+ target.SetHistory ( (uint) configuration.CompileTarget);
nostdmacros.Active = compilerParameters.Nostdmacros;
nostdlib.Active = compilerParameters.Nostdlib;
- ignorewarnings.Active = compilerParameters.RunWithWarnings;
+ ignorewarnings.Active = configuration.RunWithWarnings;
ot.Active = compilerParameters.Ot;
obcm.Active = compilerParameters.Obcm;
oocm.Active = compilerParameters.Oocm;
@@ -46,10 +48,10 @@
public bool Store ()
{
- compilerParameters.Target = (NemerleBinding.CompileTarget)target.History;
+ configuration.CompileTarget = (CompileTarget)target.History;
compilerParameters.Nostdmacros = nostdmacros.Active;
compilerParameters.Nostdlib = nostdlib.Active;
- compilerParameters.RunWithWarnings = ignorewarnings.Active;
+ configuration.RunWithWarnings = ignorewarnings.Active;
compilerParameters.Ot = ot.Active;
compilerParameters.Obcm = obcm.Active;
compilerParameters.Oocm = oocm.Active;
Deleted: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Gui/OutputPanel.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Gui/OutputPanel.cs 2005-01-14 00:27:48 UTC (rev 2128)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Gui/OutputPanel.cs 2005-01-14 00:28:05 UTC (rev 2129)
@@ -1,71 +0,0 @@
-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.OutputAssembly;
- outputPath.Text = compilerParameters.OutputDirectory;
- parameters.Text = compilerParameters.Parameters;
- executeCommand.Text = compilerParameters.ExecuteScript;
- }
-
- public bool Store ()
- {
- compilerParameters.OutputAssembly = assemblyName.Text;
- compilerParameters.OutputDirectory = outputPath.Text;
- compilerParameters.Parameters = parameters.Text;
- compilerParameters.ExecuteScript = executeCommand.Text;
- return true;
- }
- void SelectFolder(object sender, EventArgs e)
- {
- using (FileSelector fdiag = new FileSelector ("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/Core/src/AddIns/BackendBindings/NemerleBinding/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Makefile.am 2005-01-14 00:27:48 UTC (rev 2128)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Makefile.am 2005-01-14 00:28:05 UTC (rev 2129)
@@ -12,9 +12,7 @@
FILES = \
Gui/CodeGenerationPanel.cs \
-Gui/OutputPanel.cs \
Project/NemerleParameters.cs \
-Project/NemerleProject.cs \
NemerleBindingCompilerServices.cs \
NemerleLanguageBinding.cs
@@ -25,7 +23,7 @@
NemerleGtkSharpWindow.xft.xml \
EmptyNemerleFile.xft.xml
-build_sources = $(addprefix $(srcdir)/, $(FILES)) NemerleBindingExecutionServices.cs
+build_sources = $(addprefix $(srcdir)/, $(FILES))
build_TEMPLATES = $(addprefix $(ADDIN_BUILD)/templates/, $(TEMPLATES))
@@ -62,5 +60,4 @@
template_DATA = $(TEMPLATES)
CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
-DISTCLEANFILES = NemerleBindingExecutionServices.cs
-EXTRA_DIST = $(FILES) NemerleBindingExecutionServices.cs.in Nemerle.glade $(ADDIN) $(TEMPLATES)
+EXTRA_DIST = $(FILES) Nemerle.glade $(ADDIN) $(TEMPLATES)
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Nemerle.glade
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Nemerle.glade 2005-01-14 00:27:48 UTC (rev 2128)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Nemerle.glade 2005-01-14 00:28:05 UTC (rev 2129)
@@ -11,6 +11,11 @@
<property name="modal">False</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<child>
<widget class="GtkVBox" id="vbox62">
@@ -157,6 +162,7 @@
<property name="label" translatable="yes">Do not load standard macros</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -175,6 +181,7 @@
<property name="label" translatable="yes">Do not load standard library</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -193,6 +200,7 @@
<property name="label" translatable="yes">Ignore warnings</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -279,6 +287,7 @@
<property name="label" translatable="yes">General tail call optimization</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -297,6 +306,7 @@
<property name="label" translatable="yes">Ordinal constant matching optimization</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -315,6 +325,7 @@
<property name="label" translatable="yes">String constant matching optimization</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -333,6 +344,7 @@
<property name="label" translatable="yes">Boolean constant matching optimization</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
@@ -361,381 +373,4 @@
</child>
</widget>
-<widget class="GtkWindow" id="OutputPanel">
- <property name="visible">True</property>
- <property name="title" translatable="yes">OutputPanel</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
- <property name="modal">False</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">OutputPanel</atkproperty>
- </accessibility>
-
- <child>
- <widget class="GtkVBox" id="vbox66">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">12</property>
-
- <child>
- <widget class="GtkLabel" id="label93">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Output</b></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox57">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="label91">
- <property name="visible">True</property>
- <property name="label" translatable="yes"> </property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVBox" id="vbox69">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">6</property>
-
- <child>
- <widget class="GtkTable" id="table10">
- <property name="visible">True</property>
- <property name="n_rows">3</property>
- <property name="n_columns">3</property>
- <property name="homogeneous">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
-
- <child>
- <widget class="GtkLabel" id="label98">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Assembly _name</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="mnemonic_widget">assemblyName</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label99">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Output _path</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="mnemonic_widget">outputPath</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label100">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Paramet_ers</property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="mnemonic_widget">parameters</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="outputPath">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
- <property name="activates_default">False</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="outputPathButton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">...</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="assemblyName">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
- <property name="activates_default">False</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">3</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="parameters">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
- <property name="activates_default">False</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label94">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Execute scripts </b></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox58">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="label92">
- <property name="visible">True</property>
- <property name="label" translatable="yes"> </property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkTable" id="table9">
- <property name="visible">True</property>
- <property name="n_rows">1</property>
- <property name="n_columns">2</property>
- <property name="homogeneous">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
-
- <child>
- <widget class="GtkLabel" id="label95">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Execute Command</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkEntry" id="executeCommand">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
- <property name="activates_default">False</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="y_options"></property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
</glade-interface>
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleBinding.addin.xml
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleBinding.addin.xml 2005-01-14 00:27:48 UTC (rev 2128)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleBinding.addin.xml 2005-01-14 00:28:05 UTC (rev 2129)
@@ -33,7 +33,7 @@
</Extension>
<Extension path = "/SharpDevelop/Workbench/ProjectOptions/ConfigurationProperties">
- <Conditional activeproject = "Nemerle">
+ <Conditional activelanguage = "Nemerle">
<DialogPanel id = "NemerleCodeGenerationPanel"
_label = "Code Generation"
class = "NemerleBinding.CodeGenerationPanel"/>
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingCompilerServices.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingCompilerServices.cs 2005-01-14 00:27:48 UTC (rev 2128)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingCompilerServices.cs 2005-01-14 00:28:05 UTC (rev 2129)
@@ -80,7 +80,7 @@
FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
static string ncc = "ncc";
- private string GetOptionsString(NemerleParameters cp)
+ private string GetOptionsString (DotNetProjectConfiguration configuration, NemerleParameters cp)
{
string options = " ";
if (cp.Nostdmacros)
@@ -95,7 +95,7 @@
options += " -Oocm";
if (cp.Oscm)
options += " -Oscm";
- if ((int)cp.Target == 1)
+ if (configuration.CompileTarget == CompileTarget.Library)
options += " -tdll";
return options;
@@ -106,35 +106,18 @@
return Path.GetExtension(fileName) == ".n";
}
- public ICompilerResult CompileFile(string fileName)
+ public ICompilerResult Compile (ProjectFileCollection projectFiles, ProjectReferenceCollection projectReferences, DotNetProjectConfiguration configuration)
{
- 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;
+ NemerleParameters cp = (NemerleParameters) configuration.CompilationParameters;
+ if (cp == null) cp = new NemerleParameters ();
- return fileUtilityService.GetDirectoryNameWithSeparator(cp.OutputDirectory)
- + cp.OutputAssembly + ((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 (ProjectReference lib in projectReferences)
+ references += " -r \"" + lib.GetReferencedFileName() + "\"";
- foreach (ProjectFile f in project.ProjectFiles)
+ foreach (ProjectFile f in projectFiles)
if (f.Subtype != Subtype.Directory)
switch (f.BuildAction)
{
@@ -143,10 +126,10 @@
break;
}
- if (!Directory.Exists(cp.OutputDirectory))
- Directory.CreateDirectory(cp.OutputDirectory);
+ if (!Directory.Exists (configuration.OutputDirectory))
+ Directory.CreateDirectory (configuration.OutputDirectory);
- string args = "-q -no-color " + GetOptionsString(cp) + references + files + " -o " + GetCompiledOutputName(project);
+ string args = "-q -no-color " + GetOptionsString (configuration, cp) + references + files + " -o " + configuration.CompiledOutputName;
return DoCompilation (args);
}
@@ -211,14 +194,14 @@
return cr.GetResult();
}
- public void GenerateMakefile (IProject project, Combine parentCombine)
+ public void GenerateMakefile (Project project, Combine parentCombine)
{
StreamWriter stream = new StreamWriter (Path.Combine (project.BaseDirectory, "Makefile." + project.Name.Replace (" ", "")));
- NemerleProject p = (NemerleProject)project;
- NemerleParameters cp =(NemerleParameters)p.ActiveConfiguration;
+ DotNetProjectConfiguration configuration = (DotNetProjectConfiguration) project.ActiveConfiguration;
+ NemerleParameters cp = (NemerleParameters) configuration.CompilationParameters;
- string outputName = Path.GetFileName(GetCompiledOutputName(project));
+ string outputName = Path.GetFileName (configuration.CompiledOutputName);
string relativeOutputDir = fileUtilityService.AbsoluteToRelativePath (project.BaseDirectory, parentCombine.OutputDirectory);
@@ -246,26 +229,26 @@
case ReferenceType.Gac:
string pkg = sas.GetPackageFromFullName (lib.Reference);
if (pkg == "MONO-SYSTEM") {
- system_references.Add (Path.GetFileName (lib.GetReferencedFileName (project)));
+ system_references.Add (Path.GetFileName (lib.GetReferencedFileName ()));
} else if (!pkg_references.Contains (pkg)) {
pkg_references.Add (pkg);
}
break;
case ReferenceType.Assembly:
- string assembly_fileName = lib.GetReferencedFileName (project);
+ string assembly_fileName = lib.GetReferencedFileName ();
string rel_path_to = fileUtilityService.AbsoluteToRelativePath (project.BaseDirectory, Path.GetDirectoryName (assembly_fileName));
assembly_references.Add (Path.Combine (rel_path_to, Path.GetFileName (assembly_fileName)));
break;
case ReferenceType.Project:
- string project_fileName = lib.GetReferencedFileName (project);
+ string project_fileName = lib.GetReferencedFileName ();
IProjectService prjService = (IProjectService)ServiceManager.GetService (typeof (IProjectService));
- ArrayList allProjects = Combine.GetAllProjects(prjService.CurrentOpenCombine);
+ CombineEntryCollection allProjects = prjService.CurrentOpenCombine.GetAllProjects();
- foreach (ProjectCombineEntry projectEntry in allProjects) {
- if (projectEntry.Project.Name == lib.Reference) {
- string project_base_dir = fileUtilityService.AbsoluteToRelativePath (project.BaseDirectory, projectEntry.Project.BaseDirectory);
+ foreach (Project projectEntry in allProjects) {
+ if (projectEntry.Name == lib.Reference) {
+ string project_base_dir = fileUtilityService.AbsoluteToRelativePath (project.BaseDirectory, projectEntry.BaseDirectory);
- string project_output_fileName = prjService.GetOutputAssemblyName (projectEntry.Project);
+ string project_output_fileName = projectEntry.GetOutputFileName ();
project_references.Add (Path.Combine (project_base_dir, Path.GetFileName (project_output_fileName)));
}
}
@@ -349,7 +332,7 @@
stream.WriteLine ();
}
- stream.Write ("NCC_OPTIONS = " + GetOptionsString(cp));
+ stream.Write ("NCC_OPTIONS = " + GetOptionsString (configuration, cp));
stream.WriteLine ();
stream.WriteLine ();
Deleted: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingExecutionServices.cs.in
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingExecutionServices.cs.in 2005-01-14 00:27:48 UTC (rev 2128)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleBindingExecutionServices.cs.in 2005-01-14 00:28:05 UTC (rev 2129)
@@ -1,59 +0,0 @@
-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.GetService(typeof(FileUtilityService));
- string exe;
-
- if (p.ExecuteScript == String.Empty)
- {
- exe = "@RUNTIME@ ";
- } else
- {
- exe = p.ExecuteScript;
- }
-
- exe += " " + p.OutputAssembly + ".exe " + p.Parameters;
-
- try {
- ProcessStartInfo psi = new ProcessStartInfo("xterm",
- string.Format (
- @"-e ""{0} ;echo;read -p 'press any key to continue...' -n1""",
- exe));
- psi.WorkingDirectory = fus.GetDirectoryNameWithSeparator(p.OutputDirectory);
- psi.UseShellExecute = false;
-
- Process pr = new Process();
- pr.StartInfo = psi;
- pr.Start();
- } catch (Exception) {
- throw new ApplicationException("Can not execute");
- }
- }
-
- }
-}
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleLanguageBinding.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleLanguageBinding.cs 2005-01-14 00:27:48 UTC (rev 2128)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleLanguageBinding.cs 2005-01-14 00:28:05 UTC (rev 2129)
@@ -9,6 +9,7 @@
using MonoDevelop.Internal.Project;
using MonoDevelop.Internal.Templates;
using MonoDevelop.Gui;
+using MonoDevelop.Services;
namespace NemerleBinding
{
@@ -20,67 +21,36 @@
public const string LanguageName = "Nemerle";
NemerleBindingCompilerServices compilerServices = new NemerleBindingCompilerServices();
- NemerleBindingExecutionServices executionServices = new NemerleBindingExecutionServices();
- public string Language {
- get { return LanguageName; }
- }
-
- public void Execute (string filename)
+ public NemerleLanguageBinding ()
{
- executionServices.Execute(filename);
+ Runtime.ProjectService.DataContext.IncludeType (typeof(NemerleParameters));
}
- public void Execute (IProject project)
- {
- executionServices.Execute (project);
+ public string Language {
+ get { return LanguageName; }
}
- 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)
+ public ICompilerResult Compile (ProjectFileCollection projectFiles, ProjectReferenceCollection references, DotNetProjectConfiguration configuration)
{
- return compilerServices.CompileFile(fileName);
+ return compilerServices.Compile (projectFiles, references, configuration);
}
- public ICompilerResult CompileProject(IProject project)
+ public void GenerateMakefile (Project project, Combine parentCombine)
{
- return compilerServices.CompileProject(project);
+ compilerServices.GenerateMakefile(project, parentCombine);
}
- public ICompilerResult RecompileProject(IProject project)
+ public object CreateCompilationParameters (XmlElement projectOptions)
{
- return CompileProject(project);
+ return new NemerleParameters ();
}
- public IProject CreateProject(ProjectCreateInformation info, XmlElement projectOptions)
- {
- return new NemerleProject(info, projectOptions);
- }
-
- public void DebugProject (IProject project)
- {
- throw new ApplicationException("No Nemele debug");
- }
-
- public void GenerateMakefile (IProject project, Combine parentCombine)
- {
- compilerServices.GenerateMakefile(project, parentCombine);
- }
-
// http://nemerle.org/csharp-diff.html
public string CommentTag
{
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Project/NemerleParameters.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Project/NemerleParameters.cs 2005-01-14 00:27:48 UTC (rev 2128)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Project/NemerleParameters.cs 2005-01-14 00:28:05 UTC (rev 2129)
@@ -3,89 +3,68 @@
using System.Diagnostics;
using MonoDevelop.Internal.Project;
+using MonoDevelop.Internal.Serialization;
namespace NemerleBinding
{
- public enum CompileTarget
+ public class NemerleParameters
{
- Executable,
- Library
- };
-
- public class NemerleParameters : AbstractProjectConfiguration
- {
- [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 = false;
- [XmlAttribute("obcm")]
- public bool obcm = true;
- [XmlAttribute("oocm")]
- public bool oocm = true;
- [XmlAttribute("oscm")]
- public bool oscm = true;
-
- [XmlAttribute("parameters")]
- public string parameters = String.Empty;
- }
+ [ItemProperty("nostdmacros")]
+ public bool nostdmacros = false;
+
+ [ItemProperty("nostdlib")]
+ public bool nostdlib = false;
+
+ [ItemProperty("ot")]
+ public bool ot = false;
+
+ [ItemProperty("obcm")]
+ public bool obcm = true;
+
+ [ItemProperty("oocm")]
+ public bool oocm = true;
+
+ [ItemProperty("oscm")]
+ public bool oscm = true;
+
+ [ItemProperty("parameters")]
+ public string parameters = String.Empty;
- CodeGeneration codeGeneration = new CodeGeneration();
-
- public CompileTarget Target
- {
- get { return codeGeneration.target; }
- set { codeGeneration.target = value; }
- }
public bool Nostdmacros
{
- get { return codeGeneration.nostdmacros; }
- set { codeGeneration.nostdmacros = value; }
+ get { return nostdmacros; }
+ set { nostdmacros = value; }
}
public bool Nostdlib
{
- get { return codeGeneration.nostdlib; }
- set { codeGeneration.nostdlib = value; }
+ get { return nostdlib; }
+ set { nostdlib = value; }
}
public bool Ot
{
- get { return codeGeneration.ot; }
- set { codeGeneration.ot = value; }
+ get { return ot; }
+ set { ot = value; }
}
public bool Obcm
{
- get { return codeGeneration.obcm; }
- set { codeGeneration.obcm = value; }
+ get { return obcm; }
+ set { obcm = value; }
}
public bool Oocm
{
- get { return codeGeneration.oocm; }
- set { codeGeneration.oocm = value; }
+ get { return oocm; }
+ set { oocm = value; }
}
public bool Oscm
{
- get { return codeGeneration.oscm; }
- set { codeGeneration.oscm = value; }
+ get { return oscm; }
+ set { oscm = value; }
}
public string Parameters
{
- get { return codeGeneration.parameters; }
- set { codeGeneration.parameters = value; }
+ get { return parameters; }
+ set { parameters = value; }
}
-
- public NemerleParameters()
- {
- }
- public NemerleParameters(string name)
- {
- this.name = name;
- }
}
}
Deleted: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Project/NemerleProject.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Project/NemerleProject.cs 2005-01-14 00:27:48 UTC (rev 2128)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Project/NemerleProject.cs 2005-01-14 00:28:05 UTC (rev 2129)
@@ -1,48 +0,0 @@
-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"));
- Configurations.Add(CreateConfiguration("Release"));
-
- foreach (NemerleParameters p in Configurations)
- {
- p.OutputDirectory = info.BinPath + Path.DirectorySeparatorChar + p.Name;
- p.OutputAssembly = Name;
- p.RunWithWarnings = true;
- }
- }
- }
- }
-}
More information about the Monodevelop-patches-list
mailing list