diff options
author | Lluis Sanchez <lluis@novell.com> | 2010-03-17 15:50:19 +0300 |
---|---|---|
committer | Lluis Sanchez <lluis@novell.com> | 2010-03-17 15:50:19 +0300 |
commit | b2c81a6c6d742aacc87a4d190a55ca553cdbdced (patch) | |
tree | 5169bb646665e48e158c1c0bf2e389478d459289 /main/src/addins/ILAsmBinding | |
parent | 13bba2fa864ebe3209ae0673d93f5bbbdb4ecc05 (diff) | |
parent | 585086f0ea0a49166046bb8f48d2def87907d0e0 (diff) |
Merged MD.Projects into MD.Core, and MD.Projects.Gui, MD.Core.Gui
and MD.Components into MD.Ide.
svn path=/trunk/monodevelop/; revision=153749
Diffstat (limited to 'main/src/addins/ILAsmBinding')
-rw-r--r-- | main/src/addins/ILAsmBinding/ChangeLog | 10 | ||||
-rw-r--r-- | main/src/addins/ILAsmBinding/Gui/CompilerParametersPanelWidget.cs | 2 | ||||
-rw-r--r-- | main/src/addins/ILAsmBinding/ILAsmBinding.addin.xml | 3 | ||||
-rw-r--r-- | main/src/addins/ILAsmBinding/ILAsmBinding.csproj | 20 | ||||
-rw-r--r-- | main/src/addins/ILAsmBinding/Makefile.am | 6 | ||||
-rw-r--r-- | main/src/addins/ILAsmBinding/gtk-gui/gui.stetic | 5 |
6 files changed, 13 insertions, 33 deletions
diff --git a/main/src/addins/ILAsmBinding/ChangeLog b/main/src/addins/ILAsmBinding/ChangeLog index e996329827..1eb38ac4bc 100644 --- a/main/src/addins/ILAsmBinding/ChangeLog +++ b/main/src/addins/ILAsmBinding/ChangeLog @@ -1,3 +1,13 @@ +2010-03-17 Lluis Sanchez Gual <lluis@novell.com> + + * Makefile.am: + * gtk-gui/gui.stetic: + * ILAsmBinding.csproj: + * ILAsmBinding.addin.xml: + * Gui/CompilerParametersPanelWidget.cs: Merged MD.Projects + into MD.Core, and MD.Projects.Gui, MD.Core.Gui and + MD.Components into MD.Ide. + 2010-01-28 Lluis Sanchez Gual <lluis@novell.com> * gtk-gui/generated.cs: diff --git a/main/src/addins/ILAsmBinding/Gui/CompilerParametersPanelWidget.cs b/main/src/addins/ILAsmBinding/Gui/CompilerParametersPanelWidget.cs index 894d36c36a..bc66fec385 100644 --- a/main/src/addins/ILAsmBinding/Gui/CompilerParametersPanelWidget.cs +++ b/main/src/addins/ILAsmBinding/Gui/CompilerParametersPanelWidget.cs @@ -68,7 +68,7 @@ namespace ILAsmBinding } } - public class CompilerParametersPanel : MonoDevelop.Projects.Gui.Dialogs.MultiConfigItemOptionsPanel + public class CompilerParametersPanel : MonoDevelop.Ide.Gui.Dialogs.MultiConfigItemOptionsPanel { CompilerParametersPanelWidget widget; diff --git a/main/src/addins/ILAsmBinding/ILAsmBinding.addin.xml b/main/src/addins/ILAsmBinding/ILAsmBinding.addin.xml index 7af3b74031..665d3f666c 100644 --- a/main/src/addins/ILAsmBinding/ILAsmBinding.addin.xml +++ b/main/src/addins/ILAsmBinding/ILAsmBinding.addin.xml @@ -14,9 +14,6 @@ <Dependencies> <Addin id="Core" version="2.2"/> - <Addin id="Core.Gui" version="2.2"/> - <Addin id="Projects" version="2.2"/> - <Addin id="Projects.Gui" version="2.2"/> <Addin id="Ide" version="2.2"/> </Dependencies> diff --git a/main/src/addins/ILAsmBinding/ILAsmBinding.csproj b/main/src/addins/ILAsmBinding/ILAsmBinding.csproj index 4b5410cdd4..d835b540a2 100644 --- a/main/src/addins/ILAsmBinding/ILAsmBinding.csproj +++ b/main/src/addins/ILAsmBinding/ILAsmBinding.csproj @@ -63,31 +63,11 @@ <Name>MonoDevelop.Core</Name> <Private>False</Private> </ProjectReference> - <ProjectReference Include="..\..\core\MonoDevelop.Components\MonoDevelop.Components.csproj"> - <Project>{3344D566-484B-4AEC-BBCF-86BC484D14B0}</Project> - <Name>MonoDevelop.Components</Name> - <Private>False</Private> - </ProjectReference> <ProjectReference Include="..\..\core\MonoDevelop.Ide\MonoDevelop.Ide.csproj"> <Project>{27096E7F-C91C-4AC6-B289-6897A701DF21}</Project> <Name>MonoDevelop.Ide</Name> <Private>False</Private> </ProjectReference> - <ProjectReference Include="..\..\core\MonoDevelop.Core.Gui\MonoDevelop.Core.Gui.csproj"> - <Project>{659B0888-3956-4040-BDB1-B45F6D64E7FA}</Project> - <Name>MonoDevelop.Core.Gui</Name> - <Private>False</Private> - </ProjectReference> - <ProjectReference Include="..\..\core\MonoDevelop.Projects\MonoDevelop.Projects.csproj"> - <Project>{04BED15A-DDC5-48BC-A36C-3E360A0348C0}</Project> - <Name>MonoDevelop.Projects</Name> - <Private>False</Private> - </ProjectReference> - <ProjectReference Include="..\..\core\MonoDevelop.Projects.Gui\MonoDevelop.Projects.Gui.csproj"> - <Project>{00E87426-F1BD-4B55-9B3E-7267EE93E002}</Project> - <Name>MonoDevelop.Projects.Gui</Name> - <Private>False</Private> - </ProjectReference> </ItemGroup> <ItemGroup> <EmbeddedResource Include="ILAsmConsoleProject.xpt.xml"> diff --git a/main/src/addins/ILAsmBinding/Makefile.am b/main/src/addins/ILAsmBinding/Makefile.am index 5888762c5c..54c9b5aa23 100644 --- a/main/src/addins/ILAsmBinding/Makefile.am +++ b/main/src/addins/ILAsmBinding/Makefile.am @@ -3,12 +3,8 @@ ADDIN_BUILD = $(top_builddir)/build/AddIns/BackendBindings ASSEMBLY = $(ADDIN_BUILD)/ILAsmBinding.dll DEPS = \ - $(top_builddir)/build/bin/MonoDevelop.Components.dll \ $(top_builddir)/build/bin/MonoDevelop.Core.dll \ - $(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \ - $(top_builddir)/build/bin/MonoDevelop.Ide.dll \ - $(top_builddir)/build/bin/MonoDevelop.Projects.dll \ - $(top_builddir)/build/bin/MonoDevelop.Projects.Gui.dll + $(top_builddir)/build/bin/MonoDevelop.Ide.dll REFS = \ $(GLIB_SHARP_LIBS) \ diff --git a/main/src/addins/ILAsmBinding/gtk-gui/gui.stetic b/main/src/addins/ILAsmBinding/gtk-gui/gui.stetic index 1f89c45419..492007a0b4 100644 --- a/main/src/addins/ILAsmBinding/gtk-gui/gui.stetic +++ b/main/src/addins/ILAsmBinding/gtk-gui/gui.stetic @@ -1,14 +1,11 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <stetic-interface> <configuration> <images-root-path>..</images-root-path> <target-gtk-version>2.12</target-gtk-version> </configuration> <import> - <widget-library name="../../../../build/bin/MonoDevelop.Components.dll" /> <widget-library name="../../../../build/bin/MonoDevelop.Ide.dll" /> - <widget-library name="../../../../build/bin/MonoDevelop.Core.Gui.dll" /> - <widget-library name="../../../../build/bin/MonoDevelop.Projects.Gui.dll" /> <widget-library name="../../../../build/AddIns/BackendBindings/ILAsmBinding.dll" internal="true" /> </import> <widget class="Gtk.Bin" id="ILAsmBinding.CompilerParametersPanelWidget" design-size="340 110"> |