November 2010 - openSUSE Commits - openSUSE Mailing Lists

commit monodevelop-boo for openSUSE:Factory
by root＠hilbert.suse.de 05 Nov '10

05 Nov '10

Hello community, here is the log from the commit of package monodevelop-boo for openSUSE:Factory checked in at Fri Nov 5 16:30:28 CET 2010. -------- --- GNOME/monodevelop-boo/monodevelop-boo.changes 2010-03-16 18:20:49.000000000 +0100 +++ monodevelop-boo/monodevelop-boo.changes 2010-10-29 19:12:06.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Oct 29 17:09:30 UTC 2010 - ajorgensen(a)novell.com + +- Update to 2.4 + * http://monodevelop.com/Download/MonoDevelop_2.4_Released + + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- monodevelop-boo-2.2.tar.bz2 New: ---- monodevelop-boo-2.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ monodevelop-boo.spec ++++++ --- /var/tmp/diff_new_pack.0GZqAg/_old 2010-11-05 16:28:57.000000000 +0100 +++ /var/tmp/diff_new_pack.0GZqAg/_new 2010-11-05 16:28:57.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package monodevelop-boo (Version 2.2) +# spec file for package monodevelop-boo (Version 2.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,8 +20,8 @@ %define boo_version %(rpm -q boo-devel --queryformat '%{VERSION}') Name: monodevelop-boo -Version: 2.2 -Release: 2 +Version: 2.4 +Release: 1 License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on @@ -50,10 +50,7 @@ %files -f %{name}.lang %defattr(-, root, root) %_prefix/share/pkgconfig/monodevelop-boo.pc -%_prefix/lib/monodevelop/AddIns/BooBinding/BooShell.dll* -%_prefix/lib/monodevelop/AddIns/BooBinding/BooBinding.dll* -%dir %_prefix/lib/monodevelop/AddIns/BooBinding -%dir %_prefix/lib/monodevelop/AddIns/BooBinding/locale +%_prefix/lib/monodevelop/AddIns/BooBinding %prep %setup -q ++++++ monodevelop-boo-2.2.tar.bz2 -> monodevelop-boo-2.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-boo-2.2/BooBinding.addin.xml new/monodevelop-boo-2.4/BooBinding.addin.xml --- old/monodevelop-boo-2.2/BooBinding.addin.xml 2009-12-10 00:30:53.000000000 +0100 +++ new/monodevelop-boo-2.4/BooBinding.addin.xml 2010-06-14 21:46:35.000000000 +0200 @@ -6,7 +6,7 @@ url = "http://boo.codehaus.org" description = "Boo Language Binding" category = "Language bindings" - version = "2.2"> + version = "2.4"> <Runtime> <Import assembly = "BooBinding.dll"/> @@ -16,11 +16,8 @@ <Localizer type="Gettext" catalog="monodevelop-boo"/> <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"/> + <Addin id="Core" version="2.4"/> + <Addin id="Ide" version="2.4"/> <Assembly name="Boo.Lang.Compiler, Version=1.0.0.0" package="Boo" /> </Dependencies> @@ -80,7 +77,7 @@ </Extension> --> <Extension path = "/MonoDevelop/Ide/Pads"> - <Pad id = "BooBinding.Pads.BooShellPadContent" _label="Boo Shell" icon="boo-project-icon" class = "BooBinding.Pads.BooShellPadContent" defaultPlacement = "Bottom"/> + <Pad id = "BooBinding.Pads.BooShellPadContent" _label="Boo Shell" icon="boo-icon" class = "BooBinding.Pads.BooShellPadContent" defaultPlacement = "Bottom"/> </Extension> <Extension path = "/MonoDevelop/Ide/WorkbenchContexts/Edit"> @@ -92,8 +89,8 @@ </Extension> <Extension path = "/MonoDevelop/Core/StockIcons"> - <StockIcon stockid = "md-boo-file" resource = "Boo.FileIcon" /> - <StockIcon stockid = "boo-icon" resource = "BooBinding.Base" /> + <StockIcon stockid = "md-boo-file" file = "icons/Boo.FileIcon" /> + <StockIcon stockid = "boo-icon" file = "icons/BooBinding.Base" /> </Extension> </Addin> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-boo-2.2/BooBinding.make new/monodevelop-boo-2.4/BooBinding.make --- old/monodevelop-boo-2.2/BooBinding.make 2009-11-05 19:11:06.000000000 +0100 +++ new/monodevelop-boo-2.4/BooBinding.make 2010-06-14 21:46:35.000000000 +0200 @@ -70,14 +70,14 @@ Properties/BooShellProperties.boo \ Properties/ShellProperties.boo -DATA_FILES = +DATA_FILES = \ + icons/Boo.FileIcon \ + icons/BooBinding.Base RESOURCES = \ BooBinding.addin.xml \ icons/Boo.File.EmptyFile \ icons/Boo.File.Form \ - icons/Boo.FileIcon \ - icons/BooBinding.Base \ icons/boo-icon-32.png \ templates/BooGtkSharpProject.xpt.xml \ templates/BooGtkSharpWindow.xft.xml \ @@ -91,9 +91,7 @@ REFERENCES = \ build/BooShell.dll \ -pkg:boo \ - -pkg:gconf-sharp-2.0 \ -pkg:gtk-sharp-2.0 \ - -pkg:gtksourceview-sharp-2.0 \ -pkg:mono-addins \ -pkg:monodevelop \ -pkg:monodevelop-core-addins \ @@ -103,10 +101,13 @@ DLL_REFERENCES = -CLEANFILES += $(LINUX_PKGCONFIG) +DATA_FILE_BUILD = $(addprefix $(BUILD_DIR)/, $(DATA_FILES)) +DATA_FILE_INSTALL = $(addprefix $(INSTALL_DIR)/, $(DATA_FILES)) + +CLEANFILES += $(LINUX_PKGCONFIG) $(DATA_FILE_BUILD) #Targets -all-local: $(ASSEMBLY) $(LINUX_PKGCONFIG) $(top_srcdir)/config.make +all-local: $(ASSEMBLY) $(LINUX_PKGCONFIG) $(top_srcdir)/config.make $(DATA_FILE_BUILD) $(BOOBINDING_PC): monodevelop-boo.pc mkdir -p $(BUILD_DIR) @@ -134,8 +135,15 @@ make $(CONFIG)_AfterBuild make post-all-local-hook prefix=$(prefix) +$(DATA_FILE_BUILD): $(srcdir)$(subst $(BUILD_DIR),, $@) + mkdir -p $(dir $@) + cp $(srcdir)/$(subst $(BUILD_DIR),,$@) $@ + +$(DATA_FILE_INSTALL): $(srcdir)$(subst $(INSTALL_DIR),, $@) + mkdir -p $(dir $@) + cp $(srcdir)/$(subst $(INSTALL_DIR),,$@) $@ -install-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(BOOBINDING_PC) +install-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(BOOBINDING_PC) $(DATA_FILE_INSTALL) make pre-install-local-hook prefix=$(prefix) mkdir -p $(INSTALL_DIR) cp $(ASSEMBLY) $(ASSEMBLY_MDB) $(INSTALL_DIR) @@ -146,6 +154,7 @@ uninstall-local: $(ASSEMBLY) $(ASSEMBLY_MDB) $(BOOBINDING_PC) make pre-uninstall-local-hook prefix=$(prefix) rm -f $(INSTALL_DIR)/$(notdir $(ASSEMBLY)) + rm -f $(DATA_FILE_INSTALL) test -z '$(ASSEMBLY_MDB)' || rm -f $(INSTALL_DIR)/$(notdir $(ASSEMBLY_MDB)) test -z '$(BOOBINDING_PC)' || rm -f $(INSTALL_DIR)/$(notdir $(BOOBINDING_PC)) make post-uninstall-local-hook prefix=$(prefix) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-boo-2.2/BooBindingCompilerServices.boo new/monodevelop-boo-2.4/BooBindingCompilerServices.boo --- old/monodevelop-boo-2.2/BooBindingCompilerServices.boo 2009-12-10 00:30:53.000000000 +0100 +++ new/monodevelop-boo-2.4/BooBindingCompilerServices.boo 2010-06-14 21:46:35.000000000 +0200 @@ -23,7 +23,6 @@ import System.IO import System.CodeDom.Compiler import System.Text -import System.Text.RegularExpressions import MonoDevelop.Core import MonoDevelop.Core.ProgressMonitoring diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-boo-2.2/BooLanguageBinding.boo new/monodevelop-boo-2.4/BooLanguageBinding.boo --- old/monodevelop-boo-2.2/BooLanguageBinding.boo 2009-12-10 00:30:53.000000000 +0100 +++ new/monodevelop-boo-2.4/BooLanguageBinding.boo 2010-06-14 21:46:35.000000000 +0200 @@ -22,19 +22,14 @@ import System import System.IO import System.Diagnostics -import System.Collections -import System.Reflection -import System.Resources import System.Xml import System.CodeDom import System.CodeDom.Compiler; import Boo.Lang.CodeDom; import MonoDevelop.Projects -import MonoDevelop.Projects.Dom import MonoDevelop.Projects.Dom.Parser import MonoDevelop.Projects.CodeGeneration -import MonoDevelop.Core.Gui import MonoDevelop.Core public class BooLanguageBinding(IDotNetLanguageBinding): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-boo-2.2/BooShell/BooShell.boo new/monodevelop-boo-2.4/BooShell/BooShell.boo --- old/monodevelop-boo-2.2/BooShell/BooShell.boo 2009-11-05 19:11:06.000000000 +0100 +++ new/monodevelop-boo-2.4/BooShell/BooShell.boo 2010-06-14 21:46:35.000000000 +0200 @@ -21,16 +21,12 @@ import System import System.Collections -import System.IO import System.Threading import System.Text.RegularExpressions import Boo.Lang.Interpreter -import Boo.Lang.Compiler import Gtk -import GLib -import MonoDevelop.Core import MonoDevelop.Core.Execution; class BooShell (RemoteProcessObject): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-boo-2.2/BooShellPadContent.boo new/monodevelop-boo-2.4/BooShellPadContent.boo --- old/monodevelop-boo-2.2/BooShellPadContent.boo 2009-11-05 19:11:06.000000000 +0100 +++ new/monodevelop-boo-2.4/BooShellPadContent.boo 2010-06-14 21:46:35.000000000 +0200 @@ -23,7 +23,6 @@ import System import MonoDevelop.Core -import MonoDevelop.Core.Gui import MonoDevelop.Ide.Gui import BooBinding.Gui diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-boo-2.2/Gui/BooShellModel.boo new/monodevelop-boo-2.4/Gui/BooShellModel.boo --- old/monodevelop-boo-2.2/Gui/BooShellModel.boo 2009-11-05 19:11:06.000000000 +0100 +++ new/monodevelop-boo-2.4/Gui/BooShellModel.boo 2010-06-14 21:46:35.000000000 +0200 @@ -20,19 +20,13 @@ namespace BooBinding.Gui import System -import System.Diagnostics import System.Collections import System.IO import System.Threading -import System.Runtime.Remoting -import System.Runtime.Remoting.Channels import BooBinding.Properties import BooBinding.BooShell -import MonoDevelop.Core -import MonoDevelop.Core.Execution - class BooShellModel(IShellModel): private _props = BooShellProperties() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-boo-2.2/Gui/OptionPanels/CodeCompilationPanel.boo new/monodevelop-boo-2.4/Gui/OptionPanels/CodeCompilationPanel.boo --- old/monodevelop-boo-2.2/Gui/OptionPanels/CodeCompilationPanel.boo 2009-11-05 19:11:06.000000000 +0100 +++ new/monodevelop-boo-2.4/Gui/OptionPanels/CodeCompilationPanel.boo 2010-06-14 21:46:35.000000000 +0200 @@ -25,8 +25,7 @@ import Gtk import MonoDevelop.Projects -import MonoDevelop.Projects.Gui.Dialogs -import MonoDevelop.Components +import MonoDevelop.Ide.Gui.Dialogs import MonoDevelop.Core public class CodeGenerationPanel(MultiConfigItemOptionsPanel): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-boo-2.2/Gui/OptionPanels/GeneralBooShellPanel.boo new/monodevelop-boo-2.4/Gui/OptionPanels/GeneralBooShellPanel.boo --- old/monodevelop-boo-2.2/Gui/OptionPanels/GeneralBooShellPanel.boo 2009-11-05 19:11:06.000000000 +0100 +++ new/monodevelop-boo-2.4/Gui/OptionPanels/GeneralBooShellPanel.boo 2010-06-14 21:46:35.000000000 +0200 @@ -20,15 +20,6 @@ namespace BooBinding.Gui.OptionPanels import System -import Gtk -import Pango - -import MonoDevelop.Projects -import MonoDevelop.Core.Gui.Dialogs -import MonoDevelop.Components -import MonoDevelop.Core -import MonoDevelop.Core.Properties - import BooBinding.Properties public class GeneralBooShellPanel(GeneralShellPanel): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-boo-2.2/Gui/OptionPanels/GeneralShellPanel.boo new/monodevelop-boo-2.4/Gui/OptionPanels/GeneralShellPanel.boo --- old/monodevelop-boo-2.2/Gui/OptionPanels/GeneralShellPanel.boo 2009-11-05 19:11:06.000000000 +0100 +++ new/monodevelop-boo-2.4/Gui/OptionPanels/GeneralShellPanel.boo 2010-06-14 21:46:35.000000000 +0200 @@ -21,17 +21,12 @@ import System import Gtk -import Pango -import MonoDevelop.Projects -import MonoDevelop.Core.Gui.Dialogs -import MonoDevelop.Components import MonoDevelop.Core -import MonoDevelop.Core.Properties import BooBinding.Properties -public class GeneralShellPanel(OptionsPanel): +public class GeneralShellPanel(MonoDevelop.Ide.Gui.Dialogs.OptionsPanel): private generalOptionsLabel = Gtk.Label () private autoIndentCheckButton = Gtk.CheckButton () private resetClearsScrollbackCheckButton = Gtk.CheckButton () diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-boo-2.2/Gui/ShellTextView.boo new/monodevelop-boo-2.4/Gui/ShellTextView.boo --- old/monodevelop-boo-2.2/Gui/ShellTextView.boo 2009-12-10 00:30:53.000000000 +0100 +++ new/monodevelop-boo-2.4/Gui/ShellTextView.boo 2010-06-14 21:46:35.000000000 +0200 @@ -22,21 +22,16 @@ import System import System.Collections import System.IO -import System.Runtime.InteropServices import Gtk import Gdk -import GLib -import Pango -import GtkSourceView import MonoDevelop.Components -import MonoDevelop.Projects.Gui.Completion +import MonoDevelop.Ide.CodeCompletion import MonoDevelop.Core import MonoDevelop.Projects -import MonoDevelop.Ide.Gui +import MonoDevelop.Ide import MonoDevelop.Projects.Dom.Parser -import MonoDevelop.Projects.Dom.Output /* * TODO @@ -44,7 +39,7 @@ * 1) Don't record lines with errors in the _scriptLines buffer */ -class ShellTextView (SourceView, ICompletionWidget): +class ShellTextView (TextView, ICompletionWidget): private static _promptRegular = ">>> " private static _promptMultiline = "... " @@ -76,18 +71,6 @@ def constructor(model as IShellModel): - manager = SourceLanguagesManager() - lang = manager.GetLanguageFromMimeType(model.MimeType) - if lang != null: - buf = SourceBuffer(lang) - else: - buf = SourceBuffer(GtkSourceView.SourceTagTable()) - - // This freaks out booc for some reason. - //super(buf, Highlight: true) - super(buf) - buf.Highlight = true - self.model = model self.WrapMode = Gtk.WrapMode.Word self.ModifyFont(Model.Properties.Font) @@ -187,7 +170,7 @@ #region Overrides of the standard methods for event handling override def OnPopulatePopup (menu as Gtk.Menu): _copyScriptInput = ImageMenuItem (GettextCatalog.GetString ("Copy Script")) - _copyScriptInput.Activated += { Gtk.Clipboard.Get (Gdk.Atom.Intern ("PRIMARY", true)).SetText(_scriptLines) } + _copyScriptInput.Activated += { Gtk.Clipboard.Get (Gdk.Atom.Intern ("PRIMARY", true)).Text = _scriptLines } _copyScriptInput.Image = Gtk.Image (Stock.Copy, Gtk.IconSize.Menu) _saveScriptToFile = ImageMenuItem (GettextCatalog.GetString ("Save Script As ...")) @@ -451,15 +434,11 @@ // FIXME: Make my FileChooser use suck less private def OnSaveScript(): - _sel = FileSelector("Save Script ...", FileChooserAction.Save) - _sel.Run() - if _sel.Filename: - _sel.Hide() - _path = _sel.Filename + _sel = SelectFileDialog("Save Script ...", FileChooserAction.Save) + if _sel.Run(): + _path = _sel.SelectedFile using writer = StreamWriter (_path): writer.Write (_scriptLines) - else: - _sel.Hide() def OnPropertyChanged (obj as object, e as PropertyChangedEventArgs): if e.Key == "Font": @@ -531,6 +510,13 @@ Buffer.MoveMark (Buffer.InsertMark, offsetIter) Buffer.Delete (offsetIter, endIter) Buffer.InsertAtCursor (complete_word) + + def ICompletionWidget.Replace (offset as int, count as int, text as string): + offsetIter = Buffer.GetIterAtOffset(offset) + endIter = Buffer.GetIterAtOffset (offsetIter.Offset + count) + Buffer.MoveMark (Buffer.InsertMark, offsetIter) + Buffer.Delete (offsetIter, endIter) + Buffer.InsertAtCursor (text) ICompletionWidget.GtkStyle: get: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-boo-2.2/Makefile new/monodevelop-boo-2.4/Makefile --- old/monodevelop-boo-2.2/Makefile 2009-11-05 19:11:06.000000000 +0100 +++ new/monodevelop-boo-2.4/Makefile 2010-06-14 21:46:35.000000000 +0200 @@ -5,6 +5,7 @@ top_srcdir=. include $(top_srcdir)/config.make +include $(top_srcdir)/Makefile.include include $(top_srcdir)/rules.make #include $(top_srcdir)/custom-hooks.make @@ -17,7 +18,6 @@ SUBDIRS = BooShell . po endif -# Include project specific makefile include BooBinding.make CONFIG_MAKE=$(top_srcdir)/config.make @@ -27,10 +27,10 @@ case $$2 in --unix) shift ;; esac; \ case $$2 in *=*) dk="exit 1" ;; *k*) dk=: ;; *) dk="exit 1" ;; esac; \ make pre-$*-hook prefix=$(prefix) ; \ - for dir in $(SUBDIRS); do \ - case $$dir in \ + for dir in $(call quote_each,$(SUBDIRS)); do \ + case "$$dir" in \ .) make $*-local || { final_exit="exit 1"; $$dk; };;\ - *) (cd $$dir && make $*) || { final_exit="exit 1"; $$dk; };;\ + *) (cd "$$dir" && make $*) || { final_exit="exit 1"; $$dk; };;\ esac \ done; \ make post-$*-hook prefix=$(prefix) ; \ @@ -48,17 +48,17 @@ rm -rf $(PACKAGE)-$(VERSION) mkdir $(PACKAGE)-$(VERSION) make pre-dist-hook distdir=$$distdir - for dir in $(SUBDIRS); do \ + for dir in $(call quote_each,$(SUBDIRS)); do \ pkgdir=`pwd`/$(PACKAGE)-$(VERSION); \ - mkdir $$pkgdir/$$dir || true; \ + mkdir "$$pkgdir/$$dir" || true; \ case $$dir in \ - .) make dist-local distdir=$$pkgdir || exit 1;; \ - *) (cd $$dir; make dist-local distdir=$$pkgdir/$$dir) || exit 1;; \ + .) make dist-local "distdir=$$pkgdir" || exit 1;; \ + *) (cd "$$dir"; make dist-local "distdir=$$pkgdir/$$dir") || exit 1;; \ esac \ done (make dist-local distdir=$(PACKAGE)-$(VERSION)) make - make post-dist-hook distsir=$$distdir + make post-dist-hook "distsir=$$distdir" tar czvf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION) rm -rf $(PACKAGE)-$(VERSION) @echo "==========================================" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-boo-2.2/Makefile.include new/monodevelop-boo-2.4/Makefile.include --- old/monodevelop-boo-2.2/Makefile.include 2009-11-05 19:11:06.000000000 +0100 +++ new/monodevelop-boo-2.4/Makefile.include 2010-06-14 21:46:35.000000000 +0200 @@ -1,33 +1,116 @@ +VALID_CULTURES = ar bg ca zh-CHS cs da de el en es fi fr he hu is it ja ko nl no pl pt ro ru hr sk sq sv th tr id uk be sl et lv lt fa vi hy eu mk af ka fo hi sw gu ta te kn mr gl kok ar-SA bg-BG ca-ES zh-TW cs-CZ da-DK de-DE el-GR en-US fi-FI fr-FR he-IL hu-HU is-IS it-IT ja-JP ko-KR nl-NL nb-NO pl-PL pt-BR ro-RO ru-RU hr-HR sk-SK sq-AL sv-SE th-TH tr-TR id-ID uk-UA be-BY sl-SI et-EE lv-LV lt-LT fa-IR vi-VN hy-AM eu-ES mk-MK af-ZA ka-GE fo-FO hi-IN sw-KE gu-IN ta-IN te-IN kn-IN mr-IN gl-ES kok-IN ar-IQ zh-CN de-CH en-GB es-MX fr-BE it-CH nl-BE nn-NO pt-PT sv-FI ar-EG zh-HK de-AT en-AU es-ES fr-CA ar-LY zh-SG de-LU en-CA es-GT fr-CH ar-DZ zh-MO en-NZ es-CR fr-LU ar-MA en-IE es-PA ar-TN en-ZA es-DO ar-OM es-VE ar-YE es-CO ar-SY es-PE ar-JO es-AR ar-LB en-ZW es-EC ar-KW en-PH es-CL ar-AE es-UY ar-BH es-PY ar-QA es-BO es-SV es-HN es-NI es-PR zh-CHT + +s2q=$(subst \ ,?,$1) +q2s=$(subst ?,\ ,$1) +# use this when result will be quoted +unesc2=$(subst ?, ,$1) + build_sources = $(FILES) $(GENERATED_FILES) -build_sources_embed = $(build_sources:%='$(srcdir)/%') +build_sources_esc= $(call s2q,$(build_sources)) +# use unesc2, as build_sources_embed is quoted +build_sources_embed= $(call unesc2,$(build_sources_esc:%='$(srcdir)/%')) comma__=, -build_resx_list = $(foreach res, $(RESOURCES), $(if $(filter %.resx, $(firstword $(subst $(comma__), ,$(res)))),$(res),)) -build_others_list = $(foreach res, $(RESOURCES), $(if $(filter %.resx, $(firstword $(subst $(comma__), ,$(res)))), ,$(res))) +get_resource_name = $(firstword $(subst $(comma__), ,$1)) +get_culture = $(lastword $(subst ., ,$(basename $1))) +is_cultured_resource = $(and $(word 3,$(subst ., ,$1)), $(filter $(VALID_CULTURES),$(lastword $(subst ., ,$(basename $1))))) + +RESOURCES_ESC=$(call s2q,$(RESOURCES)) + +build_resx_list = $(foreach res, $(RESOURCES_ESC), $(if $(filter %.resx, $(call get_resource_name,$(res))),$(res),)) +build_non_culture_resx_list = $(foreach res, $(build_resx_list),$(if $(call is_cultured_resource,$(call get_resource_name,$(res))),,$(res))) +build_non_culture_others_list = $(foreach res, $(filter-out $(build_resx_list),$(RESOURCES_ESC)),$(if $(call is_cultured_resource,$(call get_resource_name,$(res))),,$(res))) +build_others_list = $(build_non_culture_others_list) build_xamlg_list = $(filter %.xaml.g.cs, $(FILES)) -build_resx_files = $(foreach res, $(build_resx_list), $(firstword $(subst $(comma__), ,$(res)))) -build_resx_resources = $(build_resx_files:.resx=.resources) -build_resx_resources_hack = $(subst .resx,.resources, $(build_resx_list)) -build_resx_resources_embed = $(build_resx_resources_hack:%='-resource:%') - -build_others_files = $(foreach res, $(build_others_list), $(firstword $(subst $(comma__), ,$(res)))) +# resgen all .resx resources +build_resx_files = $(foreach res, $(build_resx_list), $(call get_resource_name,$(res))) +build_resx_resources_esc = $(build_resx_files:.resx=.resources) +build_resx_resources = $(call q2s,$(build_resx_resources_esc)) + +# embed resources for the main assembly +build_resx_resources_hack = $(subst .resx,.resources, $(build_non_culture_resx_list)) +# use unesc2, as build_resx_resources_embed is quoted +build_resx_resources_embed = $(call unesc2,$(build_resx_resources_hack:%='-embedres:%')) +build_others_files = $(call q2s,$(foreach res, $(build_others_list),$(call get_resource_name,$(res)))) build_others_resources = $(build_others_files) -build_others_resources_embed = $(build_others_list:%='-embedres:$(srcdir)/%') +# use unesc2, as build_others_resources_embed is quoted +build_others_resources_embed = $(call unesc2,$(build_others_list:%='-embedres:$(srcdir)/%')) build_resources = $(build_resx_resources) $(build_others_resources) build_resources_embed = $(build_resx_resources_embed) $(build_others_resources_embed) -build_references_ref = $(foreach ref, $(REFERENCES), $(if $(filter -pkg:%, $(ref)), $(ref), $(if $(filter -r:%, $(ref)), $(ref), -r:$(ref)))) -build_references_ref += $(foreach ref, $(DLL_REFERENCES), -r:$(ref)) -build_references_ref += $(foreach ref, $(PROJECT_REFERENCES), -r:$(ref)) +# -usesourcepath is available only for resgen2 +emit_resgen_target_1=$(call q2s,$1) : $(call q2s,$(subst .resources,.resx,$1)); cd '$$(shell dirname '$$<')' && MONO_IOMAP=drive $$(RESGEN) '$$(shell basename '$$<')' '$$(shell basename '$$@')' +emit_resgen_target_2=$(call q2s,$1) : $(call q2s,$(subst .resources,.resx,$1)); MONO_IOMAP=drive $$(RESGEN) -usesourcepath '$$<' '$$@' + +emit_resgen_target=$(if $(filter resgen2,$(RESGEN)),$(emit_resgen_target_2),$(emit_resgen_target_1)) +emit_resgen_targets=$(foreach res,$(build_resx_resources_esc),$(eval $(call emit_resgen_target,$(res)))) + +build_references_ref = $(call q2s,$(foreach ref, $(call s2q,$(REFERENCES)), $(if $(filter -pkg:%, $(ref)), $(ref), $(if $(filter -r:%, $(ref)), $(ref), -r:$(ref))))) +build_references_ref += $(call q2s,$(foreach ref, $(call s2q,$(DLL_REFERENCES)), -r:$(ref))) +build_references_ref += $(call q2s,$(foreach ref, $(call s2q,$(PROJECT_REFERENCES)), -r:$(ref))) + +s2q2s=$(call unesc2,$(call s2q,$1)) +cp_actual=test -z $1 || cp $1 $2 +cp=$(call cp_actual,'$(call s2q2s,$1)','$(call s2q2s,$2)') + +rm_actual=test -z '$1' || rm -f '$2' +rm=$(call rm_actual,$(call s2q2s,$1),$(call s2q2s,$2)/$(shell basename '$(call s2q2s,$1)')) -EXTRA_DIST += $(build_sources) $(build_resx_files) $(build_others_files) $(ASSEMBLY_WRAPPER_IN) $(EXTRAS) $(DATA_FILES) -CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(BINARIES) $(build_resx_resources) +EXTRA_DIST += $(build_sources) $(build_resx_files) $(build_others_files) $(ASSEMBLY_WRAPPER_IN) $(EXTRAS) $(DATA_FILES) $(build_culture_res_files) +CLEANFILES += $(ASSEMBLY) $(ASSEMBLY).mdb $(BINARIES) $(build_resx_resources) $(build_satellite_assembly_list) DISTCLEANFILES = $(GENERATED_FILES) $(pc_files) $(BUILD_DIR)/* pkglib_SCRIPTS = $(ASSEMBLY) bin_SCRIPTS = $(BINARIES) -linuxpkgconfigdir = @prefix@/lib/pkgconfig -linuxpkgconfig_DATA = $(LINUX_PKGCONFIG) + + +# macros + +# $(call emit-deploy-target,deploy-variable-name) +define emit-deploy-target +$($1): $($1_SOURCE) + mkdir -p '$$(shell dirname '$$@')' + cp '$$<' '$$@' +endef + +# $(call emit-deploy-wrapper,wrapper-variable-name,wrapper-sourcefile,x) +# assumes that for a wrapper foo.pc its source template is foo.pc.in +# if $3 is non-empty then wrapper is marked exec +define emit-deploy-wrapper +$($1): $2 $(top_srcdir)/config.make + mkdir -p '$$(shell dirname '$$@')' + cp '$$<' '$$@' + $(if $3,chmod +x '$$@') + +$2: $2.in $(top_srcdir)/config.make + sed -e "s,@prefix@,$(prefix)," -e "s,@PACKAGE@,$(PACKAGE)," -e "s,@expanded_libdir@,$(libdir)," -e "s,@expanded_bindir@,$(bindir)," -e "s,@expanded_datadir@,$(datadir)," < $2.in > $2 +endef + +# generating satellite assemblies + +culture_resources = $(foreach res, $(RESOURCES_ESC), $(if $(call is_cultured_resource,$(call get_resource_name, $(res))),$(res))) +cultures = $(sort $(foreach res, $(culture_resources), $(call get_culture,$(call get_resource_name,$(res))))) +culture_resource_dependencies = $(call q2s,$(BUILD_DIR)/$1/$(SATELLITE_ASSEMBLY_NAME): $(subst .resx,.resources,$2)) +culture_resource_commandlines = $(call unesc2,cmd_line_satellite_$1 += '/embed:$(subst .resx,.resources,$2)') +build_satellite_assembly_list = $(call q2s,$(cultures:%=$(BUILD_DIR)/%/$(SATELLITE_ASSEMBLY_NAME))) +build_culture_res_files = $(call q2s,$(foreach res, $(culture_resources),$(call get_resource_name,$(res)))) +install_satellite_assembly_list = $(subst $(BUILD_DIR),$(DESTDIR)$(libdir)/$(PACKAGE),$(build_satellite_assembly_list)) + +$(eval $(foreach res, $(culture_resources), $(eval $(call culture_resource_dependencies,$(call get_culture,$(call get_resource_name,$(res))),$(call get_resource_name,$(res)))))) +$(eval $(foreach res, $(culture_resources), $(eval $(call culture_resource_commandlines,$(call get_culture,$(call get_resource_name,$(res))),$(res))))) + +$(build_satellite_assembly_list): $(BUILD_DIR)/%/$(SATELLITE_ASSEMBLY_NAME): + mkdir -p '$(@D)' + $(AL) -out:'$@' -culture:$* -t:lib $(cmd_line_satellite_$*) + +$(install_satellite_assembly_list): + mkdir -p '$(@D)' + cp $(subst $(DESTDIR)$(libdir)/$(PACKAGE), $(BUILD_DIR), $@) $@ + +install-satellite-assemblies: $(install_satellite_assembly_list) + +uninstall-satellite-assemblies: + rm -rf $(install_satellite_assembly_list) \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-boo-2.2/Project/BooCompilerParameters.boo new/monodevelop-boo-2.4/Project/BooCompilerParameters.boo --- old/monodevelop-boo-2.2/Project/BooCompilerParameters.boo 2009-11-05 19:11:06.000000000 +0100 +++ new/monodevelop-boo-2.4/Project/BooCompilerParameters.boo 2010-06-14 21:46:35.000000000 +0200 @@ -20,8 +20,6 @@ namespace BooBinding import System -import System.Xml -import System.Diagnostics import MonoDevelop.Projects import MonoDevelop.Core.Serialization diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-boo-2.2/Properties/BooShellProperties.boo new/monodevelop-boo-2.4/Properties/BooShellProperties.boo --- old/monodevelop-boo-2.2/Properties/BooShellProperties.boo 2009-11-05 19:11:06.000000000 +0100 +++ new/monodevelop-boo-2.4/Properties/BooShellProperties.boo 2010-06-14 21:46:35.000000000 +0200 @@ -4,13 +4,6 @@ import System -import Gtk -import Gdk - -import MonoDevelop.Components -import MonoDevelop.Core.Properties -import MonoDevelop.Core - class BooShellProperties (ShellProperties): override PropertyName as string: get: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-boo-2.2/Properties/ShellProperties.boo new/monodevelop-boo-2.4/Properties/ShellProperties.boo --- old/monodevelop-boo-2.2/Properties/ShellProperties.boo 2009-11-05 19:11:06.000000000 +0100 +++ new/monodevelop-boo-2.4/Properties/ShellProperties.boo 2010-06-14 21:46:35.000000000 +0200 @@ -3,12 +3,7 @@ namespace BooBinding.Properties import System - -import Gtk -import Gdk import Pango - -import MonoDevelop.Components import MonoDevelop.Core class ShellProperties: @@ -34,7 +29,7 @@ Font as FontDescription: get: if FontName == "__default_monospace": - return FontDescription.FromString (GConf.Client ().Get ("/desktop/gnome/interface/monospace_font_name")) + return FontDescription.FromString (MonoDevelop.Ide.DesktopService.DefaultMonospaceFont) else: return FontDescription.FromString (FontName) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-boo-2.2/configure new/monodevelop-boo-2.4/configure --- old/monodevelop-boo-2.2/configure 2009-12-11 21:51:08.000000000 +0100 +++ new/monodevelop-boo-2.4/configure 2010-06-14 21:46:35.000000000 +0200 @@ -1,14 +1,22 @@ #!/bin/bash -VERSION=2.2 +VERSION=2.4 PACKAGE=monodevelop-boo prefix=/usr/local config=DEBUG configurations=" RELEASE DEBUG" -required_packages="gtk-sharp-2.0;2.12.8 monodevelop;2.2 mono-addins;0.3 glib-sharp-2.0;2.12.8 monodevelop-core-addins;2.2 boo;0.7.9.2659 gconf-sharp-2.0;2.12.8 gtksourceview-sharp-2.0;0.11" +common_packages="gtk-sharp-2.0;2.12.8 monodevelop;2.4 mono-addins;0.3 glib-sharp-2.0;2.12.8 monodevelop-core-addins;2.4 boo;0.7.9.2659" + usage () { - echo "Usage : configure [--prefix=PREFIX] [--config=CONFIG]" + echo "Usage : configure [OPTION]... [--config=CONFIG]" + echo + echo "Options:" + echo " --prefix=PREFIX install architecture-independent files in PREFIX" + echo " [/usr/local]" + echo " --bindir=DIR user executables [PREFIX/bin]" + echo " --datadir=DIR read-only architecture-independent data [PREFIX/share]" + echo " --libdir=DIR object code libraries [PREFIX/lib]" echo echo "Configurations available :" for c in $configurations; do @@ -31,62 +39,104 @@ return 0 } +check_package () +{ + name=`echo $1 | cut -d\; -f1` + version=`echo $1 | cut -d\; -f2` + + echo -n "Checking for package '$name'.." | tee -a config.log + pkg-config --atleast-version=$version $name + if [ $? -ne 0 ]; then + echo " ERROR: Package named '$name' >= $version not found." | tee -a config.log + echo "Try adjusting your PKG_CONFIG_PATH environment variable." | tee -a config.log + return 1 + fi + echo " found." | tee -a config.log +} + check_required_packages () { echo "Looking for required packages" | tee config.log - for pkg in $required_packages; do - name=`echo $pkg | cut -d\; -f1` - version=`echo $pkg | cut -d\; -f2` - - echo -n "Checking for package '$name'.." | tee -a config.log - pkg-config --atleast-version=$version $name - if [ $? -ne 0 ]; then - echo " ERROR: Package named '$name' >= $version not found." | tee -a config.log - echo "Try adjusting your PKG_CONFIG_PATH environment variable." | tee -a config.log - return 1 - fi - echo " found." | tee -a config.log + var=required_packages_$config + for pkg in $common_packages ${!var}; do + check_package $pkg + retval=$? + [ $retval -ne 0 ] && return $retval done return 0 } while test x$1 != x; do - case $1 in - --prefix=*) - prefix=`echo $1 | sed 's/--prefix=//'` - ;; - --prefix) - echo --prefix needs an argument: --prefix=directory >&2 - - ;; + case $1 in + --prefix=*) + prefix=`echo $1 | sed 's/--prefix=//'` + ;; + --prefix) + shift + prefix=$1 + ;; + --libdir=*) + libdir=`echo $1 | sed 's/--libdir=//'` + ;; + --libdir) + shift + libdir=$1 + ;; + --bindir=*) + bindir=`echo $1 | sed 's/--bindir=//'` + ;; + --bindir) + shift + bindir=$1 + ;; + --datadir=*) + datadir=`echo $1 | sed 's/--datadir=//'` + ;; + --datadir) + shift + datadir=$1 + ;; --config=*) - conf=`echo $1 | sed 's/--config=//'` - validate_config "$conf" - if [ $? -eq 1 ]; then - config=$conf - else - echo "Invalid config name - $conf" - usage - exit 1 - fi - ;; + conf=`echo $1 | sed 's/--config=//'` + validate_config "$conf" + if [ $? -eq 1 ]; then + config=$conf + else + echo "Invalid config name - $conf" + usage + exit 1 + fi + ;; --help) usage exit ;; - *) - echo Unknown argument $1 >&2 + *) + echo Unknown argument $1 >&2 usage exit 1 ;; - esac - shift + esac + shift done check_required_packages [ $? -eq 1 ] && exit 1 +if [ -z "$libdir" ]; then + libdir=$prefix/lib +fi +if [ -z "$bindir" ]; then + bindir=$prefix/bin +fi +if [ -z "$datadir" ]; then + datadir=$prefix/share +fi + echo "prefix=$prefix" > config.make +echo "libdir=$libdir" >> config.make +echo "bindir=$bindir" >> config.make +echo "datadir=$datadir" >> config.make echo "RUNTIME=mono" >> config.make echo "ASSEMBLY_VERSION=$VERSION.0.0" >> config.make echo "VERSION=$VERSION" >> config.make @@ -96,5 +146,14 @@ echo echo "$PACKAGE has been configured with " echo " prefix = $prefix" +if [ "$libdir" != "$prefix/lib" ]; then + echo " libdir = $libdir" +fi +if [ "$bindir" != "$prefix/bin" ]; then + echo " bindir = $bindir" +fi +if [ "$datadir" != "$prefix/share" ]; then + echo " datadir = $datadir" +fi echo " config = $config" echo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-boo-2.2/rules.make new/monodevelop-boo-2.4/rules.make --- old/monodevelop-boo-2.2/rules.make 2009-11-05 19:11:06.000000000 +0100 +++ new/monodevelop-boo-2.4/rules.make 2010-06-14 21:46:35.000000000 +0200 @@ -1,30 +1,32 @@ clean-local: make pre-clean-local-hook make $(CONFIG)_BeforeClean - -rm -f $(CLEANFILES) + -rm -f $(call quote_each,$(CLEANFILES)) make $(CONFIG)_AfterClean make post-clean-local-hook install-local: uninstall-local: +q2quote = '$(subst ?, ,$1)' +quote_each = $(foreach f,$(call s2q,$1),$(call q2quote,$f)) + dist-local: - make pre-dist-local-hook distdir=$$distdir - list='$(EXTRA_DIST)'; \ - for f in Makefile $$list; do \ + make pre-dist-local-hook "distdir=$$distdir" + for f in Makefile $(call quote_each,$(EXTRA_DIST)); do \ d=`dirname "$$f"`; \ test -d "$(distdir)/$$d" || \ mkdir -p "$(distdir)/$$d"; \ cp -p "$$f" "$(distdir)/$$d" || exit 1; \ done - make post-dist-local-hook distdir=$$distdir + make post-dist-local-hook "distdir=$$distdir" dist-local-recursive: - for dir in $(SUBDIRS); do \ - mkdir -p $(distdir)/$$dir || true; \ - case $$dir in \ - .) make dist-local distdir=$(distdir) || exit 1;; \ - *) (cd $$dir; make dist-local distdir=$(distdir)/$$dir) || exit 1; \ + for dir in $(call quote_each,$(SUBDIRS)); do \ + mkdir -p "$(distdir)/$$dir" || true; \ + case "$$dir" in \ + .) make dist-local "distdir=$(distdir)" || exit 1;; \ + *) (cd "$$dir"; make dist-local "distdir=$(distdir)/$$dir") || exit 1; \ esac \ done ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit monodevelop-database for openSUSE:Factory
by root＠hilbert.suse.de 05 Nov '10

05 Nov '10

Hello community, here is the log from the commit of package monodevelop-database for openSUSE:Factory checked in at Fri Nov 5 16:28:42 CET 2010. -------- --- GNOME/monodevelop-database/monodevelop-database.changes 2010-03-16 18:22:29.000000000 +0100 +++ monodevelop-database/monodevelop-database.changes 2010-10-29 19:12:38.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Oct 29 17:09:54 UTC 2010 - ajorgensen(a)novell.com + +- Update to 2.4 + * http://monodevelop.com/Download/MonoDevelop_2.4_Released + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- monodevelop-database-2.2.tar.bz2 New: ---- monodevelop-database-2.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ monodevelop-database.spec ++++++ --- /var/tmp/diff_new_pack.re8TbS/_old 2010-11-05 16:28:21.000000000 +0100 +++ /var/tmp/diff_new_pack.re8TbS/_new 2010-11-05 16:28:21.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package monodevelop-database (Version 2.2) +# spec file for package monodevelop-database (Version 2.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,11 +17,11 @@ # norootforbuild -%define db_packages mono-data-postgresql mono-data-sqlite mono-data-sybase +%define db_packages mono-data-postgresql mono-data-sqlite Name: monodevelop-database -Version: 2.2 -Release: 2 +Version: 2.4 +Release: 1 License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on @@ -30,7 +30,6 @@ Source0: %{name}-%{version}.tar.bz2 BuildRequires: %db_packages mono-devel monodevelop >= %{version} Requires: %db_packages -BuildRequires: bytefx-data-mysql BuildRequires: gtksourceview-sharp2 monodoc-core Summary: Monodevelop Database Addin Group: Development/Languages/Mono @@ -46,9 +45,7 @@ %files -f %{name}.lang %defattr(-, root, root) %_prefix/share/pkgconfig/monodevelop-database.pc -%_prefix/lib/monodevelop/AddIns/MonoDevelop.Database/*.dll* -%dir %_prefix/lib/monodevelop/AddIns/MonoDevelop.Database -%dir %_prefix/lib/monodevelop/AddIns/MonoDevelop.Database/locale +%_prefix/lib/monodevelop/AddIns/MonoDevelop.Database %prep %setup -q ++++++ monodevelop-database-2.2.tar.bz2 -> monodevelop-database-2.4.tar.bz2 ++++++ ++++ 18735 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit monodevelop-debugger-gdb for openSUSE:Factory
by root＠hilbert.suse.de 05 Nov '10

05 Nov '10

Hello community, here is the log from the commit of package monodevelop-debugger-gdb for openSUSE:Factory checked in at Fri Nov 5 16:28:06 CET 2010. -------- --- monodevelop-debugger-gdb/monodevelop-debugger-gdb.changes 2010-03-16 18:16:56.000000000 +0100 +++ monodevelop-debugger-gdb/monodevelop-debugger-gdb.changes 2010-10-29 19:12:51.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Oct 29 17:10:15 UTC 2010 - ajorgensen(a)novell.com + +- Update to 2.4 + * http://monodevelop.com/Download/MonoDevelop_2.4_Released + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- monodevelop-debugger-gdb-2.2.1.tar.bz2 New: ---- monodevelop-debugger-gdb-2.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ monodevelop-debugger-gdb.spec ++++++ --- /var/tmp/diff_new_pack.1NCmvV/_old 2010-11-05 16:26:18.000000000 +0100 +++ /var/tmp/diff_new_pack.1NCmvV/_new 2010-11-05 16:26:18.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package monodevelop-debugger-gdb (Version 2.2.1) +# spec file for package monodevelop-debugger-gdb (Version 2.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: monodevelop-debugger-gdb -Version: 2.2.1 +Version: 2.4 Release: 1 License: MIT/X11 AutoReqProv: on ++++++ monodevelop-debugger-gdb-2.2.1.tar.bz2 -> monodevelop-debugger-gdb-2.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-debugger-gdb-2.2.1/AssemblyInfo.cs new/monodevelop-debugger-gdb-2.4/AssemblyInfo.cs --- old/monodevelop-debugger-gdb-2.2.1/AssemblyInfo.cs 2009-11-05 19:11:27.000000000 +0100 +++ new/monodevelop-debugger-gdb-2.4/AssemblyInfo.cs 2010-06-14 21:44:33.000000000 +0200 @@ -5,5 +5,5 @@ [assembly: AssemblyProduct ("MonoDevelop")] [assembly: AssemblyTitle ("GDB support for Mono.Debugging")] [assembly: AssemblyDescription ("GNU Debugger support for Mono.Debugging")] -[assembly: AssemblyVersion ("2.2")] +[assembly: AssemblyVersion ("2.4")] [assembly: AssemblyCopyright ("MIT X11")] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-debugger-gdb-2.2.1/GdbBacktrace.cs new/monodevelop-debugger-gdb-2.4/GdbBacktrace.cs --- old/monodevelop-debugger-gdb-2.2.1/GdbBacktrace.cs 2010-02-02 00:35:57.000000000 +0100 +++ new/monodevelop-debugger-gdb-2.4/GdbBacktrace.cs 2010-06-14 21:44:33.000000000 +0200 @@ -128,6 +128,16 @@ return values.ToArray (); } + public ExceptionInfo GetException (int frameIndex, EvaluationOptions options) + { + return null; + } + + public ValidationResult ValidateExpression (int frameIndex, string expression, EvaluationOptions options) + { + return new ValidationResult (true, null); + } + public CompletionData GetExpressionCompletionData (int frameIndex, string exp) { SelectFrame (frameIndex); @@ -216,6 +226,10 @@ ObjectValue val; ObjectValueFlags flags = ObjectValueFlags.Variable; + // There can be 'public' et al children for C++ structures + if (typeName == null) + typeName = "none"; + if (typeName.EndsWith ("]")) { val = ObjectValue.CreateArray (this, new ObjectPath (vname), typeName, nchild, flags, null); } else if (value == "{...}" || typeName.EndsWith ("*") || nchild > 0) { @@ -227,12 +241,17 @@ return val; } - public ObjectValue[] GetChildren (ObjectPath path, int index, int count) + public ObjectValue[] GetChildren (ObjectPath path, int index, int count, EvaluationOptions options) { List<ObjectValue> children = new List<ObjectValue> (); session.SelectThread (threadId); GdbCommandResult res = session.RunCommand ("-var-list-children", "2", path.Join (".")); ResultData cdata = res.GetObject ("children"); + + // The response may not contain the "children" list at all. + if (cdata == null) + return children.ToArray (); + if (index == -1) { index = 0; count = cdata.Count; @@ -246,13 +265,21 @@ if (name.Length > 0 && char.IsNumber (name [0])) name = "[" + name + "]"; - ObjectValue val = CreateObjectValue (name, child); - children.Add (val); + // C++ structures may contain typeless children named + // "public", "private" and "protected". + if (child.GetValue("type") == null) { + ObjectPath childPath = new ObjectPath (child.GetValue ("name").Split ('.')); + ObjectValue[] subchildren = GetChildren (childPath, -1, -1, options); + children.AddRange(subchildren); + } else { + ObjectValue val = CreateObjectValue (name, child); + children.Add (val); + } } return children.ToArray (); } - public EvaluationResult SetValue (ObjectPath path, string value) + public EvaluationResult SetValue (ObjectPath path, string value, EvaluationOptions options) { session.SelectThread (threadId); session.RunCommand ("-var-assign", path.Join ("."), value); @@ -332,6 +359,15 @@ return buffer.GetLines (firstLine, firstLine + count - 1); } + + public object GetRawValue (ObjectPath path, EvaluationOptions options) + { + return null; + } + + public void SetRawValue (ObjectPath path, object value, EvaluationOptions options) + { + } } class GdbDissassemblyBuffer: DissassemblyBuffer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-debugger-gdb-2.2.1/GdbSession.cs new/monodevelop-debugger-gdb-2.4/GdbSession.cs --- old/monodevelop-debugger-gdb-2.2.1/GdbSession.cs 2009-11-12 16:30:20.000000000 +0100 +++ new/monodevelop-debugger-gdb-2.4/GdbSession.cs 2010-06-14 21:44:33.000000000 +0200 @@ -48,7 +48,7 @@ Process proc; StreamReader sout; StreamWriter sin; - ProcessWrapper console; + IProcessAsyncOperation console; GdbCommandResult lastResult; bool running; Thread thread; @@ -88,7 +88,7 @@ DateTime tim = DateTime.Now; while (!File.Exists (ttyfileDone)) { System.Threading.Thread.Sleep (100); - if ((DateTime.Now - tim).TotalSeconds > 4) + if ((DateTime.Now - tim).TotalSeconds > 10) throw new InvalidOperationException ("Console could not be created."); } tty = File.ReadAllText (ttyfile).Trim (' ','\n'); @@ -175,14 +175,15 @@ sin = proc.StandardInput; thread = new Thread (OutputInterpreter); + thread.Name = "GDB output interpeter"; thread.IsBackground = true; thread.Start (); } public override void Dispose () { - if (console != null && !console.HasExited) { - console.Kill (); + if (console != null && !console.IsCompleted) { + console.Cancel (); console = null; } @@ -322,7 +323,6 @@ if (bp.HitAction == HitAction.PrintExpression) { GdbCommandResult res = RunCommand ("-data-evaluate-expression", Escape (bp.TraceExpression)); string val = res.GetValue ("value"); - OnDebuggerOutput (false, val + "\n"); NotifyBreakEventUpdate (handle, 0, val); return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-debugger-gdb-2.2.1/GdbSessionFactory.cs new/monodevelop-debugger-gdb-2.4/GdbSessionFactory.cs --- old/monodevelop-debugger-gdb-2.2.1/GdbSessionFactory.cs 2009-11-20 18:33:54.000000000 +0100 +++ new/monodevelop-debugger-gdb-2.4/GdbSessionFactory.cs 2010-06-14 21:44:33.000000000 +0200 @@ -43,14 +43,6 @@ Dictionary<string,FileData> fileCheckCache = new Dictionary<string, FileData> (); - public string Name { - get { return "GNU Debugger (GDB)"; } - } - - public string Id { - get { return "Mono.Debugger.Gdb"; } - } - public bool CanDebugCommand (ExecutionCommand command) { NativeExecutionCommand cmd = command as NativeExecutionCommand; @@ -116,12 +108,6 @@ return true; } - public DebuggerFeatures SupportedFeatures { - get { - return DebuggerFeatures.All & ~DebuggerFeatures.Catchpoints; - } - } - public DebuggerSession CreateSession () { GdbSession ds = new GdbSession (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-debugger-gdb-2.2.1/Manifest.addin.xml new/monodevelop-debugger-gdb-2.4/Manifest.addin.xml --- old/monodevelop-debugger-gdb-2.2.1/Manifest.addin.xml 2009-11-05 19:11:27.000000000 +0100 +++ new/monodevelop-debugger-gdb-2.4/Manifest.addin.xml 2010-06-14 21:44:33.000000000 +0200 @@ -5,16 +5,19 @@ description = "GNU Debugger support for Mono.Debugging" copyright = "MIT X11" category = "Debugging" - version = "2.2"> + version = "2.4"> <Dependencies> - <Addin id="MonoDevelop.Core" version="2.2"/> - <Addin id="MonoDevelop.Ide" version="2.2"/> - <Addin id="MonoDevelop.Debugger" version="2.2"/> + <Addin id="MonoDevelop.Core" version="2.4"/> + <Addin id="MonoDevelop.Ide" version="2.4"/> + <Addin id="MonoDevelop.Debugger" version="2.4"/> </Dependencies> - <Extension path="/MonoDevelop/Debugging/DebuggerFactories"> - <DebuggerFactory type="MonoDevelop.Debugger.Gdb.GdbSessionFactory" /> + <Extension path="/MonoDevelop/Debugging/DebuggerEngines"> + <DebuggerEngine id="Mono.Debugger.Gdb" + name="GNU Debugger (GDB)" + features="ConditionalBreakpoints, Tracepoints, Catchpoints, Attaching, DebugFile, Stepping, Pause, Breakpoints, Disassembly" + type="MonoDevelop.Debugger.Gdb.GdbSessionFactory" /> </Extension> </Addin> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-debugger-gdb-2.2.1/MonoDevelop.Debugger.Gdb.make new/monodevelop-debugger-gdb-2.4/MonoDevelop.Debugger.Gdb.make --- old/monodevelop-debugger-gdb-2.2.1/MonoDevelop.Debugger.Gdb.make 2009-11-05 19:11:27.000000000 +0100 +++ new/monodevelop-debugger-gdb-2.4/MonoDevelop.Debugger.Gdb.make 2010-06-14 21:44:33.000000000 +0200 @@ -8,7 +8,7 @@ include $(top_srcdir)/config.make ifeq ($(CONFIG),DEBUG) -ASSEMBLY_COMPILER_COMMAND = gmcs +ASSEMBLY_COMPILER_COMMAND = $(CSC) ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG" ASSEMBLY = build/MonoDevelop.Debugger.Gdb.dll @@ -23,7 +23,7 @@ endif ifeq ($(CONFIG),RELEASE) -ASSEMBLY_COMPILER_COMMAND = gmcs +ASSEMBLY_COMPILER_COMMAND = $(CSC) ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- ASSEMBLY = build/MonoDevelop.Debugger.Gdb.dll ASSEMBLY_MDB = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-debugger-gdb-2.2.1/configure new/monodevelop-debugger-gdb-2.4/configure --- old/monodevelop-debugger-gdb-2.2.1/configure 2010-02-02 00:35:57.000000000 +0100 +++ new/monodevelop-debugger-gdb-2.4/configure 2010-06-14 21:44:33.000000000 +0200 @@ -1,10 +1,10 @@ #!/bin/bash -VERSION=2.2.1 +VERSION=2.4 PACKAGE=monodevelop-debugger-gdb prefix=/usr/local config=DEBUG configurations=" RELEASE DEBUG" -common_packages=" monodevelop;2.2.1" +common_packages=" monodevelop;2.4" usage () @@ -142,6 +142,7 @@ echo "VERSION=$VERSION" >> config.make echo "PACKAGE=$PACKAGE" >> config.make echo "CONFIG=$config" >> config.make +echo "CSC=gmcs" >> config.make echo echo "$PACKAGE has been configured with " ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit monodevelop-debugger-mdb for openSUSE:Factory
by root＠hilbert.suse.de 05 Nov '10

05 Nov '10

Hello community, here is the log from the commit of package monodevelop-debugger-mdb for openSUSE:Factory checked in at Fri Nov 5 16:26:07 CET 2010. -------- --- monodevelop-debugger-mdb/monodevelop-debugger-mdb.changes 2010-03-16 18:18:39.000000000 +0100 +++ monodevelop-debugger-mdb/monodevelop-debugger-mdb.changes 2010-10-29 19:13:03.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Oct 29 17:10:25 UTC 2010 - ajorgensen(a)novell.com + +- Update to 2.4 + * http://monodevelop.com/Download/MonoDevelop_2.4_Released + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- monodevelop-debugger-mdb-2.2.1.tar.bz2 New: ---- monodevelop-debugger-mdb-2.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ monodevelop-debugger-mdb.spec ++++++ --- /var/tmp/diff_new_pack.AXaGeF/_old 2010-11-05 16:25:21.000000000 +0100 +++ /var/tmp/diff_new_pack.AXaGeF/_new 2010-11-05 16:25:21.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package monodevelop-debugger-mdb (Version 2.2.1) +# spec file for package monodevelop-debugger-mdb (Version 2.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: monodevelop-debugger-mdb -Version: 2.2.1 +Version: 2.4 Release: 1 License: MIT/X11 AutoReqProv: on ++++++ monodevelop-debugger-mdb-2.2.1.tar.bz2 -> monodevelop-debugger-mdb-2.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-debugger-mdb-2.2.1/Mono.Debugging.Backend.Mdb/AssemblyInfo.cs new/monodevelop-debugger-mdb-2.4/Mono.Debugging.Backend.Mdb/AssemblyInfo.cs --- old/monodevelop-debugger-mdb-2.2.1/Mono.Debugging.Backend.Mdb/AssemblyInfo.cs 2009-11-05 19:11:36.000000000 +0100 +++ new/monodevelop-debugger-mdb-2.4/Mono.Debugging.Backend.Mdb/AssemblyInfo.cs 2010-06-14 21:46:07.000000000 +0200 @@ -5,5 +5,5 @@ [assembly: AssemblyProduct ("MonoDevelop")] [assembly: AssemblyTitle ("MDB support for Mono.Debugging")] [assembly: AssemblyDescription ("Managed Debugging Engine support for MDB")] -[assembly: AssemblyVersion ("2.2")] +[assembly: AssemblyVersion ("2.4")] [assembly: AssemblyCopyright ("MIT X11")] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-debugger-mdb-2.2.1/Mono.Debugging.Backend.Mdb/ChangeLog new/monodevelop-debugger-mdb-2.4/Mono.Debugging.Backend.Mdb/ChangeLog --- old/monodevelop-debugger-mdb-2.2.1/Mono.Debugging.Backend.Mdb/ChangeLog 2009-11-20 18:33:00.000000000 +0100 +++ new/monodevelop-debugger-mdb-2.4/Mono.Debugging.Backend.Mdb/ChangeLog 2010-06-14 21:46:07.000000000 +0200 @@ -1,3 +1,32 @@ +2010-03-22 Lluis Sanchez Gual <lluis(a)novell.com> + + * AssemblyInfo.cs: + * Manifest.addin.xml: Bumped MD version. + +2010-03-17 Lluis Sanchez Gual <lluis(a)novell.com> + + * Mono.Debugging.Backend.Mdb.csproj: Flush. + +2010-03-17 Lluis Sanchez Gual <lluis(a)novell.com> + + * Mono.Debugging.Backend.Mdb.csproj: Merged MD.Projects into + MD.Core, and MD.Projects.Gui, MD.Core.Gui and MD.Components + into MD.Ide. + +2010-03-08 Jonathan Pryor <jpryor(a)novell.com> + + * Makefile: Set $(ASSEMBLY_COMPILER_COMMAND) to $(CSC). + This allows a top-level CSC override to be used within this + module (e.g. top-level `make CSC=dmcs` for a v4 build). + +2010-02-16 Lluis Sanchez Gual <lluis(a)novell.com> + + * Manifest.addin.xml: + * MonoDebuggerSessionFactory.cs: Track api changes. Some + engine info is now taken from extension node metadata. + + * Mono.Debugging.Backend.Mdb.csproj: Flush. + 2009-11-20 Lluis Sanchez Gual <lluis(a)novell.com> * MonoDebuggerSessionFactory.cs: Implement Id property. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-debugger-mdb-2.2.1/Mono.Debugging.Backend.Mdb/Makefile new/monodevelop-debugger-mdb-2.4/Mono.Debugging.Backend.Mdb/Makefile --- old/monodevelop-debugger-mdb-2.2.1/Mono.Debugging.Backend.Mdb/Makefile 2009-11-05 19:11:36.000000000 +0100 +++ new/monodevelop-debugger-mdb-2.4/Mono.Debugging.Backend.Mdb/Makefile 2010-06-14 21:46:07.000000000 +0200 @@ -9,7 +9,7 @@ include $(top_srcdir)/config.make ifeq ($(CONFIG),DEBUG) -ASSEMBLY_COMPILER_COMMAND = gmcs +ASSEMBLY_COMPILER_COMMAND = $(CSC) ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG;TRACE" ASSEMBLY = ../build/DebuggerClient.dll @@ -23,7 +23,7 @@ endif ifeq ($(CONFIG),RELEASE) -ASSEMBLY_COMPILER_COMMAND = gmcs +ASSEMBLY_COMPILER_COMMAND = $(CSC) ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ -debug -define:DEBUG "-define:TRACE" ASSEMBLY = bin/Release/DebuggerClient.dll diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-debugger-mdb-2.2.1/Mono.Debugging.Backend.Mdb/Manifest.addin.xml new/monodevelop-debugger-mdb-2.4/Mono.Debugging.Backend.Mdb/Manifest.addin.xml --- old/monodevelop-debugger-mdb-2.2.1/Mono.Debugging.Backend.Mdb/Manifest.addin.xml 2009-11-05 19:11:36.000000000 +0100 +++ new/monodevelop-debugger-mdb-2.4/Mono.Debugging.Backend.Mdb/Manifest.addin.xml 2010-06-14 21:46:07.000000000 +0200 @@ -5,16 +5,19 @@ description = "Managed Debugging Engine support for MDB" copyright = "MIT X11" category = "Debugging" - version = "2.2"> + version = "2.4"> <Dependencies> - <Addin id="MonoDevelop.Core" version="2.2"/> - <Addin id="MonoDevelop.Ide" version="2.2"/> - <Addin id="MonoDevelop.Debugger" version="2.2"/> + <Addin id="MonoDevelop.Core" version="2.4"/> + <Addin id="MonoDevelop.Ide" version="2.4"/> + <Addin id="MonoDevelop.Debugger" version="2.4"/> </Dependencies> - <Extension path="/MonoDevelop/Debugging/DebuggerFactories"> - <DebuggerFactory type="MonoDevelop.Debugger.Mdb.MonoDebuggerSessionFactory" /> + <Extension path="/MonoDevelop/Debugging/DebuggerEngines"> + <DebuggerEngine id="Mono.Debugger.Mdb" + name="Mono Debugger" + features="Catchpoints, DebugFile, Stepping, Pause, Breakpoints, Disassembly" + type="MonoDevelop.Debugger.Mdb.MonoDebuggerSessionFactory" /> </Extension> </Addin> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-debugger-mdb-2.2.1/Mono.Debugging.Backend.Mdb/MonoDebuggerSessionFactory.cs new/monodevelop-debugger-mdb-2.4/Mono.Debugging.Backend.Mdb/MonoDebuggerSessionFactory.cs --- old/monodevelop-debugger-mdb-2.2.1/Mono.Debugging.Backend.Mdb/MonoDebuggerSessionFactory.cs 2009-11-20 18:33:00.000000000 +0100 +++ new/monodevelop-debugger-mdb-2.4/Mono.Debugging.Backend.Mdb/MonoDebuggerSessionFactory.cs 2010-06-14 21:46:07.000000000 +0200 @@ -39,14 +39,6 @@ { public class MonoDebuggerSessionFactory: IDebuggerEngine { - public string Name { - get { return "Mono Debugger"; } - } - - public string Id { - get { return "Mono.Debugger.Mdb"; } - } - public bool CanDebugCommand (ExecutionCommand command) { DotNetExecutionCommand cmd = command as DotNetExecutionCommand; @@ -68,15 +60,6 @@ return startInfo; } - public DebuggerFeatures SupportedFeatures { - get { - return DebuggerFeatures.All & ~( - DebuggerFeatures.ConditionalBreakpoints | - DebuggerFeatures.Tracepoints | - DebuggerFeatures.Attaching); - } - } - public DebuggerSession CreateSession () { MonoDebuggerSession ds = new MonoDebuggerSession (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-debugger-mdb-2.2.1/Mono.Debugging.Backend.Mdb.AspNet/AssemblyInfo.cs new/monodevelop-debugger-mdb-2.4/Mono.Debugging.Backend.Mdb.AspNet/AssemblyInfo.cs --- old/monodevelop-debugger-mdb-2.2.1/Mono.Debugging.Backend.Mdb.AspNet/AssemblyInfo.cs 2009-11-05 19:11:36.000000000 +0100 +++ new/monodevelop-debugger-mdb-2.4/Mono.Debugging.Backend.Mdb.AspNet/AssemblyInfo.cs 2010-06-14 21:46:07.000000000 +0200 @@ -5,5 +5,5 @@ [assembly: AssemblyProduct ("MonoDevelop")] [assembly: AssemblyTitle ("Asp.Net Debugging Support")] [assembly: AssemblyDescription ("Managed Debugging Engine support for MDB")] -[assembly: AssemblyVersion ("2.2")] +[assembly: AssemblyVersion ("2.4")] [assembly: AssemblyCopyright ("MIT X11")] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-debugger-mdb-2.2.1/Mono.Debugging.Backend.Mdb.AspNet/ChangeLog new/monodevelop-debugger-mdb-2.4/Mono.Debugging.Backend.Mdb.AspNet/ChangeLog --- old/monodevelop-debugger-mdb-2.2.1/Mono.Debugging.Backend.Mdb.AspNet/ChangeLog 2009-11-20 18:33:00.000000000 +0100 +++ new/monodevelop-debugger-mdb-2.4/Mono.Debugging.Backend.Mdb.AspNet/ChangeLog 2010-06-14 21:46:07.000000000 +0200 @@ -1,3 +1,32 @@ +2010-03-22 Lluis Sanchez Gual <lluis(a)novell.com> + + * AssemblyInfo.cs: + * Manifest.addin.xml: Bumped MD version. + +2010-03-17 Lluis Sanchez Gual <lluis(a)novell.com> + + * Mono.Debugging.Backend.Mdb.AspNet.csproj: Flush. + +2010-03-17 Lluis Sanchez Gual <lluis(a)novell.com> + + * Mono.Debugging.Backend.Mdb.AspNet.csproj: Merged MD.Projects + into MD.Core, and MD.Projects.Gui, MD.Core.Gui and + MD.Components into MD.Ide. + +2010-03-08 Jonathan Pryor <jpryor(a)novell.com> + + * Makefile: Set $(ASSEMBLY_COMPILER_COMMAND) to $(CSC). + This allows a top-level CSC override to be used within this + module (e.g. top-level `make CSC=dmcs` for a v4 build). + +2010-02-16 Lluis Sanchez Gual <lluis(a)novell.com> + + * Mono.Debugging.Backend.Mdb.AspNet.csproj: Flush. + + * Manifest.addin.xml: + * MonoXspDebuggerSessionFactory.cs: Track api changes. Some + engine info is now taken from extension node metadata. + 2009-11-20 Lluis Sanchez Gual <lluis(a)novell.com> * MonoXspDebuggerSessionFactory.cs: Implement Id property. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-debugger-mdb-2.2.1/Mono.Debugging.Backend.Mdb.AspNet/Makefile new/monodevelop-debugger-mdb-2.4/Mono.Debugging.Backend.Mdb.AspNet/Makefile --- old/monodevelop-debugger-mdb-2.2.1/Mono.Debugging.Backend.Mdb.AspNet/Makefile 2009-11-05 19:11:36.000000000 +0100 +++ new/monodevelop-debugger-mdb-2.4/Mono.Debugging.Backend.Mdb.AspNet/Makefile 2010-06-14 21:46:07.000000000 +0200 @@ -9,7 +9,7 @@ include $(top_srcdir)/config.make ifeq ($(CONFIG),DEBUG) -ASSEMBLY_COMPILER_COMMAND = gmcs +ASSEMBLY_COMPILER_COMMAND = $(CSC) ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG;TRACE" ASSEMBLY = ../build/AspNetDebuggerClient.dll @@ -23,7 +23,7 @@ endif ifeq ($(CONFIG),RELEASE) -ASSEMBLY_COMPILER_COMMAND = gmcs +ASSEMBLY_COMPILER_COMMAND = $(CSC) ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ -debug -define:DEBUG "-define:TRACE" ASSEMBLY = bin/Release/AspNetDebuggerClient.dll diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-debugger-mdb-2.2.1/Mono.Debugging.Backend.Mdb.AspNet/Manifest.addin.xml new/monodevelop-debugger-mdb-2.4/Mono.Debugging.Backend.Mdb.AspNet/Manifest.addin.xml --- old/monodevelop-debugger-mdb-2.2.1/Mono.Debugging.Backend.Mdb.AspNet/Manifest.addin.xml 2009-11-05 19:11:36.000000000 +0100 +++ new/monodevelop-debugger-mdb-2.4/Mono.Debugging.Backend.Mdb.AspNet/Manifest.addin.xml 2010-06-14 21:46:07.000000000 +0200 @@ -5,18 +5,21 @@ description = "Managed Debugging Engine support for MDB" copyright = "MIT X11" category = "Debugging" - version = "2.2"> + version = "2.4"> <Dependencies> - <Addin id="MonoDevelop.Core" version="2.2"/> - <Addin id="MonoDevelop.Ide" version="2.2"/> - <Addin id="MonoDevelop.Debugger" version="2.2"/> - <Addin id="MonoDevelop.Debugger.Mdb" version="2.2"/> - <Addin id="MonoDevelop.AspNet" version="2.2"/> + <Addin id="MonoDevelop.Core" version="2.4"/> + <Addin id="MonoDevelop.Ide" version="2.4"/> + <Addin id="MonoDevelop.Debugger" version="2.4"/> + <Addin id="MonoDevelop.Debugger.Mdb" version="2.4"/> + <Addin id="MonoDevelop.AspNet" version="2.4"/> </Dependencies> - <Extension path="/MonoDevelop/Debugging/DebuggerFactories"> - <DebuggerFactory type="MonoDevelop.Debugger.Mdb.MonoXspDebuggerSessionFactory" /> + <Extension path="/MonoDevelop/Debugging/DebuggerEngines"> + <DebuggerEngine id="Mono.Debugger.Mdb.AspNet" + name="Mono Debugger for ASP.NET" + features="Catchpoints, DebugFile, Stepping, Pause, Breakpoints, Disassembly" + type="MonoDevelop.Debugger.Mdb.MonoXspDebuggerSessionFactory" /> </Extension> </Addin> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-debugger-mdb-2.2.1/Mono.Debugging.Backend.Mdb.AspNet/MonoXspDebuggerSessionFactory.cs new/monodevelop-debugger-mdb-2.4/Mono.Debugging.Backend.Mdb.AspNet/MonoXspDebuggerSessionFactory.cs --- old/monodevelop-debugger-mdb-2.2.1/Mono.Debugging.Backend.Mdb.AspNet/MonoXspDebuggerSessionFactory.cs 2009-11-20 18:33:00.000000000 +0100 +++ new/monodevelop-debugger-mdb-2.4/Mono.Debugging.Backend.Mdb.AspNet/MonoXspDebuggerSessionFactory.cs 2010-06-14 21:46:07.000000000 +0200 @@ -40,14 +40,6 @@ { public class MonoXspDebuggerSessionFactory: IDebuggerEngine { - public string Name { - get { return "Mono Debugger for ASP.NET"; } - } - - public string Id { - get { return "Mono.Debugger.Mdb.AspNet"; } - } - public bool CanDebugCommand (ExecutionCommand command) { AspNetExecutionCommand cmd = command as AspNetExecutionCommand; @@ -82,15 +74,6 @@ return startInfo; } - public DebuggerFeatures SupportedFeatures { - get { - return DebuggerFeatures.All & ~( - DebuggerFeatures.ConditionalBreakpoints | - DebuggerFeatures.Tracepoints | - DebuggerFeatures.Attaching); - } - } - public DebuggerSession CreateSession () { MonoDebuggerSession ds = new MonoDebuggerSession (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-debugger-mdb-2.2.1/Mono.Debugging.Server.Mdb/BacktraceWrapper.cs new/monodevelop-debugger-mdb-2.4/Mono.Debugging.Server.Mdb/BacktraceWrapper.cs --- old/monodevelop-debugger-mdb-2.2.1/Mono.Debugging.Server.Mdb/BacktraceWrapper.cs 2009-11-20 18:33:00.000000000 +0100 +++ new/monodevelop-debugger-mdb-2.4/Mono.Debugging.Server.Mdb/BacktraceWrapper.cs 2010-06-14 21:46:07.000000000 +0200 @@ -17,10 +17,12 @@ MD.StackFrame[] frames; DissassemblyBuffer[] disBuffers; bool disposed; + TargetObject exception; - public BacktraceWrapper (MD.StackFrame[] frames): base (Server.Instance.MdbObjectValueAdaptor) + public BacktraceWrapper (MD.StackFrame[] frames, TargetObject exception): base (Server.Instance.MdbObjectValueAdaptor) { this.frames = frames; + this.exception = exception; Connect (); } @@ -76,7 +78,7 @@ { CheckDisposed (); MD.StackFrame frame = frames [frameIndex]; - return new MdbEvaluationContext (frame.Thread, frame, options); + return new MdbEvaluationContext (frame.Thread, frame, exception, options); } public override AssemblyLine[] Disassemble (int frameIndex, int firstLine, int count) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-debugger-mdb-2.2.1/Mono.Debugging.Server.Mdb/ChangeLog new/monodevelop-debugger-mdb-2.4/Mono.Debugging.Server.Mdb/ChangeLog --- old/monodevelop-debugger-mdb-2.2.1/Mono.Debugging.Server.Mdb/ChangeLog 2010-01-15 03:29:51.000000000 +0100 +++ new/monodevelop-debugger-mdb-2.4/Mono.Debugging.Server.Mdb/ChangeLog 2010-06-14 21:46:07.000000000 +0200 @@ -1,3 +1,56 @@ +2010-05-07 Lluis Sanchez Gual <lluis(a)novell.com> + + * IndexerValueReference.cs: Track api changes. + +2010-03-17 Lluis Sanchez Gual <lluis(a)novell.com> + + * Mono.Debugging.Server.Mdb.csproj: Flush. + +2010-03-17 Lluis Sanchez Gual <lluis(a)novell.com> + + * Mono.Debugging.Server.Mdb.csproj: Merged MD.Projects into + MD.Core, and MD.Projects.Gui, MD.Core.Gui and MD.Components + into MD.Ide. + +2010-03-08 Jonathan Pryor <jpryor(a)novell.com> + + * Makefile: Set $(ASSEMBLY_COMPILER_COMMAND) to $(CSC). + This allows a top-level CSC override to be used within this + module (e.g. top-level `make CSC=dmcs` for a v4 build). + +2010-03-01 Lluis Sanchez Gual <lluis(a)novell.com> + + * IndexerValueReference.cs: + * MdbObjectValueAdaptor.cs: Fixed indexer issues. + +2010-03-01 Lluis Sanchez Gual <lluis(a)novell.com> + + * IndexerValueReference.cs: + * MdbObjectValueAdaptor.cs: Track api changes. + +2010-02-22 Lluis Sanchez Gual <lluis(a)novell.com> + + * DebuggerServer.cs: + * BacktraceWrapper.cs: + * EvaluationContext.cs: + * MdbObjectValueAdaptor.cs: Improve implementation of + catchpoints. Properly report the catchpoint exception. + +2010-02-22 Lluis Sanchez Gual <lluis(a)novell.com> + + * DebuggerServer.cs: Track api changes. + +2010-02-22 Mike Krüger <mkrueger(a)novell.com> + + * MdbObjectValueAdaptor.cs: fixed build. + +2010-02-16 Lluis Sanchez Gual <lluis(a)novell.com> + + * DebuggerServer.cs: Tracepoints are now printed by the + debugging engine. + + * Mono.Debugging.Server.Mdb.csproj: Flush. + 2009-12-15 Lluis Sanchez Gual <lluis(a)novell.com> * MdbObjectValueAdaptor.cs: Improved ToString method for diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-debugger-mdb-2.2.1/Mono.Debugging.Server.Mdb/DebuggerServer.cs new/monodevelop-debugger-mdb-2.4/Mono.Debugging.Server.Mdb/DebuggerServer.cs --- old/monodevelop-debugger-mdb-2.2.1/Mono.Debugging.Server.Mdb/DebuggerServer.cs 2010-01-15 03:29:51.000000000 +0100 +++ new/monodevelop-debugger-mdb-2.4/Mono.Debugging.Server.Mdb/DebuggerServer.cs 2010-06-14 21:46:07.000000000 +0200 @@ -295,16 +295,23 @@ ev = sbp; } else if (be is Catchpoint) { - Catchpoint cp = (Catchpoint) be; - ML.TargetType exc = null; - foreach (Module mod in process.Modules) { - exc = mod.Language.LookupType (cp.ExceptionName); + lock (pendingCatchpoints) { + Catchpoint cp = (Catchpoint) be; + ML.TargetType exc = null; + if (process != null) { + foreach (Module mod in process.Modules) { + exc = mod.Language.LookupType (cp.ExceptionName); + if (exc != null) + break; + } + } if (exc != null) - break; + ev = session.InsertExceptionCatchPoint (process.MainThread, ThreadGroup.Global, exc); + else { + pendingCatchpoints.Add (cp); + return -1; + } } - if (exc == null) - throw new Exception ("Unknown exception type."); - ev = session.InsertExceptionCatchPoint (process.MainThread, ThreadGroup.Global, exc); } ev.IsEnabled = enable; @@ -317,7 +324,7 @@ if (bp != null && !running && !initializing && activeThread.CurrentFrame != null && !string.IsNullOrEmpty (bp.ConditionExpression) && bp.BreakIfConditionChanges) { // Initial expression evaluation - MdbEvaluationContext ctx = new MdbEvaluationContext (activeThread, activeThread.CurrentFrame, SessionOptions.EvaluationOptions); + MdbEvaluationContext ctx = new MdbEvaluationContext (activeThread, activeThread.CurrentFrame, null, SessionOptions.EvaluationOptions); ML.TargetObject ob = EvaluateExp (ctx, bp.ConditionExpression); if (ob != null) lastConditionValue [ev.Index] = evaluator.TargetObjectToExpression (ctx, ob).Value; @@ -373,7 +380,7 @@ return false; } - MdbEvaluationContext ctx = new MdbEvaluationContext (frame.Thread, frame, SessionOptions.EvaluationOptions); + MdbEvaluationContext ctx = new MdbEvaluationContext (frame.Thread, frame, null, SessionOptions.EvaluationOptions); DL.Breakpoint bp = be as DL.Breakpoint; if (bp != null && !string.IsNullOrEmpty (bp.ConditionExpression)) { ML.TargetObject val = EvaluateExp (ctx, bp.ConditionExpression); @@ -408,7 +415,6 @@ if (val != null) { string str = evaluator.TargetObjectToString (ctx, val); DispatchEvent (delegate { - controller.OnTargetOutput (false, str + "\n"); NotifyBreakEventUpdate (eventHandle, -1, str); }); } @@ -506,7 +512,7 @@ { MD.Thread t = GetThread (processId, threadId); if (t != null && t.IsStopped) - return CreateBacktrace (t); + return CreateBacktrace (t, null); else return null; } @@ -602,7 +608,7 @@ return mc.ReturnValue; } - DL.Backtrace CreateBacktrace (MD.Thread thread) + DL.Backtrace CreateBacktrace (MD.Thread thread, ML.TargetObject exception) { List<MD.StackFrame> frames = new List<MD.StackFrame> (); DateTime t = DateTime.Now; @@ -621,10 +627,10 @@ } } if (frames.Count > 0) { - BacktraceWrapper wrapper = new BacktraceWrapper (frames.ToArray ()); + BacktraceWrapper wrapper = new BacktraceWrapper (frames.ToArray (), exception); return new DL.Backtrace (wrapper); } else if (thread.CurrentBacktrace != null) { - BacktraceWrapper wrapper = new BacktraceWrapper (thread.CurrentBacktrace.Frames); + BacktraceWrapper wrapper = new BacktraceWrapper (thread.CurrentBacktrace.Frames, exception); return new DL.Backtrace (wrapper); } return null; @@ -792,14 +798,13 @@ DL.TargetEventArgs targetArgs = new DL.TargetEventArgs (type); if (args.Type != MD.TargetEventType.TargetExited) { - targetArgs.Backtrace = CreateBacktrace (thread); + ML.TargetObject exception = null; + if (args.Type == MD.TargetEventType.UnhandledException || args.Type == MD.TargetEventType.Exception) + exception = args.Frame.ExceptionObject; + targetArgs.Backtrace = CreateBacktrace (thread, exception); targetArgs.Thread = CreateThreadInfo (activeThread); } - if ((args.Type == MD.TargetEventType.UnhandledException || args.Type == MD.TargetEventType.Exception) && (args.Data is TargetAddress)) { - MdbEvaluationContext ctx = new MdbEvaluationContext (args.Frame.Thread, args.Frame, SessionOptions.EvaluationOptions); - targetArgs.Exception = LiteralValueReference.CreateTargetObjectLiteral (ctx, "Exception", args.Frame.ExceptionObject).CreateObjectValue (); - } running = false; @@ -859,6 +864,8 @@ WriteDebuggerOutput (string.Format ("Thread {0} exited.\n", thread.ID)); } + List<Catchpoint> pendingCatchpoints = new List<Catchpoint> (); + private void OnModuleLoadedEvent (Module module) { SourceFile[] sfiles = module.Sources; @@ -867,6 +874,19 @@ files [n] = sfiles [n].FileName; controller.NotifySourceFileLoaded (files); WriteDebuggerOutput (string.Format ("Module loaded: {0}.\n", module.Name)); + + if (process == null) + return; + + lock (pendingCatchpoints) { + foreach (Catchpoint cp in pendingCatchpoints.ToArray ()) { + ML.TargetType exc = module.Language.LookupType (cp.ExceptionName); + if (exc != null) { + session.InsertExceptionCatchPoint (process.MainThread, ThreadGroup.Global, exc); + pendingCatchpoints.Remove (cp); + } + } + } } private void OnModuleUnLoadedEvent (Module module) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-debugger-mdb-2.2.1/Mono.Debugging.Server.Mdb/EvaluationContext.cs new/monodevelop-debugger-mdb-2.4/Mono.Debugging.Server.Mdb/EvaluationContext.cs --- old/monodevelop-debugger-mdb-2.2.1/Mono.Debugging.Server.Mdb/EvaluationContext.cs 2009-11-20 18:33:00.000000000 +0100 +++ new/monodevelop-debugger-mdb-2.4/Mono.Debugging.Server.Mdb/EvaluationContext.cs 2010-06-14 21:46:07.000000000 +0200 @@ -48,13 +48,16 @@ return frame; } } + + public TargetObject Exception { get; private set; } - public MdbEvaluationContext (Thread thread, StackFrame frame, Mono.Debugging.Client.EvaluationOptions options): base (options) + public MdbEvaluationContext (Thread thread, StackFrame frame, TargetObject exception, Mono.Debugging.Client.EvaluationOptions options): base (options) { Evaluator = Server.Instance.Evaluator; Adapter = Server.Instance.MdbObjectValueAdaptor; this.thread = thread; this.frame = frame; + this.Exception = exception; } public TargetObject GetRealObject (object ob) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-debugger-mdb-2.2.1/Mono.Debugging.Server.Mdb/IndexerValueReference.cs new/monodevelop-debugger-mdb-2.4/Mono.Debugging.Server.Mdb/IndexerValueReference.cs --- old/monodevelop-debugger-mdb-2.2.1/Mono.Debugging.Server.Mdb/IndexerValueReference.cs 2010-01-15 03:29:51.000000000 +0100 +++ new/monodevelop-debugger-mdb-2.4/Mono.Debugging.Server.Mdb/IndexerValueReference.cs 2010-06-14 21:46:07.000000000 +0200 @@ -32,6 +32,7 @@ using Mono.Debugging.Client; using System.Collections.Generic; using Mono.Debugging.Evaluation; +using System.Text; namespace DebuggerServer { @@ -39,23 +40,23 @@ { TargetPropertyInfo indexer; TargetStructObject target; - TargetObject index; + TargetObject[] index; - public IndexerValueReference (EvaluationContext ctx, TargetStructObject target, TargetObject index, TargetPropertyInfo indexerProp): base (ctx) + public IndexerValueReference (EvaluationContext ctx, TargetStructObject target, TargetObject[] index, TargetPropertyInfo indexerProp): base (ctx) { this.indexer = indexerProp; this.target = target; this.index = index; } - public static ValueReference CreateIndexerValueReference (MdbEvaluationContext ctx, TargetObject target, TargetObject index) + public static ValueReference CreateIndexerValueReference (MdbEvaluationContext ctx, TargetObject target, TargetObject[] index) { TargetFundamentalObject mstr = target as TargetFundamentalObject; if (mstr != null && mstr.TypeName == "string") { // Special case for strings - string name = "[" + ctx.Evaluator.TargetObjectToExpression (ctx, index) + "]"; + string name = "[" + ctx.Evaluator.TargetObjectToExpression (ctx, index[0]) + "]"; string val = (string) mstr.GetObject (ctx.Thread); - object oo = ctx.Adapter.TargetObjectToObject (ctx, index); + object oo = ctx.Adapter.TargetObjectToObject (ctx, index[0]); int idx = (int) Convert.ChangeType (oo, typeof(int)); return LiteralValueReference.CreateObjectLiteral (ctx, name, val [idx]); } @@ -85,19 +86,21 @@ public override object Value { get { MdbEvaluationContext ctx = (MdbEvaluationContext) Context; - return ObjectUtil.GetRealObject (ctx, Server.Instance.RuntimeInvoke (ctx, indexer.Getter, target, new TargetObject [] {index})); + return ObjectUtil.GetRealObject (ctx, Server.Instance.RuntimeInvoke (ctx, indexer.Getter, target, index)); } set { MdbEvaluationContext ctx = (MdbEvaluationContext) Context; - TargetObject cindex = TargetObjectConvert.Cast (ctx, index, indexer.Setter.ParameterTypes [0]); - TargetObject cvalue = TargetObjectConvert.Cast (ctx, (TargetObject) value, indexer.Setter.ParameterTypes [1]); - Server.Instance.RuntimeInvoke (ctx, indexer.Setter, target, new TargetObject [] {cindex, cvalue}); + TargetObject[] cparams = new TargetObject [index.Length + 1]; + for (int n=0; n<index.Length; n++) + cparams[n] = TargetObjectConvert.Cast (ctx, index[n], indexer.Setter.ParameterTypes [n]); + cparams [cparams.Length - 1] = TargetObjectConvert.Cast (ctx, (TargetObject) value, indexer.Setter.ParameterTypes [cparams.Length - 1]); + Server.Instance.RuntimeInvoke (ctx, indexer.Setter, target, cparams); } } - protected override bool CanEvaluate () + protected override bool CanEvaluate (EvaluationOptions options) { - return Context.Options.AllowTargetInvoke; + return options.AllowTargetInvoke; } public override object Type { @@ -112,7 +115,14 @@ public override string Name { get { - return "[" + Server.Instance.Evaluator.TargetObjectToExpression (Context, index) + "]"; + StringBuilder sb = new StringBuilder ("["); + for (int n=0; n<index.Length; n++) { + if (n > 0) + sb.Append (','); + sb.Append (Server.Instance.Evaluator.TargetObjectToExpression (Context, index[n])); + } + sb.Append (']'); + return sb.ToString (); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-debugger-mdb-2.2.1/Mono.Debugging.Server.Mdb/Makefile new/monodevelop-debugger-mdb-2.4/Mono.Debugging.Server.Mdb/Makefile --- old/monodevelop-debugger-mdb-2.2.1/Mono.Debugging.Server.Mdb/Makefile 2009-11-05 19:11:36.000000000 +0100 +++ new/monodevelop-debugger-mdb-2.4/Mono.Debugging.Server.Mdb/Makefile 2010-06-14 21:46:07.000000000 +0200 @@ -9,7 +9,7 @@ include $(top_srcdir)/config.make ifeq ($(CONFIG),DEBUG) -ASSEMBLY_COMPILER_COMMAND = gmcs +ASSEMBLY_COMPILER_COMMAND = $(CSC) ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG;TRACE" ASSEMBLY = ../build/DebuggerServer.exe @@ -21,7 +21,7 @@ endif ifeq ($(CONFIG),RELEASE) -ASSEMBLY_COMPILER_COMMAND = gmcs +ASSEMBLY_COMPILER_COMMAND = $(CSC) ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+ -debug -define:DEBUG "-define:TRACE" ASSEMBLY = ../build/DebuggerServer.exe diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-debugger-mdb-2.2.1/Mono.Debugging.Server.Mdb/MdbObjectValueAdaptor.cs new/monodevelop-debugger-mdb-2.4/Mono.Debugging.Server.Mdb/MdbObjectValueAdaptor.cs --- old/monodevelop-debugger-mdb-2.2.1/Mono.Debugging.Server.Mdb/MdbObjectValueAdaptor.cs 2010-01-15 03:29:51.000000000 +0100 +++ new/monodevelop-debugger-mdb-2.4/Mono.Debugging.Server.Mdb/MdbObjectValueAdaptor.cs 2010-06-14 21:46:07.000000000 +0200 @@ -25,6 +25,7 @@ // THE SOFTWARE. using System; +using System.Linq; using System.Text; using System.Collections; using ST = System.Threading; @@ -298,6 +299,15 @@ else return null; } + + public override ValueReference GetCurrentException (EvaluationContext gctx) + { + MdbEvaluationContext ctx = (MdbEvaluationContext) gctx; + if (ctx.Exception != null) + return LiteralValueReference.CreateTargetObjectLiteral (ctx, ctx.Options.CurrentExceptionTag, ctx.Exception); + else + return null; + } public override IEnumerable<ValueReference> GetParameters (EvaluationContext gctx) @@ -452,10 +462,12 @@ } - public override ValueReference GetIndexerReference (EvaluationContext gctx, object target, object index) + public override ValueReference GetIndexerReference (EvaluationContext gctx, object target, object[] indices) { MdbEvaluationContext ctx = (MdbEvaluationContext) gctx; - return IndexerValueReference.CreateIndexerValueReference (ctx, (TargetObject) target, (TargetObject) index); + TargetObject[] indexArray = new TargetObject [indices.Length]; + Array.Copy (indices, indexArray, indices.Length); + return IndexerValueReference.CreateIndexerValueReference (ctx, (TargetObject) target, indexArray); } @@ -525,7 +537,7 @@ return ObjectValue.CreateObject (null, path, "", "", flags | ObjectValueFlags.ReadOnly, null); if (obj.HasAddress && obj.GetAddress (ctx.Thread).IsNull) - return ObjectValue.CreateObject (null, path, obj.TypeName, ctx.Evaluator.ToExpression (null), flags, null); + return ObjectValue.CreateObject (null, path, obj.TypeName, ctx.Evaluator.ToExpression (ctx, null), flags, null); switch (obj.Kind) { @@ -556,7 +568,7 @@ } else { flags |= ObjectValueFlags.Primitive; - return ObjectValue.CreateObject (source, path, obj.TypeName, ctx.Evaluator.ToExpression (null), flags, new ObjectValue [0]); + return ObjectValue.CreateObject (source, path, obj.TypeName, ctx.Evaluator.ToExpression (ctx, null), flags, new ObjectValue [0]); } default: return ObjectValue.CreateFatalError (path.LastName, "Unknown value type: " + obj.Kind, flags); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-debugger-mdb-2.2.1/configure new/monodevelop-debugger-mdb-2.4/configure --- old/monodevelop-debugger-mdb-2.2.1/configure 2010-02-01 22:47:43.000000000 +0100 +++ new/monodevelop-debugger-mdb-2.4/configure 2010-06-14 21:46:07.000000000 +0200 @@ -1,10 +1,10 @@ #!/bin/bash -VERSION=2.2.1 +VERSION=2.4 PACKAGE=monodevelop-debugger-mdb prefix=/usr/local config=DEBUG configurations=" RELEASE DEBUG" -common_packages=" mono-addins;0.3 mono-debugger;2.0 monodevelop;2.2.1 monodevelop-core-addins;2.2.1" +common_packages=" mono-addins;0.3 mono-debugger;2.0 monodevelop;2.4 monodevelop-core-addins;2.4" usage () @@ -142,6 +142,7 @@ echo "VERSION=$VERSION" >> config.make echo "PACKAGE=$PACKAGE" >> config.make echo "CONFIG=$config" >> config.make +echo "CSC=gmcs" >> config.make echo echo "$PACKAGE has been configured with " ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit monodevelop-java for openSUSE:Factory
by root＠hilbert.suse.de 05 Nov '10

05 Nov '10

Hello community, here is the log from the commit of package monodevelop-java for openSUSE:Factory checked in at Fri Nov 5 16:25:07 CET 2010. -------- --- GNOME/monodevelop-java/monodevelop-java.changes 2010-03-16 18:24:01.000000000 +0100 +++ monodevelop-java/monodevelop-java.changes 2010-10-29 19:13:20.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Oct 29 17:10:31 UTC 2010 - ajorgensen(a)novell.com + +- Update to 2.4 + * http://monodevelop.com/Download/MonoDevelop_2.4_Released + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- monodevelop-java-2.2.tar.bz2 New: ---- monodevelop-java-2.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ monodevelop-java.spec ++++++ --- /var/tmp/diff_new_pack.SK6kk7/_old 2010-11-05 16:23:51.000000000 +0100 +++ /var/tmp/diff_new_pack.SK6kk7/_new 2010-11-05 16:23:51.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package monodevelop-java (Version 2.2) +# spec file for package monodevelop-java (Version 2.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,12 +15,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: monodevelop-java -Version: 2.2 -Release: 2 +Version: 2.4 +Release: 1 License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on @@ -29,6 +28,7 @@ Source0: %{name}-%{version}.tar.bz2 BuildRequires: ikvm mono-devel monodevelop >= %{version} Requires: ikvm +Requires: java-sdk Summary: Monodevelop Java Addin Group: Development/Languages/Mono ++++++ monodevelop-java-2.2.tar.bz2 -> monodevelop-java-2.4.tar.bz2 ++++++ ++++ 1720 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit monodevelop-python for openSUSE:Factory
by root＠hilbert.suse.de 05 Nov '10

05 Nov '10

Hello community, here is the log from the commit of package monodevelop-python for openSUSE:Factory checked in at Fri Nov 5 16:23:38 CET 2010. -------- --- GNOME/monodevelop-python/monodevelop-python.changes 2010-03-16 18:19:52.000000000 +0100 +++ monodevelop-python/monodevelop-python.changes 2010-10-29 19:13:36.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Oct 29 17:10:36 UTC 2010 - ajorgensen(a)novell.com + +- Update to 2.4 + * http://monodevelop.com/Download/MonoDevelop_2.4_Released + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- monodevelop-python-2.2.tar.bz2 New: ---- monodevelop-python-2.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ monodevelop-python.spec ++++++ --- /var/tmp/diff_new_pack.ziX8fB/_old 2010-11-05 16:23:20.000000000 +0100 +++ /var/tmp/diff_new_pack.ziX8fB/_new 2010-11-05 16:23:20.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package monodevelop-python (Version 2.2) +# spec file for package monodevelop-python (Version 2.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,8 @@ Name: monodevelop-python -Version: 2.2 -Release: 2 +Version: 2.4 +Release: 1 License: MIT/X11 AutoReqProv: on BuildArch: noarch @@ -56,12 +56,15 @@ %install %{?env_options} make install DESTDIR=${RPM_BUILD_ROOT} + mkdir -p $RPM_BUILD_ROOT%_prefix/share/pkgconfig mv $RPM_BUILD_ROOT%_prefix/lib/pkgconfig/*.pc $RPM_BUILD_ROOT%_prefix/share/pkgconfig + #%find_lang %{name} %clean rm -rf "$RPM_BUILD_ROOT" + %if 0%{?fedora_version} || 0%{?rhel_version} # Allows overrides of __find_provides in fedora distros... (already set to zero on newer suse distros) %define _use_internal_dependency_generator 0 ++++++ monodevelop-python-2.2.tar.bz2 -> monodevelop-python-2.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/AssemblyInfo.cs new/monodevelop-python-2.4/PyBinding/AssemblyInfo.cs --- old/monodevelop-python-2.2/PyBinding/AssemblyInfo.cs 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/AssemblyInfo.cs 2010-06-14 21:45:40.000000000 +0200 @@ -5,5 +5,5 @@ [assembly: AssemblyProduct ("MonoDevelop")] [assembly: AssemblyTitle ("Python Language Binding")] [assembly: AssemblyDescription ("Python Language binding")] -[assembly: AssemblyVersion ("2.2")] +[assembly: AssemblyVersion ("2.4")] [assembly: AssemblyCopyright ("MIT X11")] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/PyBinding/PythonProject.cs new/monodevelop-python-2.4/PyBinding/PyBinding/PythonProject.cs --- old/monodevelop-python-2.2/PyBinding/PyBinding/PythonProject.cs 2009-12-02 11:07:21.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/PyBinding/PythonProject.cs 2010-06-14 21:45:40.000000000 +0200 @@ -27,7 +27,7 @@ using MonoDevelop.Core; using MonoDevelop.Core.Execution; -using MonoDevelop.Core.Gui; +using MonoDevelop.Ide; using MonoDevelop.Core.ProgressMonitoring; using MonoDevelop.Gettext; using MonoDevelop.Ide.Gui; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/PyBinding/PythonSite.cs new/monodevelop-python-2.4/PyBinding/PyBinding/PythonSite.cs --- old/monodevelop-python-2.2/PyBinding/PyBinding/PythonSite.cs 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/PyBinding/PythonSite.cs 2010-06-14 21:45:40.000000000 +0200 @@ -29,7 +29,7 @@ using System.IO; using System.Threading; -using MonoDevelop.Ide.Gui; +using MonoDevelop.Ide; using PyBinding.Parser; using PyBinding.Runtime; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/PyBinding.Gui/PythonEditorCompletion.cs new/monodevelop-python-2.4/PyBinding/PyBinding.Gui/PythonEditorCompletion.cs --- old/monodevelop-python-2.2/PyBinding/PyBinding.Gui/PythonEditorCompletion.cs 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/PyBinding.Gui/PythonEditorCompletion.cs 2010-06-14 21:45:40.000000000 +0200 @@ -30,8 +30,7 @@ using MonoDevelop.Ide.Gui.Content; using MonoDevelop.Projects.Dom; using MonoDevelop.Projects.Dom.Parser; -using MonoDevelop.Projects.Gui; -using MonoDevelop.Projects.Gui.Completion; +using MonoDevelop.Ide.CodeCompletion; using PyBinding; using PyBinding.Parser; @@ -62,13 +61,6 @@ m_site = new PythonSite (PythonHelper.FindPreferedRuntime ()); } - public override bool ExtendsEditor (Document doc, IEditableTextBuffer editor) - { - if (doc == null || String.IsNullOrEmpty (doc.Name)) - return false; - return Path.GetExtension (doc.Name) == ".py"; - } - public override ICompletionDataList HandleCodeCompletion (CodeCompletionContext completionContext, char completionChar) { switch (completionChar) { @@ -87,7 +79,7 @@ } } - public IEnumerable<ICompletionData> SelfDotCompletionData (PythonClass klass) + public IEnumerable<CompletionData> SelfDotCompletionData (PythonClass klass) { foreach (var attr in klass.Attributes) yield return new CompletionData (attr.Name, s_ImgAttr, attr.Documentation); @@ -135,7 +127,7 @@ // "from blah " if (inFrom && parts.Length == 2 && parts [parts.Length-1].Trim ().Length > 0 && completionChar == ' ') { - return new CompletionDataList (new ICompletionData[] { new CompletionData ("import") }); + return new CompletionDataList (new CompletionData[] { new CompletionData ("import") }); } // "from blah import " else if (inFrom && parts.Length > 2) { @@ -191,12 +183,12 @@ ; } - static ICompletionData CreateCompletionData (ParserItem item, string triggerWord) + static CompletionData CreateCompletionData (ParserItem item, string triggerWord) { return CreateCompletionData (item, triggerWord, ""); } - static ICompletionData CreateCompletionData (ParserItem item, string triggerWord, string suffix) + static CompletionData CreateCompletionData (ParserItem item, string triggerWord, string suffix) { var name = item.FullName.Substring (triggerWord.Length); return new CompletionData (name, IconForType (item), item.Documentation, name + suffix); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/PyBinding.Gui/PythonEditorIndentation.cs new/monodevelop-python-2.4/PyBinding/PyBinding.Gui/PythonEditorIndentation.cs --- old/monodevelop-python-2.2/PyBinding/PyBinding.Gui/PythonEditorIndentation.cs 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/PyBinding.Gui/PythonEditorIndentation.cs 2010-06-14 21:45:40.000000000 +0200 @@ -36,11 +36,6 @@ { public class PythonEditorIndentation : TextEditorExtension { - public override bool ExtendsEditor (Document doc, IEditableTextBuffer editor) - { - return !String.IsNullOrEmpty (doc.Name) && Path.GetExtension (doc.Name) == ".py"; - } - public override bool KeyPress (Gdk.Key key, char keyChar, Gdk.ModifierType modifier) { if (key == Gdk.Key.Return) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/PyBinding.Gui/PythonEditorOutline.cs new/monodevelop-python-2.4/PyBinding/PyBinding.Gui/PythonEditorOutline.cs --- old/monodevelop-python-2.2/PyBinding/PyBinding.Gui/PythonEditorOutline.cs 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/PyBinding.Gui/PythonEditorOutline.cs 2010-06-14 21:45:40.000000000 +0200 @@ -32,11 +32,5 @@ { public class PythonEditorOutline : ClassOutlineTextEditorExtension { - public override bool ExtendsEditor (Document doc, IEditableTextBuffer editor) - { - PythonLanguageBinding binding = MonoDevelop.Projects.LanguageBindingService.GetBindingPerFileName (doc.Name) - as PythonLanguageBinding; - return binding != null; - } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/PyBinding.Gui/PythonOptionsPanel.cs new/monodevelop-python-2.4/PyBinding/PyBinding.Gui/PythonOptionsPanel.cs --- old/monodevelop-python-2.2/PyBinding/PyBinding.Gui/PythonOptionsPanel.cs 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/PyBinding.Gui/PythonOptionsPanel.cs 2010-06-14 21:45:40.000000000 +0200 @@ -22,16 +22,8 @@ using System; using System.Collections.Generic; - using Gtk; - -using MonoDevelop.Ide.Gui; -using MonoDevelop.Core; -using MonoDevelop.Core.Gui; -using MonoDevelop.Projects; -using MonoDevelop.Projects.Gui.Dialogs; -using MonoDevelop.Projects.Text; -using MonoDevelop.Core.Gui.Dialogs; +using MonoDevelop.Ide.Gui.Dialogs; namespace PyBinding.Gui { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/PyBinding.Gui/PythonOptionsWidget.cs new/monodevelop-python-2.4/PyBinding/PyBinding.Gui/PythonOptionsWidget.cs --- old/monodevelop-python-2.2/PyBinding/PyBinding.Gui/PythonOptionsWidget.cs 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/PyBinding.Gui/PythonOptionsWidget.cs 2010-06-14 21:45:40.000000000 +0200 @@ -26,7 +26,7 @@ using Gtk; using MonoDevelop.Gettext; -using MonoDevelop.Ide.Gui; +using MonoDevelop.Ide; using PyBinding.Runtime; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/PyBinding.Gui.Navigation/AttributeNodeBuilder.cs new/monodevelop-python-2.4/PyBinding/PyBinding.Gui.Navigation/AttributeNodeBuilder.cs --- old/monodevelop-python-2.2/PyBinding/PyBinding.Gui.Navigation/AttributeNodeBuilder.cs 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/PyBinding.Gui.Navigation/AttributeNodeBuilder.cs 2010-06-14 21:45:40.000000000 +0200 @@ -24,7 +24,7 @@ using System.Collections.Generic; using MonoDevelop.Core; -using MonoDevelop.Core.Gui; + using MonoDevelop.Ide.Gui.Components; using MonoDevelop.Projects; using MonoDevelop.Projects.Dom; @@ -63,7 +63,7 @@ { PythonNode pyNode = dataObject as PythonNode; label = pyNode.Name; - icon = Context.GetIcon (Stock.Property); + icon = Context.GetIcon (MonoDevelop.Ide.Gui.Stock.Property); } public override int CompareObjects (ITreeNavigator thisNode, ITreeNavigator otherNode) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/PyBinding.Gui.Navigation/ClassNodeBuilder.cs new/monodevelop-python-2.4/PyBinding/PyBinding.Gui.Navigation/ClassNodeBuilder.cs --- old/monodevelop-python-2.2/PyBinding/PyBinding.Gui.Navigation/ClassNodeBuilder.cs 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/PyBinding.Gui.Navigation/ClassNodeBuilder.cs 2010-06-14 21:45:40.000000000 +0200 @@ -25,7 +25,7 @@ using System.IO; using MonoDevelop.Core; -using MonoDevelop.Core.Gui; + using MonoDevelop.Ide.Gui.Components; using MonoDevelop.Projects; using MonoDevelop.Projects.Dom; @@ -65,7 +65,7 @@ PythonClass pyClass = dataObject as PythonClass; label = pyClass.Name; - icon = Context.GetIcon (Stock.Class); + icon = Context.GetIcon (MonoDevelop.Ide.Gui.Stock.Class); } public override void BuildChildNodes (ITreeBuilder treeBuilder, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/PyBinding.Gui.Navigation/FunctionNodeBuilder.cs new/monodevelop-python-2.4/PyBinding/PyBinding.Gui.Navigation/FunctionNodeBuilder.cs --- old/monodevelop-python-2.2/PyBinding/PyBinding.Gui.Navigation/FunctionNodeBuilder.cs 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/PyBinding.Gui.Navigation/FunctionNodeBuilder.cs 2010-06-14 21:45:40.000000000 +0200 @@ -24,7 +24,7 @@ using System.Collections.Generic; using MonoDevelop.Core; -using MonoDevelop.Core.Gui; + using MonoDevelop.Ide.Gui.Components; using MonoDevelop.Projects; using MonoDevelop.Projects.Dom; @@ -66,7 +66,7 @@ ref Gdk.Pixbuf closedIcon) { label = GetNodeName (null, dataObject); - icon = Context.GetIcon (Stock.Method); + icon = Context.GetIcon (MonoDevelop.Ide.Gui.Stock.Method); } public override int CompareObjects (ITreeNavigator thisNode, ITreeNavigator otherNode) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/PyBinding.Gui.Navigation/PackageNodeBuilder.cs new/monodevelop-python-2.4/PyBinding/PyBinding.Gui.Navigation/PackageNodeBuilder.cs --- old/monodevelop-python-2.2/PyBinding/PyBinding.Gui.Navigation/PackageNodeBuilder.cs 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/PyBinding.Gui.Navigation/PackageNodeBuilder.cs 2010-06-14 21:45:40.000000000 +0200 @@ -25,7 +25,7 @@ using System.IO; using MonoDevelop.Core; -using MonoDevelop.Core.Gui; + using MonoDevelop.Ide.Gui.Components; using MonoDevelop.Projects; using MonoDevelop.Projects.Dom; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/PyBinding.Gui.Navigation/PackagesNodeBuilder.cs new/monodevelop-python-2.4/PyBinding/PyBinding.Gui.Navigation/PackagesNodeBuilder.cs --- old/monodevelop-python-2.2/PyBinding/PyBinding.Gui.Navigation/PackagesNodeBuilder.cs 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/PyBinding.Gui.Navigation/PackagesNodeBuilder.cs 2010-06-14 21:45:40.000000000 +0200 @@ -25,7 +25,7 @@ using System.IO; using MonoDevelop.Core; -using MonoDevelop.Core.Gui; + using MonoDevelop.Ide.Gui.Components; using MonoDevelop.Projects; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/PyBinding.Parser/ParserDatabase.cs new/monodevelop-python-2.4/PyBinding/PyBinding.Parser/ParserDatabase.cs --- old/monodevelop-python-2.2/PyBinding/PyBinding.Parser/ParserDatabase.cs 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/PyBinding.Parser/ParserDatabase.cs 2010-06-14 21:45:40.000000000 +0200 @@ -30,6 +30,7 @@ using System.IO; using System.Reflection; using System.Threading; +using MonoDevelop.Ide; using Mono.Data.Sqlite; @@ -286,7 +287,7 @@ var rowsCommand = new SqliteCommand ("SELECT count(*) FROM Items;", src); var count = (long)rowsCommand.ExecuteScalar (); - var progress = MonoDevelop.Ide.Gui.IdeApp.Workbench.ProgressMonitors.GetBackgroundProgressMonitor ("Python Completion Database", Gtk.Stock.Execute); + var progress = IdeApp.Workbench.ProgressMonitors.GetBackgroundProgressMonitor ("Python Completion Database", Gtk.Stock.Execute); progress.BeginTask ("Migrating completion database", (int)count); while (reader.Read ()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/PyBinding.Parser.Dom/PythonCompilationUnit.cs new/monodevelop-python-2.4/PyBinding/PyBinding.Parser.Dom/PythonCompilationUnit.cs --- old/monodevelop-python-2.2/PyBinding/PyBinding.Parser.Dom/PythonCompilationUnit.cs 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/PyBinding.Parser.Dom/PythonCompilationUnit.cs 2010-06-14 21:45:40.000000000 +0200 @@ -23,6 +23,7 @@ using System; using System.Collections.Generic; +using MonoDevelop.Core; using MonoDevelop.Projects.Dom; using MonoDevelop.Projects.Dom.Parser; @@ -156,7 +157,7 @@ class PackageDomType: DomType { - public override string StockIcon { + public override IconId StockIcon { get { return "md-package"; } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/PyBinding.addin.xml new/monodevelop-python-2.4/PyBinding/PyBinding.addin.xml --- old/monodevelop-python-2.2/PyBinding/PyBinding.addin.xml 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/PyBinding.addin.xml 2010-06-14 21:45:40.000000000 +0200 @@ -6,20 +6,16 @@ url = "http://www.monodevelop.com" description = "Python Language binding" category = "Language bindings" - version = "2.2"> + version = "2.4"> <Runtime> <Import assembly = "PyBinding.dll"/> </Runtime> <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"/> - <Addin id = "Components" version = "2.2"/> - <Addin id = "SourceEditor2" version = "2.2"/> + <Addin id = "Core" version = "2.4"/> + <Addin id = "Ide" version = "2.4"/> + <Addin id = "SourceEditor2" version = "2.4"/> </Dependencies> <Extension path = "/MonoDevelop/Core/StockIcons"> @@ -88,9 +84,9 @@ </Extension> <Extension path = "/MonoDevelop/Ide/TextEditorExtensions"> - <Class id = "PyBinding.Gui.PythonEditorCompletion" class = "PyBinding.Gui.PythonEditorCompletion" /> - <Class id = "PyBinding.Gui.PythonEditorIndentation" class = "PyBinding.Gui.PythonEditorIndentation" /> - <Class id = "PyBinding.Gui.PythonEditorOutline" class = "PyBinding.Gui.PythonEditorOutline" /> + <Class fileExtensions = ".py" id = "PyBinding.Gui.PythonEditorCompletion" class = "PyBinding.Gui.PythonEditorCompletion" /> + <Class fileExtensions = ".py" id = "PyBinding.Gui.PythonEditorIndentation" class = "PyBinding.Gui.PythonEditorIndentation" /> + <Class fileExtensions = ".py" id = "PyBinding.Gui.PythonEditorOutline" class = "PyBinding.Gui.PythonEditorOutline" /> </Extension> <Extension path = "/MonoDevelop/ProjectModel/DomParser"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/gtk-gui/PyBinding.Gui.PythonOptionsWidget.cs new/monodevelop-python-2.4/PyBinding/gtk-gui/PyBinding.Gui.PythonOptionsWidget.cs --- old/monodevelop-python-2.2/PyBinding/gtk-gui/PyBinding.Gui.PythonOptionsWidget.cs 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/gtk-gui/PyBinding.Gui.PythonOptionsWidget.cs 2010-06-14 21:45:40.000000000 +0200 @@ -1,241 +1,233 @@ -// ------------------------------------------------------------------------------ -// <autogenerated> -// This code was generated by a tool. -// -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// </autogenerated> -// ------------------------------------------------------------------------------ - -namespace PyBinding.Gui { - - - public partial class PythonOptionsWidget { - - private Gtk.VBox vbox1; - - private Gtk.Label label1; - - private Gtk.Alignment alignment1; - - private Gtk.Table table1; - - private Gtk.Label label4; - - private Gtk.Label label5; - - private Gtk.Entry m_ModuleEntry; - - private Gtk.CheckButton m_OptimizeCheckBox; - - private Gtk.Entry m_PythonOptions; - - private Gtk.ComboBox m_RuntimeCombo; - - private Gtk.Label label3; - - private Gtk.Alignment alignment2; - - private Gtk.HBox hbox1; - - private Gtk.ScrolledWindow scrolledwindow1; - - private Gtk.TreeView m_PathsTreeView; - - private Gtk.VBox vbox2; - - private Gtk.Button m_AddPathButton; - - private Gtk.Button m_RemovePathButton; - - protected virtual void Build() { - Stetic.Gui.Initialize(this); - // Widget PyBinding.Gui.PythonOptionsWidget - Stetic.BinContainer.Attach(this); - this.Name = "PyBinding.Gui.PythonOptionsWidget"; - // Container child PyBinding.Gui.PythonOptionsWidget.Gtk.Container+ContainerChild - this.vbox1 = new Gtk.VBox(); - this.vbox1.Name = "vbox1"; - this.vbox1.Spacing = 6; - // Container child vbox1.Gtk.Box+BoxChild - this.label1 = new Gtk.Label(); - this.label1.Name = "label1"; - this.label1.Xalign = 0F; - this.label1.LabelProp = Mono.Unix.Catalog.GetString("Runtime"); - this.label1.UseMarkup = true; - this.vbox1.Add(this.label1); - Gtk.Box.BoxChild w1 = ((Gtk.Box.BoxChild)(this.vbox1[this.label1])); - w1.Position = 0; - w1.Expand = false; - w1.Fill = false; - // Container child vbox1.Gtk.Box+BoxChild - this.alignment1 = new Gtk.Alignment(0.5F, 0.5F, 1F, 1F); - this.alignment1.Name = "alignment1"; - this.alignment1.LeftPadding = ((uint)(12)); - // Container child alignment1.Gtk.Container+ContainerChild - this.table1 = new Gtk.Table(((uint)(5)), ((uint)(2)), false); - this.table1.Name = "table1"; - this.table1.RowSpacing = ((uint)(6)); - this.table1.ColumnSpacing = ((uint)(6)); - // Container child table1.Gtk.Table+TableChild - this.label4 = new Gtk.Label(); - this.label4.Name = "label4"; - this.label4.LabelProp = Mono.Unix.Catalog.GetString("Python _Options:"); - this.label4.UseUnderline = true; - this.table1.Add(this.label4); - Gtk.Table.TableChild w2 = ((Gtk.Table.TableChild)(this.table1[this.label4])); - w2.TopAttach = ((uint)(1)); - w2.BottomAttach = ((uint)(2)); - w2.XOptions = ((Gtk.AttachOptions)(4)); - w2.YOptions = ((Gtk.AttachOptions)(4)); - // Container child table1.Gtk.Table+TableChild - this.label5 = new Gtk.Label(); - this.label5.Name = "label5"; - this.label5.LabelProp = Mono.Unix.Catalog.GetString("Default _Module:"); - this.label5.UseUnderline = true; - this.table1.Add(this.label5); - Gtk.Table.TableChild w3 = ((Gtk.Table.TableChild)(this.table1[this.label5])); - w3.TopAttach = ((uint)(2)); - w3.BottomAttach = ((uint)(3)); - w3.XOptions = ((Gtk.AttachOptions)(4)); - w3.YOptions = ((Gtk.AttachOptions)(4)); - // Container child table1.Gtk.Table+TableChild - this.m_ModuleEntry = new Gtk.Entry(); - this.m_ModuleEntry.CanFocus = true; - this.m_ModuleEntry.Name = "m_ModuleEntry"; - this.m_ModuleEntry.IsEditable = true; - this.m_ModuleEntry.InvisibleChar = '●'; - this.table1.Add(this.m_ModuleEntry); - Gtk.Table.TableChild w4 = ((Gtk.Table.TableChild)(this.table1[this.m_ModuleEntry])); - w4.TopAttach = ((uint)(2)); - w4.BottomAttach = ((uint)(3)); - w4.LeftAttach = ((uint)(1)); - w4.RightAttach = ((uint)(2)); - w4.YOptions = ((Gtk.AttachOptions)(4)); - // Container child table1.Gtk.Table+TableChild - this.m_OptimizeCheckBox = new Gtk.CheckButton(); - this.m_OptimizeCheckBox.CanFocus = true; - this.m_OptimizeCheckBox.Name = "m_OptimizeCheckBox"; - this.m_OptimizeCheckBox.Label = Mono.Unix.Catalog.GetString("Optimize byte-code output"); - this.m_OptimizeCheckBox.DrawIndicator = true; - this.m_OptimizeCheckBox.UseUnderline = true; - this.table1.Add(this.m_OptimizeCheckBox); - Gtk.Table.TableChild w5 = ((Gtk.Table.TableChild)(this.table1[this.m_OptimizeCheckBox])); - w5.TopAttach = ((uint)(3)); - w5.BottomAttach = ((uint)(4)); - w5.RightAttach = ((uint)(2)); - w5.YOptions = ((Gtk.AttachOptions)(4)); - // Container child table1.Gtk.Table+TableChild - this.m_PythonOptions = new Gtk.Entry(); - this.m_PythonOptions.CanFocus = true; - this.m_PythonOptions.Name = "m_PythonOptions"; - this.m_PythonOptions.IsEditable = true; - this.m_PythonOptions.InvisibleChar = '●'; - this.table1.Add(this.m_PythonOptions); - Gtk.Table.TableChild w6 = ((Gtk.Table.TableChild)(this.table1[this.m_PythonOptions])); - w6.TopAttach = ((uint)(1)); - w6.BottomAttach = ((uint)(2)); - w6.LeftAttach = ((uint)(1)); - w6.RightAttach = ((uint)(2)); - w6.XOptions = ((Gtk.AttachOptions)(4)); - w6.YOptions = ((Gtk.AttachOptions)(4)); - // Container child table1.Gtk.Table+TableChild - this.m_RuntimeCombo = Gtk.ComboBox.NewText(); - this.m_RuntimeCombo.Name = "m_RuntimeCombo"; - this.table1.Add(this.m_RuntimeCombo); - Gtk.Table.TableChild w7 = ((Gtk.Table.TableChild)(this.table1[this.m_RuntimeCombo])); - w7.RightAttach = ((uint)(2)); - w7.XOptions = ((Gtk.AttachOptions)(4)); - w7.YOptions = ((Gtk.AttachOptions)(4)); - this.alignment1.Add(this.table1); - this.vbox1.Add(this.alignment1); - Gtk.Box.BoxChild w9 = ((Gtk.Box.BoxChild)(this.vbox1[this.alignment1])); - w9.Position = 1; - w9.Expand = false; - // Container child vbox1.Gtk.Box+BoxChild - this.label3 = new Gtk.Label(); - this.label3.Name = "label3"; - this.label3.Xalign = 0F; - this.label3.LabelProp = Mono.Unix.Catalog.GetString("Module Paths"); - this.label3.UseMarkup = true; - this.vbox1.Add(this.label3); - Gtk.Box.BoxChild w10 = ((Gtk.Box.BoxChild)(this.vbox1[this.label3])); - w10.Position = 2; - w10.Expand = false; - w10.Fill = false; - // Container child vbox1.Gtk.Box+BoxChild - this.alignment2 = new Gtk.Alignment(0.5F, 0.5F, 1F, 1F); - this.alignment2.Name = "alignment2"; - this.alignment2.LeftPadding = ((uint)(12)); - // Container child alignment2.Gtk.Container+ContainerChild - this.hbox1 = new Gtk.HBox(); - this.hbox1.Name = "hbox1"; - this.hbox1.Spacing = 6; - // Container child hbox1.Gtk.Box+BoxChild - this.scrolledwindow1 = new Gtk.ScrolledWindow(); - this.scrolledwindow1.CanFocus = true; - this.scrolledwindow1.Name = "scrolledwindow1"; - this.scrolledwindow1.ShadowType = ((Gtk.ShadowType)(1)); - // Container child scrolledwindow1.Gtk.Container+ContainerChild - Gtk.Viewport w11 = new Gtk.Viewport(); - w11.ShadowType = ((Gtk.ShadowType)(0)); - // Container child GtkViewport.Gtk.Container+ContainerChild - this.m_PathsTreeView = new Gtk.TreeView(); - this.m_PathsTreeView.CanFocus = true; - this.m_PathsTreeView.Name = "m_PathsTreeView"; - w11.Add(this.m_PathsTreeView); - this.scrolledwindow1.Add(w11); - this.hbox1.Add(this.scrolledwindow1); - Gtk.Box.BoxChild w14 = ((Gtk.Box.BoxChild)(this.hbox1[this.scrolledwindow1])); - w14.Position = 0; - // Container child hbox1.Gtk.Box+BoxChild - this.vbox2 = new Gtk.VBox(); - this.vbox2.Name = "vbox2"; - this.vbox2.Spacing = 6; - // Container child vbox2.Gtk.Box+BoxChild - this.m_AddPathButton = new Gtk.Button(); - this.m_AddPathButton.CanFocus = true; - this.m_AddPathButton.Name = "m_AddPathButton"; - this.m_AddPathButton.UseStock = true; - this.m_AddPathButton.UseUnderline = true; - this.m_AddPathButton.Label = "gtk-add"; - this.vbox2.Add(this.m_AddPathButton); - Gtk.Box.BoxChild w15 = ((Gtk.Box.BoxChild)(this.vbox2[this.m_AddPathButton])); - w15.Position = 0; - w15.Expand = false; - w15.Fill = false; - // Container child vbox2.Gtk.Box+BoxChild - this.m_RemovePathButton = new Gtk.Button(); - this.m_RemovePathButton.Sensitive = false; - this.m_RemovePathButton.CanFocus = true; - this.m_RemovePathButton.Name = "m_RemovePathButton"; - this.m_RemovePathButton.UseStock = true; - this.m_RemovePathButton.UseUnderline = true; - this.m_RemovePathButton.Label = "gtk-remove"; - this.vbox2.Add(this.m_RemovePathButton); - Gtk.Box.BoxChild w16 = ((Gtk.Box.BoxChild)(this.vbox2[this.m_RemovePathButton])); - w16.Position = 1; - w16.Expand = false; - w16.Fill = false; - this.hbox1.Add(this.vbox2); - Gtk.Box.BoxChild w17 = ((Gtk.Box.BoxChild)(this.hbox1[this.vbox2])); - w17.Position = 1; - w17.Expand = false; - w17.Fill = false; - this.alignment2.Add(this.hbox1); - this.vbox1.Add(this.alignment2); - Gtk.Box.BoxChild w19 = ((Gtk.Box.BoxChild)(this.vbox1[this.alignment2])); - w19.Position = 3; - this.Add(this.vbox1); - if ((this.Child != null)) { - this.Child.ShowAll(); - } - this.label4.MnemonicWidget = this.m_PythonOptions; - this.label5.MnemonicWidget = this.m_ModuleEntry; - this.Show(); - this.m_AddPathButton.Clicked += new System.EventHandler(this.AddPath_Clicked); - this.m_RemovePathButton.Clicked += new System.EventHandler(this.RemovePath_Clicked); - } - } + +// This file has been generated by the GUI designer. Do not modify. +namespace PyBinding.Gui +{ + public partial class PythonOptionsWidget + { + private global::Gtk.VBox vbox1; + + private global::Gtk.Label label1; + + private global::Gtk.Alignment alignment1; + + private global::Gtk.Table table1; + + private global::Gtk.Label label4; + + private global::Gtk.Label label5; + + private global::Gtk.Entry m_ModuleEntry; + + private global::Gtk.CheckButton m_OptimizeCheckBox; + + private global::Gtk.Entry m_PythonOptions; + + private global::Gtk.ComboBox m_RuntimeCombo; + + private global::Gtk.Label label3; + + private global::Gtk.Alignment alignment2; + + private global::Gtk.HBox hbox1; + + private global::Gtk.ScrolledWindow scrolledwindow1; + + private global::Gtk.TreeView m_PathsTreeView; + + private global::Gtk.VBox vbox2; + + private global::Gtk.Button m_AddPathButton; + + private global::Gtk.Button m_RemovePathButton; + + protected virtual void Build () + { + global::Stetic.Gui.Initialize (this); + // Widget PyBinding.Gui.PythonOptionsWidget + global::Stetic.BinContainer.Attach (this); + this.Name = "PyBinding.Gui.PythonOptionsWidget"; + // Container child PyBinding.Gui.PythonOptionsWidget.Gtk.Container+ContainerChild + this.vbox1 = new global::Gtk.VBox (); + this.vbox1.Name = "vbox1"; + this.vbox1.Spacing = 6; + // Container child vbox1.Gtk.Box+BoxChild + this.label1 = new global::Gtk.Label (); + this.label1.Name = "label1"; + this.label1.Xalign = 0f; + this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("Runtime"); + this.label1.UseMarkup = true; + this.vbox1.Add (this.label1); + global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.label1])); + w1.Position = 0; + w1.Expand = false; + w1.Fill = false; + // Container child vbox1.Gtk.Box+BoxChild + this.alignment1 = new global::Gtk.Alignment (0.5f, 0.5f, 1f, 1f); + this.alignment1.Name = "alignment1"; + this.alignment1.LeftPadding = ((uint)(12)); + // Container child alignment1.Gtk.Container+ContainerChild + this.table1 = new global::Gtk.Table (((uint)(5)), ((uint)(2)), false); + this.table1.Name = "table1"; + this.table1.RowSpacing = ((uint)(6)); + this.table1.ColumnSpacing = ((uint)(6)); + // Container child table1.Gtk.Table+TableChild + this.label4 = new global::Gtk.Label (); + this.label4.Name = "label4"; + this.label4.LabelProp = global::Mono.Unix.Catalog.GetString ("Python _Options:"); + this.label4.UseUnderline = true; + this.table1.Add (this.label4); + global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.table1[this.label4])); + w2.TopAttach = ((uint)(1)); + w2.BottomAttach = ((uint)(2)); + w2.XOptions = ((global::Gtk.AttachOptions)(4)); + w2.YOptions = ((global::Gtk.AttachOptions)(4)); + // Container child table1.Gtk.Table+TableChild + this.label5 = new global::Gtk.Label (); + this.label5.Name = "label5"; + this.label5.LabelProp = global::Mono.Unix.Catalog.GetString ("Default _Module:"); + this.label5.UseUnderline = true; + this.table1.Add (this.label5); + global::Gtk.Table.TableChild w3 = ((global::Gtk.Table.TableChild)(this.table1[this.label5])); + w3.TopAttach = ((uint)(2)); + w3.BottomAttach = ((uint)(3)); + w3.XOptions = ((global::Gtk.AttachOptions)(4)); + w3.YOptions = ((global::Gtk.AttachOptions)(4)); + // Container child table1.Gtk.Table+TableChild + this.m_ModuleEntry = new global::Gtk.Entry (); + this.m_ModuleEntry.CanFocus = true; + this.m_ModuleEntry.Name = "m_ModuleEntry"; + this.m_ModuleEntry.IsEditable = true; + this.m_ModuleEntry.InvisibleChar = '●'; + this.table1.Add (this.m_ModuleEntry); + global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.table1[this.m_ModuleEntry])); + w4.TopAttach = ((uint)(2)); + w4.BottomAttach = ((uint)(3)); + w4.LeftAttach = ((uint)(1)); + w4.RightAttach = ((uint)(2)); + w4.YOptions = ((global::Gtk.AttachOptions)(4)); + // Container child table1.Gtk.Table+TableChild + this.m_OptimizeCheckBox = new global::Gtk.CheckButton (); + this.m_OptimizeCheckBox.CanFocus = true; + this.m_OptimizeCheckBox.Name = "m_OptimizeCheckBox"; + this.m_OptimizeCheckBox.Label = global::Mono.Unix.Catalog.GetString ("Optimize byte-code output"); + this.m_OptimizeCheckBox.DrawIndicator = true; + this.m_OptimizeCheckBox.UseUnderline = true; + this.table1.Add (this.m_OptimizeCheckBox); + global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.table1[this.m_OptimizeCheckBox])); + w5.TopAttach = ((uint)(3)); + w5.BottomAttach = ((uint)(4)); + w5.RightAttach = ((uint)(2)); + w5.YOptions = ((global::Gtk.AttachOptions)(4)); + // Container child table1.Gtk.Table+TableChild + this.m_PythonOptions = new global::Gtk.Entry (); + this.m_PythonOptions.CanFocus = true; + this.m_PythonOptions.Name = "m_PythonOptions"; + this.m_PythonOptions.IsEditable = true; + this.m_PythonOptions.InvisibleChar = '●'; + this.table1.Add (this.m_PythonOptions); + global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.table1[this.m_PythonOptions])); + w6.TopAttach = ((uint)(1)); + w6.BottomAttach = ((uint)(2)); + w6.LeftAttach = ((uint)(1)); + w6.RightAttach = ((uint)(2)); + w6.XOptions = ((global::Gtk.AttachOptions)(4)); + w6.YOptions = ((global::Gtk.AttachOptions)(4)); + // Container child table1.Gtk.Table+TableChild + this.m_RuntimeCombo = global::Gtk.ComboBox.NewText (); + this.m_RuntimeCombo.Name = "m_RuntimeCombo"; + this.table1.Add (this.m_RuntimeCombo); + global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.table1[this.m_RuntimeCombo])); + w7.RightAttach = ((uint)(2)); + w7.XOptions = ((global::Gtk.AttachOptions)(4)); + w7.YOptions = ((global::Gtk.AttachOptions)(4)); + this.alignment1.Add (this.table1); + this.vbox1.Add (this.alignment1); + global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.alignment1])); + w9.Position = 1; + w9.Expand = false; + // Container child vbox1.Gtk.Box+BoxChild + this.label3 = new global::Gtk.Label (); + this.label3.Name = "label3"; + this.label3.Xalign = 0f; + this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("Module Paths"); + this.label3.UseMarkup = true; + this.vbox1.Add (this.label3); + global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.label3])); + w10.Position = 2; + w10.Expand = false; + w10.Fill = false; + // Container child vbox1.Gtk.Box+BoxChild + this.alignment2 = new global::Gtk.Alignment (0.5f, 0.5f, 1f, 1f); + this.alignment2.Name = "alignment2"; + this.alignment2.LeftPadding = ((uint)(12)); + // Container child alignment2.Gtk.Container+ContainerChild + this.hbox1 = new global::Gtk.HBox (); + this.hbox1.Name = "hbox1"; + this.hbox1.Spacing = 6; + // Container child hbox1.Gtk.Box+BoxChild + this.scrolledwindow1 = new global::Gtk.ScrolledWindow (); + this.scrolledwindow1.CanFocus = true; + this.scrolledwindow1.Name = "scrolledwindow1"; + this.scrolledwindow1.ShadowType = ((global::Gtk.ShadowType)(1)); + // Container child scrolledwindow1.Gtk.Container+ContainerChild + global::Gtk.Viewport w11 = new global::Gtk.Viewport (); + w11.ShadowType = ((global::Gtk.ShadowType)(0)); + // Container child GtkViewport.Gtk.Container+ContainerChild + this.m_PathsTreeView = new global::Gtk.TreeView (); + this.m_PathsTreeView.CanFocus = true; + this.m_PathsTreeView.Name = "m_PathsTreeView"; + w11.Add (this.m_PathsTreeView); + this.scrolledwindow1.Add (w11); + this.hbox1.Add (this.scrolledwindow1); + global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.scrolledwindow1])); + w14.Position = 0; + // Container child hbox1.Gtk.Box+BoxChild + this.vbox2 = new global::Gtk.VBox (); + this.vbox2.Name = "vbox2"; + this.vbox2.Spacing = 6; + // Container child vbox2.Gtk.Box+BoxChild + this.m_AddPathButton = new global::Gtk.Button (); + this.m_AddPathButton.CanFocus = true; + this.m_AddPathButton.Name = "m_AddPathButton"; + this.m_AddPathButton.UseStock = true; + this.m_AddPathButton.UseUnderline = true; + this.m_AddPathButton.Label = "gtk-add"; + this.vbox2.Add (this.m_AddPathButton); + global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.m_AddPathButton])); + w15.Position = 0; + w15.Expand = false; + w15.Fill = false; + // Container child vbox2.Gtk.Box+BoxChild + this.m_RemovePathButton = new global::Gtk.Button (); + this.m_RemovePathButton.Sensitive = false; + this.m_RemovePathButton.CanFocus = true; + this.m_RemovePathButton.Name = "m_RemovePathButton"; + this.m_RemovePathButton.UseStock = true; + this.m_RemovePathButton.UseUnderline = true; + this.m_RemovePathButton.Label = "gtk-remove"; + this.vbox2.Add (this.m_RemovePathButton); + global::Gtk.Box.BoxChild w16 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.m_RemovePathButton])); + w16.Position = 1; + w16.Expand = false; + w16.Fill = false; + this.hbox1.Add (this.vbox2); + global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.vbox2])); + w17.Position = 1; + w17.Expand = false; + w17.Fill = false; + this.alignment2.Add (this.hbox1); + this.vbox1.Add (this.alignment2); + global::Gtk.Box.BoxChild w19 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.alignment2])); + w19.Position = 3; + this.Add (this.vbox1); + if ((this.Child != null)) { + this.Child.ShowAll (); + } + this.label4.MnemonicWidget = this.m_PythonOptions; + this.label5.MnemonicWidget = this.m_ModuleEntry; + this.Show (); + this.m_AddPathButton.Clicked += new global::System.EventHandler (this.AddPath_Clicked); + this.m_RemovePathButton.Clicked += new global::System.EventHandler (this.RemovePath_Clicked); + } + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/gtk-gui/generated.cs new/monodevelop-python-2.4/PyBinding/gtk-gui/generated.cs --- old/monodevelop-python-2.2/PyBinding/gtk-gui/generated.cs 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/gtk-gui/generated.cs 2010-06-14 21:45:40.000000000 +0200 @@ -1,82 +1,82 @@ -// ------------------------------------------------------------------------------ -// <autogenerated> -// This code was generated by a tool. -// -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// </autogenerated> -// ------------------------------------------------------------------------------ - -namespace Stetic { - - - internal class Gui { - - private static bool initialized; - - internal static void Initialize(Gtk.Widget iconRenderer) { - if ((Stetic.Gui.initialized == false)) { - Stetic.Gui.initialized = true; - } - } - } - - internal class BinContainer { - - private Gtk.Widget child; - - private Gtk.UIManager uimanager; - - public static BinContainer Attach(Gtk.Bin bin) { - BinContainer bc = new BinContainer(); - bin.SizeRequested += new Gtk.SizeRequestedHandler(bc.OnSizeRequested); - bin.SizeAllocated += new Gtk.SizeAllocatedHandler(bc.OnSizeAllocated); - bin.Added += new Gtk.AddedHandler(bc.OnAdded); - return bc; - } - - private void OnSizeRequested(object sender, Gtk.SizeRequestedArgs args) { - if ((this.child != null)) { - args.Requisition = this.child.SizeRequest(); - } - } - - private void OnSizeAllocated(object sender, Gtk.SizeAllocatedArgs args) { - if ((this.child != null)) { - this.child.Allocation = args.Allocation; - } - } - - private void OnAdded(object sender, Gtk.AddedArgs args) { - this.child = args.Widget; - } - - public void SetUiManager(Gtk.UIManager uim) { - this.uimanager = uim; - this.child.Realized += new System.EventHandler(this.OnRealized); - } - - private void OnRealized(object sender, System.EventArgs args) { - if ((this.uimanager != null)) { - Gtk.Widget w; - w = this.child.Toplevel; - if (((w != null) && typeof(Gtk.Window).IsInstanceOfType(w))) { - ((Gtk.Window)(w)).AddAccelGroup(this.uimanager.AccelGroup); - this.uimanager = null; - } - } - } - } - - internal class ActionGroups { - - public static Gtk.ActionGroup GetActionGroup(System.Type type) { - return Stetic.ActionGroups.GetActionGroup(type.FullName); - } - - public static Gtk.ActionGroup GetActionGroup(string name) { - return null; - } - } + +// This file has been generated by the GUI designer. Do not modify. +namespace Stetic +{ + internal class Gui + { + private static bool initialized; + + static internal void Initialize (Gtk.Widget iconRenderer) + { + if ((Stetic.Gui.initialized == false)) { + Stetic.Gui.initialized = true; + } + } + } + + internal class BinContainer + { + private Gtk.Widget child; + + private Gtk.UIManager uimanager; + + public static BinContainer Attach (Gtk.Bin bin) + { + BinContainer bc = new BinContainer (); + bin.SizeRequested += new Gtk.SizeRequestedHandler (bc.OnSizeRequested); + bin.SizeAllocated += new Gtk.SizeAllocatedHandler (bc.OnSizeAllocated); + bin.Added += new Gtk.AddedHandler (bc.OnAdded); + return bc; + } + + private void OnSizeRequested (object sender, Gtk.SizeRequestedArgs args) + { + if ((this.child != null)) { + args.Requisition = this.child.SizeRequest (); + } + } + + private void OnSizeAllocated (object sender, Gtk.SizeAllocatedArgs args) + { + if ((this.child != null)) { + this.child.Allocation = args.Allocation; + } + } + + private void OnAdded (object sender, Gtk.AddedArgs args) + { + this.child = args.Widget; + } + + public void SetUiManager (Gtk.UIManager uim) + { + this.uimanager = uim; + this.child.Realized += new System.EventHandler (this.OnRealized); + } + + private void OnRealized (object sender, System.EventArgs args) + { + if ((this.uimanager != null)) { + Gtk.Widget w; + w = this.child.Toplevel; + if (((w != null) && typeof(Gtk.Window).IsInstanceOfType (w))) { + ((Gtk.Window)(w)).AddAccelGroup (this.uimanager.AccelGroup); + this.uimanager = null; + } + } + } + } + + internal class ActionGroups + { + public static Gtk.ActionGroup GetActionGroup (System.Type type) + { + return Stetic.ActionGroups.GetActionGroup (type.FullName); + } + + public static Gtk.ActionGroup GetActionGroup (string name) + { + return null; + } + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/PyBinding/gtk-gui/gui.stetic new/monodevelop-python-2.4/PyBinding/gtk-gui/gui.stetic --- old/monodevelop-python-2.2/PyBinding/gtk-gui/gui.stetic 2009-11-05 19:12:01.000000000 +0100 +++ new/monodevelop-python-2.4/PyBinding/gtk-gui/gui.stetic 2010-06-14 21:45:40.000000000 +0200 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <stetic-interface> <configuration> <images-root-path>..</images-root-path> @@ -6,26 +6,28 @@ </configuration> <import> <widget-library name="Mono.TextEditor, Version=1.0.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.Gettext, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.Ide, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.Projects.Gui, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.Components, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.GtkCore, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.DesignerSupport, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.Core.Gui, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.VersionControl, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.NUnit, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.XmlEditor, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.AspNet, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.Deployment, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.Deployment.Linux, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.VBNetBinding, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.CBinding, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.CSharpBinding, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.Autotools, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.SourceEditor2, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.Debugger, Version=2.1.0.0, Culture=neutral" /> - <widget-library name="MonoDevelop.Refactoring, Version=2.1.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Gettext, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Ide, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Projects.Gui, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Components, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.GtkCore, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Core.Gui, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Autotools, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.SourceEditor2, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Debugger, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Refactoring, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.VersionControl, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.NUnit, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.XmlEditor, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.AspNet, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Deployment, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Deployment.Linux, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.DesignerSupport, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.VBNetBinding, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.CBinding, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.CSharpBinding, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Moonlight, Version=2.2.0.0, Culture=neutral" /> + <widget-library name="MonoDevelop.Debugger.Soft, Version=2.2.0.0, Culture=neutral" /> <widget-library name="../../build/PyBinding.dll" internal="true" /> </import> <widget class="Gtk.Bin" id="PyBinding.Gui.PythonOptionsWidget" design-size="491 382"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/monodevelop-python-2.2/configure new/monodevelop-python-2.4/configure --- old/monodevelop-python-2.2/configure 2009-12-11 21:51:50.000000000 +0100 +++ new/monodevelop-python-2.4/configure 2010-06-14 21:45:40.000000000 +0200 @@ -1,10 +1,10 @@ #!/bin/bash -VERSION=2.2 +VERSION=2.4 PACKAGE=monodevelop-python prefix=/usr/local config=DEBUG configurations=" RELEASE DEBUG" -common_packages=" gtk-sharp-2.0;2.12.8 mono-addins;0.3 monodevelop;2.2 monodevelop-core-addins;2.2" +common_packages=" gtk-sharp-2.0;2.12.8 mono-addins;0.3 monodevelop;2.4 monodevelop-core-addins;2.4" usage () ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit monodevelop-vala for openSUSE:Factory
by root＠hilbert.suse.de 05 Nov '10

05 Nov '10

Hello community, here is the log from the commit of package monodevelop-vala for openSUSE:Factory checked in at Fri Nov 5 16:23:08 CET 2010. -------- --- monodevelop-vala/monodevelop-vala.changes 2010-03-16 18:25:20.000000000 +0100 +++ monodevelop-vala/monodevelop-vala.changes 2010-10-29 19:13:50.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Oct 29 17:10:43 UTC 2010 - ajorgensen(a)novell.com + +- Update to 2.4 + * http://monodevelop.com/Download/MonoDevelop_2.4_Released + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- monodevelop-vala-2.2.tar.bz2 New: ---- monodevelop-vala-2.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ monodevelop-vala.spec ++++++ --- /var/tmp/diff_new_pack.9vQ0PS/_old 2010-11-05 16:22:53.000000000 +0100 +++ /var/tmp/diff_new_pack.9vQ0PS/_new 2010-11-05 16:22:53.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package monodevelop-vala (Version 2.2) +# spec file for package monodevelop-vala (Version 2.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,8 +18,8 @@ Name: monodevelop-vala -Version: 2.2 -Release: 2 +Version: 2.4 +Release: 1 License: MIT/X11 AutoReqProv: on BuildArch: noarch ++++++ monodevelop-vala-2.2.tar.bz2 -> monodevelop-vala-2.4.tar.bz2 ++++++ ++++ 8982 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit netcfg for openSUSE:Factory
by root＠hilbert.suse.de 05 Nov '10

05 Nov '10

Hello community, here is the log from the commit of package netcfg for openSUSE:Factory checked in at Fri Nov 5 16:22:38 CET 2010. -------- --- netcfg/netcfg.changes 2010-10-21 17:36:56.000000000 +0200 +++ netcfg/netcfg.changes 2010-11-04 10:07:13.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 4 09:43:09 CET 2010 - pgajdos(a)suse.cz + +- reverted rquotad port assigment [bnc#637382] + * modified services-suse.diff back to previous state + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netcfg.spec ++++++ --- /var/tmp/diff_new_pack.VF238F/_old 2010-11-05 16:22:11.000000000 +0100 +++ /var/tmp/diff_new_pack.VF238F/_new 2010-11-05 16:22:11.000000000 +0100 @@ -25,7 +25,7 @@ PreReq: coreutils aaa_base Summary: Network Configuration Files in /etc Version: 11.4 -Release: 1 +Release: 2 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: defaultdomain ++++++ services-suse.diff ++++++ --- /var/tmp/diff_new_pack.VF238F/_old 2010-11-05 16:22:12.000000000 +0100 +++ /var/tmp/diff_new_pack.VF238F/_new 2010-11-05 16:22:12.000000000 +0100 @@ -65,17 +65,6 @@ nfs 2049/tcp # Network File System - Sun Microsystems nfs 2049/udp # Network File System - Sun Microsystems # Brent Callaghan <brent&terra.eng.sun.com> -@@ -10610,8 +10624,8 @@ - # Jim Philippou <jphilippou&newoak.com> - pxc-spvr-ft 4002/tcp # pxc-spvr-ft - pxc-spvr-ft 4002/udp # pxc-spvr-ft --pxc-splr-ft 4003/tcp # pxc-splr-ft --pxc-splr-ft 4003/udp # pxc-splr-ft -+rquotad 4003/tcp # rquotad -+rquotad 4003/udp # rquotad - pxc-roid 4004/tcp # pxc-roid - pxc-roid 4004/udp # pxc-roid - pxc-pin 4005/tcp # pxc-pin @@ -12184,6 +12198,7 @@ netops-broker 5465/udp # NETOPS-BROKER # John R. Deuel <kink&netops.com> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit oxygen-molecule for openSUSE:Factory
by root＠hilbert.suse.de 05 Nov '10

05 Nov '10

Hello community, here is the log from the commit of package oxygen-molecule for openSUSE:Factory checked in at Fri Nov 5 16:21:57 CET 2010. -------- --- KDE/oxygen-molecule/oxygen-molecule.changes 2010-07-13 20:03:45.000000000 +0200 +++ oxygen-molecule/oxygen-molecule.changes 2010-10-22 13:53:05.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Oct 22 13:15:27 UTC 2010 - abrouwers(a)gmail.com + +- Give "/usr/share/kde4/apps/color-schemes/Oxygen-Molecule_3.0.colors" + 644 permissions, so people can use it + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oxygen-molecule.spec ++++++ --- /var/tmp/diff_new_pack.E8LZI6/_old 2010-11-05 16:21:34.000000000 +0100 +++ /var/tmp/diff_new_pack.E8LZI6/_new 2010-11-05 16:21:34.000000000 +0100 @@ -20,7 +20,7 @@ Name: oxygen-molecule Version: 3.2 -Release: 2 +Release: 5 Url: http://www.kde-look.org/content/show.php?content=103741 License: GPLv2+ Group: System/GUI/KDE @@ -45,8 +45,8 @@ %install mkdir -p %{buildroot}%{_datadir}/themes mkdir -p %{buildroot}%{_datadir}/kde4/apps/color-schemes -mv kde*-oxygen-molecule %{buildroot}%{_datadir}/themes/Oxygen-Molecule -mv *.colors %{buildroot}%{_datadir}/kde4/apps/color-schemes +cp -a kde*-oxygen-molecule %{buildroot}%{_datadir}/themes/Oxygen-Molecule +install -m644 *.colors %{buildroot}%{_datadir}/kde4/apps/color-schemes %clean rm -rf %{buildroot} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit plasma-addons for openSUSE:Factory
by root＠hilbert.suse.de 05 Nov '10

05 Nov '10

Hello community, here is the log from the commit of package plasma-addons for openSUSE:Factory checked in at Fri Nov 5 16:21:20 CET 2010. -------- --- plasma-addons/plasma-addons.changes 2010-10-01 00:06:31.000000000 +0200 +++ plasma-addons/plasma-addons.changes 2010-10-28 22:13:39.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Oct 28 22:13:36 CEST 2010 - dmueller(a)suse.de + +- update to 4.5.3 + * see http://kde.org/announcements/changelogs/changelog4_5_2to4_5_3.php for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdeplasma-addons-4.5.2.tar.bz2 New: ---- kdeplasma-addons-4.5.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma-addons.spec ++++++ --- /var/tmp/diff_new_pack.lTKsP4/_old 2010-11-05 16:21:00.000000000 +0100 +++ /var/tmp/diff_new_pack.lTKsP4/_new 2010-11-05 16:21:00.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package plasma-addons (Version 4.5.2) +# spec file for package plasma-addons (Version 4.5.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -30,7 +30,7 @@ Group: System/GUI/KDE Summary: Additional Plasmoids for KDE Desktop Url: http://www.kde.org/ -Version: 4.5.2 +Version: 4.5.3 Release: 1 Source0: kdeplasma-addons-%{version}.tar.bz2 Patch0: 4_5_BRANCH.diff ++++++ kdeplasma-addons-4.5.2.tar.bz2 -> kdeplasma-addons-4.5.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.5.2/applets/frame/frame.cpp new/kdeplasma-addons-4.5.3/applets/frame/frame.cpp --- old/kdeplasma-addons-4.5.2/applets/frame/frame.cpp 2010-05-05 16:51:19.000000000 +0200 +++ new/kdeplasma-addons-4.5.3/applets/frame/frame.cpp 2010-10-28 19:35:53.000000000 +0200 @@ -626,6 +626,10 @@ void Frame::dropEvent(QGraphicsSceneDragDropEvent *event) { + if (m_slideFrame) { + m_slideFrame->hide(); + } + KUrl droppedUrl = (KUrl::List::fromMimeData(event->mimeData())).at(0); kDebug() << "dropped URL" << droppedUrl.url(); if (droppedUrl.protocol() == "desktop") { @@ -657,8 +661,8 @@ void Frame::hoverEnterEvent(QGraphicsSceneHoverEvent *event) { - if (m_slideShow) { - checkSlideFrame(); + checkSlideFrame(); + if (m_slideShow) { m_slideFrame->show(); } Applet::hoverEnterEvent(event); @@ -676,6 +680,7 @@ void Frame::checkSlideFrame() { if (m_slideFrame) { + m_slideFrame->hide(); return; } m_slideFrame = new Plasma::Frame( this ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.5.2/applets/plasmaboard/widget.cpp new/kdeplasma-addons-4.5.3/applets/plasmaboard/widget.cpp --- old/kdeplasma-addons-4.5.2/applets/plasmaboard/widget.cpp 2010-05-27 19:24:00.000000000 +0200 +++ new/kdeplasma-addons-4.5.3/applets/plasmaboard/widget.cpp 2010-10-28 19:35:53.000000000 +0200 @@ -647,6 +647,7 @@ m_tooltip -> move( popupPosition( key->size()*2 ) + key->position() - QPoint(key->size().width()/2, 0) ); m_tooltip -> resize( key->size()*2 ); m_tooltip -> show(); + m_tooltip -> raise(); // fix problem of tooltip being displayed behind keyboard. Happend after moving the panel around in KDE 4.5 with activated desktop effects } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.5.2/applets/rssnow/scroller.cpp new/kdeplasma-addons-4.5.3/applets/rssnow/scroller.cpp --- old/kdeplasma-addons-4.5.2/applets/rssnow/scroller.cpp 2010-05-27 19:24:01.000000000 +0200 +++ new/kdeplasma-addons-4.5.3/applets/rssnow/scroller.cpp 2010-10-28 19:35:53.000000000 +0200 @@ -25,7 +25,7 @@ #include <kdebug.h> #include <kicon.h> -#include <krun.h> +#include <ktoolinvocation.h> #include <QGraphicsItem> #include <QDateTime> #include <QTimer> @@ -379,7 +379,7 @@ url = m_list.at(m_current).url; } - KRun::runUrl(KUrl(url), "text/html", 0); + KToolInvocation::invokeBrowser(url); } void Scroller::hoverEnterEvent(QGraphicsSceneHoverEvent *event) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.5.2/dataengines/comic/comicprovider.cpp new/kdeplasma-addons-4.5.3/dataengines/comic/comicprovider.cpp --- old/kdeplasma-addons-4.5.2/dataengines/comic/comicprovider.cpp 2010-06-16 14:03:15.000000000 +0200 +++ new/kdeplasma-addons-4.5.3/dataengines/comic/comicprovider.cpp 2010-10-28 19:35:53.000000000 +0200 @@ -210,7 +210,7 @@ void ComicProvider::requestPage( const KUrl &url, int id, const MetaInfos &infos ) { - KIO::StoredTransferJob *job = KIO::storedGet( url, KIO::NoReload, KIO::HideProgressInfo ); + KIO::StoredTransferJob *job = KIO::storedGet( url, KIO::Reload, KIO::HideProgressInfo ); job->setProperty( "uid", id ); connect( job, SIGNAL( result( KJob* ) ), this, SLOT( jobDone( KJob* ) ) ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.5.2/dataengines/potd/apodprovider.desktop new/kdeplasma-addons-4.5.3/dataengines/potd/apodprovider.desktop --- old/kdeplasma-addons-4.5.2/dataengines/potd/apodprovider.desktop 2010-07-28 23:05:00.000000000 +0200 +++ new/kdeplasma-addons-4.5.3/dataengines/potd/apodprovider.desktop 2010-10-28 19:35:53.000000000 +0200 @@ -23,7 +23,7 @@ Name[hr]=Slika dana na Astronomy Name[it]=Astronomy Picture of the Day Name[ja]=今日の天体写真 -Name[kk]=Күнделікті астрономиялық суреті (Apod) +Name[kk]=Астрономиялық "Тәулік суреті" (Apod) Name[km]=រូបភាពប្រចាំថ្ងៃ Astronomy Name[lv]=Astronomijas dienas attēls Name[nb]=Dagens astronomibilde diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.5.2/dataengines/potd/epodprovider.desktop new/kdeplasma-addons-4.5.3/dataengines/potd/epodprovider.desktop --- old/kdeplasma-addons-4.5.2/dataengines/potd/epodprovider.desktop 2010-07-28 23:05:00.000000000 +0200 +++ new/kdeplasma-addons-4.5.3/dataengines/potd/epodprovider.desktop 2010-10-28 19:35:53.000000000 +0200 @@ -22,7 +22,7 @@ Name[hr]=Slika dana na Earth Science Name[it]=Earth Science Picture of the Day Name[ja]=今日の地学写真 -Name[kk]=Күнделікті Жер ғылым суреті (Epod) +Name[kk]=Жер ғылым "Тәулік суреті" (Epod) Name[km]=រូបភាពប្រចាំថ្ងៃ Earth Science Name[lv]=Zemes zinātņu dienas attēls Name[nb]=Dagens geovitenskapelige bilde diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.5.2/dataengines/potd/flickrprovider.desktop new/kdeplasma-addons-4.5.3/dataengines/potd/flickrprovider.desktop --- old/kdeplasma-addons-4.5.2/dataengines/potd/flickrprovider.desktop 2010-07-28 23:05:00.000000000 +0200 +++ new/kdeplasma-addons-4.5.3/dataengines/potd/flickrprovider.desktop 2010-10-28 19:35:53.000000000 +0200 @@ -23,7 +23,7 @@ Name[hr]=Slika dana na Flickru Name[it]=Immagine del giorno di Flickr Name[ja]=Flickr 今日の写真 -Name[kk]=Flickr күнделікті сурет (Apod) +Name[kk]=Flickr "Тәулік суреті" (Apod) Name[km]=រូបភាពប្រចាំថ្ងៃ Flickr Name[lv]=Flickr dienas attēls Name[nb]=Dagens Flickr-bilde diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.5.2/dataengines/potd/oseiprovider.desktop new/kdeplasma-addons-4.5.3/dataengines/potd/oseiprovider.desktop --- old/kdeplasma-addons-4.5.2/dataengines/potd/oseiprovider.desktop 2010-07-28 23:05:00.000000000 +0200 +++ new/kdeplasma-addons-4.5.3/dataengines/potd/oseiprovider.desktop 2010-10-28 19:35:53.000000000 +0200 @@ -20,7 +20,7 @@ Name[gl]=Imaxe do día de Operational Significant Event Imagery Name[hr]=Slika dana na Operational Significant Event Imagery Name[it]=Operational Significant Event Imagery Picture of the Day -Name[kk]=Күнделікті Operational Significant Event Imagery (Osei) cуреті +Name[kk]=Operational Significant Event Imagery (Osei) "Тәулік суреті" Name[km]=រូបភាពសមើលស្រមៃព្រឹត្តិការណ៍ដ៏មានសារៈសំខាន់នៃប្រតិបត្តិការណ៍នៃថ្ងៃ Name[lv]=Operational Significant Event Imagery dienas attēls Name[nb]=Dagens bilde om betydelige miljøhendelser diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.5.2/dataengines/potd/plasma-dataengine-potd.desktop new/kdeplasma-addons-4.5.3/dataengines/potd/plasma-dataengine-potd.desktop --- old/kdeplasma-addons-4.5.2/dataengines/potd/plasma-dataengine-potd.desktop 2010-08-04 21:16:01.000000000 +0200 +++ new/kdeplasma-addons-4.5.3/dataengines/potd/plasma-dataengine-potd.desktop 2010-10-28 19:35:53.000000000 +0200 @@ -20,7 +20,7 @@ Name[is]=Myndir dagsins Name[it]=Immagine del giorno Name[ja]=今日の写真 -Name[kk]=Күнделікті сурет +Name[kk]=Тәулік суреті Name[km]=រូបភាពប្រចាំថ្ងៃ Name[lv]=Dienas attēls Name[nb]=Dagens bilde diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdeplasma-addons-4.5.2/dataengines/potd/wcpotdprovider.desktop new/kdeplasma-addons-4.5.3/dataengines/potd/wcpotdprovider.desktop --- old/kdeplasma-addons-4.5.2/dataengines/potd/wcpotdprovider.desktop 2010-07-28 23:05:00.000000000 +0200 +++ new/kdeplasma-addons-4.5.3/dataengines/potd/wcpotdprovider.desktop 2010-10-28 19:35:53.000000000 +0200 @@ -23,7 +23,7 @@ Name[hr]=Slika dana na Wikimediji Name[it]=Immagine del giorno di Wikimedia Name[ja]=Wikimedia 今日の写真 -Name[kk]=Wikimedia күнделікті суреті (Wcpotd) +Name[kk]=Wikimedia "Тәулік суреті" (Wcpotd) Name[km]=រូបភាពប្រចាំថ្ងៃ Wikimedia Name[lv]=Wikimedia dienas attēls Name[nb]=Dagens Wikimedia-bilde ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0