commit monodevelop-boo for openSUSE:Factory
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@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@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de