[Build] Change the build system to use xbuild instead of makefiles (again)

The build 'regression' was a problem in some makefiles. It was fixed in
aea26c16d94490c95f4e61329c137b82a4abfe77

3 files changed, 3 insertions, 486 deletions

diff --git a/main/src/addins/MonoDevelop.GtkCore2/Makefile.am b/main/src/addins/MonoDevelop.GtkCore2/Makefile.am
index 9648571c49..bf3218efd0 100644
--- a/main/src/addins/MonoDevelop.GtkCore2/Makefile.am
+++ b/main/src/addins/MonoDevelop.GtkCore2/Makefile.am
@@ -1,112 +1,3 @@
 SUBDIRS = libstetic libsteticui
 
-ADDIN_BUILD = $(top_builddir)/build/AddIns/MonoDevelop.GtkCore2
-ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.GtkCore2.dll
-
-DEPS =  \
-	$(top_builddir)/build/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll \
-	$(top_builddir)/build/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll \
-	$(top_builddir)/build/AddIns/MonoDevelop.GtkCore2/libstetic2.dll \
-	$(top_builddir)/build/AddIns/MonoDevelop.GtkCore2/libsteticui2.dll \
-	$(top_builddir)/build/bin/Mono.TextEditor.dll \
-	$(top_builddir)/build/bin/MonoDevelop.Core.dll \
-	$(top_builddir)/build/bin/MonoDevelop.Ide.dll
-
-REFS =  \
-	$(GLADE_SHARP_LIBS) \
-	$(GLIB_SHARP_LIBS) \
-	$(GTK_SHARP_LIBS) \
-	$(MONO_ADDINS_LIBS) \
-	-pkg:monodevelop \
-	-r:Mono.Posix \
-	-r:System \
-	-r:System.Core \
-	-r:System.Xml
-
-FILES =  \
-	AssemblyInfo.cs \
-	gtk-gui/generated.cs \
-	gtk-gui/MonoDevelop.GtkCore.Dialogs.GtkDesignerOptionsPanelWidget.cs \
-	gtk-gui/MonoDevelop.GtkCore.Dialogs.ProjectConversionDialog.cs \
-	MonoDevelop.GtkCore.Commands/GtkCommands.cs \
-	MonoDevelop.GtkCore.Dialogs/BindDesignDialog.cs \
-	MonoDevelop.GtkCore.Dialogs/ConfirmWindowDeleteDialog.cs \
-	MonoDevelop.GtkCore.Dialogs/GtkDesignerOptionsPanelWidget.cs \
-	MonoDevelop.GtkCore.Dialogs/GtkFeatureWidget.cs \
-	MonoDevelop.GtkCore.Dialogs/ProjectConversionDialog.cs \
-	MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs \
-	MonoDevelop.GtkCore.Dialogs/WidgetBuilderOptionPanel.cs \
-	MonoDevelop.GtkCore.GuiBuilder/ActionGroupDisplayBinding.cs \
-	MonoDevelop.GtkCore.GuiBuilder/ActionGroupView.cs \
-	MonoDevelop.GtkCore.GuiBuilder/ClassUtils.cs \
-	MonoDevelop.GtkCore.GuiBuilder/CodeBinder.cs \
-	MonoDevelop.GtkCore.GuiBuilder/CombinedDesignView.cs \
-	MonoDevelop.GtkCore.GuiBuilder/GtkProjectServiceExtension.cs \
-	MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDisplayBinding.cs \
-	MonoDevelop.GtkCore.GuiBuilder/GuiBuilderDocumentOutline.cs \
-	MonoDevelop.GtkCore.GuiBuilder/GuiBuilderProject.cs \
-	MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs \
-	MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs \
-	MonoDevelop.GtkCore.GuiBuilder/GuiBuilderWindow.cs \
-	MonoDevelop.GtkCore.GuiBuilder/PropertiesWidget.cs \
-	MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs \
-	MonoDevelop.GtkCore.GuiBuilder/ToolboxProvider.cs \
-	MonoDevelop.GtkCore.NodeBuilders/GuiProjectFolder.cs \
-	MonoDevelop.GtkCore.NodeBuilders/GuiProjectFolderNodeBuilder.cs \
-	MonoDevelop.GtkCore.NodeBuilders/ProjectFileExtension.cs \
-	MonoDevelop.GtkCore.NodeBuilders/ProjectFileNodeBuilderExtension.cs \
-	MonoDevelop.GtkCore.NodeBuilders/ProjectFolderNodeBuilderExtension.cs \
-	MonoDevelop.GtkCore.NodeBuilders/ProjectNodeBuilder.cs \
-	MonoDevelop.GtkCore.NodeBuilders/StockIconsNodeBuilder.cs \
-	MonoDevelop.GtkCore/Counters.cs \
-	MonoDevelop.GtkCore/GtkCoreService.cs \
-	MonoDevelop.GtkCore/GtkDesignInfo.cs \
-	MonoDevelop.GtkCore/ObjectsDocument.cs \
-	MonoDevelop.GtkCore/ProjectResourceProvider.cs \
-	MonoDevelop.GtkCore/ReferenceManager.cs \
-	MonoDevelop.GtkCore/WidgetFileDescriptionTemplate.cs \
-	MonoDevelop.GtkCore/WidgetParser.cs
-
-RES =  \
-	gtk-gui/gui.stetic \
-	gui.glade \
-	icons/actiongroup.png \
-	icons/gtk-logo.png \
-	icons/gtkx.png \
-	icons/image-x-generic.png \
-	icons/widget.png \
-	MonoDevelop.GtkCore2.addin.xml,MonoDevelop.GtkCore.addin.xml \
-	templates/ActionGroup.xft.xml \
-	templates/ActionGroupPartial.xft.xml \
-	templates/Dialog.xft.xml \
-	templates/DialogPartial.xft.xml \
-	templates/DrawingArea.xft.xml \
-	templates/Widget.xft.xml \
-	templates/WidgetPartial.xft.xml \
-	templates/Window.xft.xml \
-	templates/WindowPartial.xft.xml
-
-
-EXTRA_DIST = $(FILES) $(RES)
-
-update-stetic:
-	svn rm -m "Update Stetic sources" svn+ssh://mono-cvs.ximian.com/source/trunk/monodevelop/main/src/addins/MonoDevelop.GtkCore/lib/stetic && \
-	svn cp -m "Update Stetic sources" svn+ssh://mono-cvs.ximian.com/source/trunk/stetic svn+ssh://mono-cvs.ximian.com/source/trunk/monodevelop/main/src/addins/MonoDevelop.GtkCore/lib/stetic
-
-all: $(ASSEMBLY)
-
-$(ADDIN_BUILD)/%: $(srcdir)/lib/%
-	mkdir -p $(ADDIN_BUILD)
-	cp $< $@
-
-$(ASSEMBLY): $(build_sources) $(build_resources) $(DEPS)
-	mkdir -p $(ADDIN_BUILD)
-	$(CSC) $(CSC_FLAGS) -debug -out:$@ -target:library \
-	$(build_resources:%=/resource:%) $(build_sources) $(REFS) $(build_deps)
-
-assemblydir = $(MD_ADDIN_DIR)/MonoDevelop.GtkCore2
-assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb
-
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
-
-include $(top_srcdir)/Makefile.include
+include $(top_srcdir)/xbuild.include
diff --git a/main/src/addins/MonoDevelop.GtkCore2/libstetic/Makefile.am b/main/src/addins/MonoDevelop.GtkCore2/libstetic/Makefile.am
index c90eb8c78b..c9cc87438f 100644
--- a/main/src/addins/MonoDevelop.GtkCore2/libstetic/Makefile.am
+++ b/main/src/addins/MonoDevelop.GtkCore2/libstetic/Makefile.am
@@ -1,269 +1 @@
-ADDIN_BUILD = $(top_builddir)/build/AddIns/MonoDevelop.GtkCore
-ASSEMBLY = $(ADDIN_BUILD)/libstetic.dll
-assemblydir = $(MD_ADDIN_DIR)/MonoDevelop.GtkCore
-assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb $(build_dll_config)
-
-FILES =  \
-	ClassDescriptor.cs \
-	Clipboard.cs \
-	CommandDescriptor.cs \
-	CustomWidget.cs \
-	DND.cs \
-	editor/Accelerator.cs \
-	editor/ActionGroupEditor.cs \
-	editor/ActionItem.cs \
-	editor/ActionMenu.cs \
-	editor/ActionMenuBar.cs \
-	editor/ActionMenuItem.cs \
-	editor/ActionToolbar.cs \
-	editor/ActionToolItem.cs \
-	editor/Boolean.cs \
-	editor/CellRendererComboBox.cs \
-	editor/Char.cs \
-	editor/Color.cs \
-	editor/DateTimeEditor.cs \
-	editor/EditIconDialog.cs \
-	editor/EditIconFactoryDialog.cs \
-	editor/Enumeration.cs \
-	editor/Flags.cs \
-	editor/FlagsSelectorDialog.cs \
-	editor/FloatRange.cs \
-	editor/GroupPicker.cs \
-	editor/IconList.cs \
-	editor/IconSelectorItem.cs \
-	editor/IconSelectorMenu.cs \
-	editor/IconSelectorMenuItem.cs \
-	editor/Identifier.cs \
-	editor/Image.cs \
-	editor/ImageFile.cs \
-	editor/ImageSelector.cs \
-	editor/IntRange.cs \
-	editor/NonContainerWarningDialog.cs \
-	editor/OptIntRange.cs \
-	editor/ProjectIconList.cs \
-	editor/ProjectIconSelectorItem.cs \
-	editor/ResponseId.cs \
-	editor/SelectIconDialog.cs \
-	editor/SelectImageDialog.cs \
-	editor/StockIconList.cs \
-	editor/StockIconSelectorItem.cs \
-	editor/StockItem.cs \
-	editor/String.cs \
-	editor/StringArray.cs \
-	editor/Text.cs \
-	editor/TextBox.cs \
-	editor/TextEditor.cs \
-	editor/TextEditorDialog.cs \
-	editor/ThemedIcon.cs \
-	editor/ThemedIconList.cs \
-	editor/TimeSpanEditor.cs \
-	editor/Translatable.cs \
-	editor/TreeViewCellContainer.cs \
-	editor/WidgetSelector.cs \
-	EnumDescriptor.cs \
-	ErrorWidget.cs \
-	GeneratorContext.cs \
-	GladeException.cs \
-	GladeUtils.cs \
-	IDesignArea.cs \
-	IEditableObject.cs \
-	ImageInfo.cs \
-	IProject.cs \
-	IPropertyEditor.cs \
-	IRadioGroupManager.cs \
-	IResourceProvider.cs \
-	ItemDescriptor.cs \
-	ItemGroup.cs \
-	ItemGroupCollection.cs \
-	NoGuiDispatchAttribute.cs \
-	ObjectReader.cs \
-	ObjectWrapper.cs \
-	ObjectWrapperEventHandler.cs \
-	ObjectWriter.cs \
-	ParamSpec.cs \
-	Placeholder.cs \
-	ProjectIconFactory.cs \
-	PropertyDescriptor.cs \
-	PropertyEditorAttribute.cs \
-	PropertyEditorCell.cs \
-	RadioGroupManager.cs \
-	Registry.cs \
-	Set.cs \
-	SignalDescriptor.cs \
-	TopLevelDialog.cs \
-	TopLevelWindow.cs \
-	TranslatableAttribute.cs \
-	TypedClassDescriptor.cs \
-	TypedPropertyDescriptor.cs \
-	TypedSignalDescriptor.cs \
-	undo/ActionDiffAdaptor.cs \
-	undo/DiffGenerator.cs \
-	undo/IDiffAdaptor.cs \
-	undo/UndoManager.cs \
-	undo/XmlDiffAdaptor.cs \
-	WidgetLibrary.cs \
-	WidgetUtils.cs \
-	wrapper/Action.cs \
-	wrapper/ActionGroup.cs \
-	wrapper/ActionToolbarWrapper.cs \
-	wrapper/ActionTree.cs \
-	wrapper/Bin.cs \
-	wrapper/Box.cs \
-	wrapper/Button.cs \
-	wrapper/ButtonBox.cs \
-	wrapper/CheckButton.cs \
-	wrapper/ColorButton.cs \
-	wrapper/ComboBox.cs \
-	wrapper/ComboBoxEntry.cs \
-	wrapper/Container.cs \
-	wrapper/Custom.cs \
-	wrapper/Dialog.cs \
-	wrapper/Entry.cs \
-	wrapper/Expander.cs \
-	wrapper/Fixed.cs \
-	wrapper/FontButton.cs \
-	wrapper/FontSelectionDialog.cs \
-	wrapper/Frame.cs \
-	wrapper/HScale.cs \
-	wrapper/HScrollbar.cs \
-	wrapper/IconView.cs \
-	wrapper/Image.cs \
-	wrapper/ImageMenuItem.cs \
-	wrapper/Label.cs \
-	wrapper/MenuBar.cs \
-	wrapper/MenuItem.cs \
-	wrapper/MessageDialog.cs \
-	wrapper/Misc.cs \
-	wrapper/Notebook.cs \
-	wrapper/Object.cs \
-	wrapper/OptionMenu.cs \
-	wrapper/Paned.cs \
-	wrapper/RadioActionGroupManager.cs \
-	wrapper/RadioButton.cs \
-	wrapper/RadioMenuItem.cs \
-	wrapper/RadioToolButton.cs \
-	wrapper/Range.cs \
-	wrapper/Scale.cs \
-	wrapper/ScrolledWindow.cs \
-	wrapper/Signal.cs \
-	wrapper/SignalChangedEventHandler.cs \
-	wrapper/SignalCollection.cs \
-	wrapper/SignalEventHandler.cs \
-	wrapper/SpinButton.cs \
-	wrapper/Table.cs \
-	wrapper/TextView.cs \
-	wrapper/ToggleToolButton.cs \
-	wrapper/Toolbar.cs \
-	wrapper/ToolButton.cs \
-	wrapper/TreeView.cs \
-	wrapper/Viewport.cs \
-	wrapper/VScale.cs \
-	wrapper/VScrollbar.cs \
-	wrapper/Widget.cs \
-	wrapper/WidgetEventHandler.cs \
-	wrapper/WidgetNameChangedHandler.cs \
-	wrapper/Window.cs
-
-RES =  \
-	stetic.glade \
-	wrapper/objects.xml \
-	wrapper/pixmaps/accellabel.png \
-	wrapper/pixmaps/actiongroup.png \
-	wrapper/pixmaps/add-check-label.png \
-	wrapper/pixmaps/add-menu.png \
-	wrapper/pixmaps/alignment.png \
-	wrapper/pixmaps/arrow.png \
-	wrapper/pixmaps/box-expand.png \
-	wrapper/pixmaps/box-fill.png \
-	wrapper/pixmaps/button.png \
-	wrapper/pixmaps/calendar.png \
-	wrapper/pixmaps/cell-expand-h.png \
-	wrapper/pixmaps/cell-expand-v.png \
-	wrapper/pixmaps/cell-fill-h.png \
-	wrapper/pixmaps/cell-fill-v.png \
-	wrapper/pixmaps/checkbutton.png \
-	wrapper/pixmaps/colorbutton.png \
-	wrapper/pixmaps/colorselection.png \
-	wrapper/pixmaps/colorselectiondialog.png \
-	wrapper/pixmaps/combo.png \
-	wrapper/pixmaps/comboentry.png \
-	wrapper/pixmaps/custom.png \
-	wrapper/pixmaps/dec-border.png \
-	wrapper/pixmaps/dialog.png \
-	wrapper/pixmaps/drawingarea.png \
-	wrapper/pixmaps/entry.png \
-	wrapper/pixmaps/eventbox.png \
-	wrapper/pixmaps/expander.png \
-	wrapper/pixmaps/fileselection.png \
-	wrapper/pixmaps/fixed.png \
-	wrapper/pixmaps/fontbutton.png \
-	wrapper/pixmaps/fontselection.png \
-	wrapper/pixmaps/fontselectiondialog.png \
-	wrapper/pixmaps/frame.png \
-	wrapper/pixmaps/globe.png \
-	wrapper/pixmaps/globe-not.png \
-	wrapper/pixmaps/handlebox.png \
-	wrapper/pixmaps/hbox.png \
-	wrapper/pixmaps/hbuttonbox.png \
-	wrapper/pixmaps/hpaned.png \
-	wrapper/pixmaps/hscale.png \
-	wrapper/pixmaps/hscrollbar.png \
-	wrapper/pixmaps/hseparator.png \
-	wrapper/pixmaps/iconview.png \
-	wrapper/pixmaps/image.png \
-	wrapper/pixmaps/inc-border.png \
-	wrapper/pixmaps/label.png \
-	wrapper/pixmaps/menu.png \
-	wrapper/pixmaps/menubar.png \
-	wrapper/pixmaps/messagedialog.png \
-	wrapper/pixmaps/missing.png \
-	wrapper/pixmaps/notebook.png \
-	wrapper/pixmaps/optionmenu.png \
-	wrapper/pixmaps/progressbar.png \
-	wrapper/pixmaps/radiobutton.png \
-	wrapper/pixmaps/remove-check-label.png \
-	wrapper/pixmaps/remove-menu.png \
-	wrapper/pixmaps/scrolledwindow.png \
-	wrapper/pixmaps/spinbutton.png \
-	wrapper/pixmaps/statusbar.png \
-	wrapper/pixmaps/table.png \
-	wrapper/pixmaps/textview.png \
-	wrapper/pixmaps/togglebutton.png \
-	wrapper/pixmaps/toolbar.png \
-	wrapper/pixmaps/treeview.png \
-	wrapper/pixmaps/vbox.png \
-	wrapper/pixmaps/vbuttonbox.png \
-	wrapper/pixmaps/viewport.png \
-	wrapper/pixmaps/vpaned.png \
-	wrapper/pixmaps/vscale.png \
-	wrapper/pixmaps/vscrollbar.png \
-	wrapper/pixmaps/vseparator.png \
-	wrapper/pixmaps/widget.png \
-	wrapper/pixmaps/window.png
-
-REFS =  \
-	$(GLADE_SHARP_LIBS) \
-	$(GLIB_SHARP_LIBS) \
-	$(GTK_SHARP_LIBS) \
-	$(MONO_CAIRO_LIBS) \
-	-r:Mono.Posix \
-	-r:System \
-	-r:System.Core \
-	-r:System.Xml
-
-dll_config = libstetic.dll.config
-build_dll_config = $(ADDIN_BUILD)/$(dll_config)
-
-EXTRA_DIST = $(FILES) $(RES) $(dll_config) wrapper/pixmaps/COPIED
-
-$(ASSEMBLY): $(build_sources) $(build_resources) $(DEPS)
-	mkdir -p $(ADDIN_BUILD)
-	$(CSC) $(CSC_FLAGS) -debug -out:$@ -target:library $(build_resources:%=/resource:%) $(build_sources) $(REFS)
-
-$(build_dll_config): $(srcdir)/$(dll_config)
-	mkdir -p $(ADDIN_BUILD)
-	cp $(srcdir)/$(dll_config) $@
-
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(build_dll_config)
-
-include $(top_srcdir)/Makefile.include
+include $(top_srcdir)/xbuild.include
diff --git a/main/src/addins/MonoDevelop.GtkCore2/libsteticui/Makefile.am b/main/src/addins/MonoDevelop.GtkCore2/libsteticui/Makefile.am
index 5128750332..c9cc87438f 100644
--- a/main/src/addins/MonoDevelop.GtkCore2/libsteticui/Makefile.am
+++ b/main/src/addins/MonoDevelop.GtkCore2/libsteticui/Makefile.am
@@ -1,107 +1 @@
-ADDIN_BUILD = $(top_builddir)/build/AddIns/MonoDevelop.GtkCore
-ASSEMBLY = $(ADDIN_BUILD)/libsteticui.dll
-assemblydir = $(MD_ADDIN_DIR)/MonoDevelop.GtkCore
-assembly_DATA = $(ASSEMBLY) $(ASSEMBLY).mdb $(build_dll_config)
-
-FILES =  \
-	ActionComponent.cs \
-	ActionGroupComponent.cs \
-	ActionGroupDesigner.cs \
-	ActionGroupDesignerBackend.cs \
-	ActionGroupEditSession.cs \
-	ActionGroupToolbar.cs \
-	Application.cs \
-	ApplicationBackend.cs \
-	ApplicationBackendController.cs \
-	AssemblyResolver.cs \
-	AssemblyWidgetLibrary.cs \
-	CecilClassDescriptor.cs \
-	CecilPropertyDescriptor.cs \
-	CecilSignalDescriptor.cs \
-	CecilWidgetLibrary.cs \
-	CodeGenerationResult.cs \
-	CodeGenerator.cs \
-	CodeGeneratorPartialClass.cs \
-	Component.cs \
-	ComponentEventHandler.cs \
-	ComponentSignalEventHandler.cs \
-	ComponentType.cs \
-	ContainerUndoRedoManager.cs \
-	ContextMenu.cs \
-	Designer.cs \
-	Glade.cs \
-	Grid.cs \
-	GuiDispatchServerSink.cs \
-	GuiDispatchServerSinkProvider.cs \
-	IProjectDesignInfo.cs \
-	LibraryCache.cs \
-	Metacity/ButtonFunction.cs \
-	Metacity/ButtonLayout.cs \
-	Metacity/FrameFlags.cs \
-	Metacity/FrameType.cs \
-	Metacity/ObjectManager.cs \
-	Metacity/Preview.cs \
-	Metacity/Theme.cs \
-	Palette.cs \
-	PaletteBackend.cs \
-	PluggableWidget.cs \
-	Project.cs \
-	ProjectBackend.cs \
-	ProjectViewBackend.cs \
-	PropertyEditor.cs \
-	PropertyGrid.cs \
-	PropertyTree.cs \
-	Shadow.cs \
-	SignalsEditor.cs \
-	SignalsEditorBackend.cs \
-	UndoQueue.cs \
-	UserInterface.cs \
-	WidgetActionBar.cs \
-	WidgetComponent.cs \
-	WidgetDesigner.cs \
-	WidgetDesignerBackend.cs \
-	WidgetEditSession.cs \
-	WidgetFactory.cs \
-	WidgetInfoEventHandler.cs \
-	WidgetPropertyTree.cs \
-	WidgetPropertyTreeBackend.cs \
-	WidgetTree.cs \
-	WidgetTreeCombo.cs \
-	Windows/Preview.cs \
-	Windows/WindowsTheme.cs
-
-RES =  \
-	action.png \
-	missing.png
-
-DEPS = ../../../../build/AddIns/MonoDevelop.GtkCore2/libstetic2.dll
-
-REFS =  \
-	$(GLADE_SHARP_LIBS) \
-	$(GLIB_SHARP_LIBS) \
-	$(GTK_SHARP_LIBS) \
-	-pkg:monodevelop \
-	-r:Mono.Posix \
-	-r:System \
-	-r:System.Core \
-	-r:System.Runtime.Remoting \
-	-r:System.Xml
-
-$(ASSEMBLY): $(build_sources) $(build_resources) $(DEPS)
-	mkdir -p $(ADDIN_BUILD)
-	$(CSC) $(CSC_FLAGS) -debug -unsafe -main:Stetic.ApplicationBackend -out:$@ \
-	$(build_resources:%=/resource:%) $(build_sources) $(REFS) $(build_deps)
-
-dll_config = libsteticui.dll.config
-build_dll_config = $(ADDIN_BUILD)/$(dll_config)
-
-$(build_dll_config): $(srcdir)/$(dll_config)
-	mkdir -p $(ADDIN_BUILD)
-	cp $(srcdir)/$(dll_config) $@
-
-EXTRA_DIST = $(FILES) $(RES) $(dll_config)
-
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
-
-include $(top_srcdir)/Makefile.include
-
+include $(top_srcdir)/xbuild.include