[Monodevelop-patches-list] r2757 - in trunk/MonoDevelop/Extras/BooBinding: . icons
Lluis Sanchez <lluis@ximian.com>
lluis at mono-cvs.ximian.com
Thu Aug 18 13:47:35 EDT 2005
Author: lluis
Date: 2005-08-18 13:47:35 -0400 (Thu, 18 Aug 2005)
New Revision: 2757
Added:
trunk/MonoDevelop/Extras/BooBinding/icons/
trunk/MonoDevelop/Extras/BooBinding/icons/Boo.File.EmptyFile
trunk/MonoDevelop/Extras/BooBinding/icons/Boo.File.Form
trunk/MonoDevelop/Extras/BooBinding/icons/Boo.FileIcon
trunk/MonoDevelop/Extras/BooBinding/icons/Boo.Project.EmptyProject
trunk/MonoDevelop/Extras/BooBinding/icons/Boo.Project.Form
trunk/MonoDevelop/Extras/BooBinding/icons/Boo.ProjectIcon
trunk/MonoDevelop/Extras/BooBinding/icons/BooBinding.Base
Modified:
trunk/MonoDevelop/Extras/BooBinding/BooBinding.addin.xml
trunk/MonoDevelop/Extras/BooBinding/ChangeLog
trunk/MonoDevelop/Extras/BooBinding/Makefile.am
Log:
2005-08-12 Lluis Sanchez Gual <lluis at novell.com>
* templates/*:
* BooBinding.addin.xml: Properly reference resource icons and
templates.
* Makefile.am: Embed icon and templates as resources.
Modified: trunk/MonoDevelop/Extras/BooBinding/BooBinding.addin.xml
===================================================================
--- trunk/MonoDevelop/Extras/BooBinding/BooBinding.addin.xml 2005-08-18 17:42:47 UTC (rev 2756)
+++ trunk/MonoDevelop/Extras/BooBinding/BooBinding.addin.xml 2005-08-18 17:47:35 UTC (rev 2757)
@@ -17,17 +17,13 @@
</Extension>
<Extension path = "/MonoDevelop/FileTemplates">
- <FileTemplate id = "EmptyBooFile"
- location = "templates/EmptyBooFile.xft.xml"/>
- <FileTemplate id = "BooGtkSharpWindow"
- location = "templates/BooGtkSharpWindow.xft.xml"/>
+ <FileTemplate id = "EmptyBooFile" resource = "EmptyBooFile.xft.xml"/>
+ <FileTemplate id = "BooGtkSharpWindow" resource = "BooGtkSharpWindow.xft.xml"/>
</Extension>
<Extension path = "/MonoDevelop/ProjectTemplates">
- <ProjectTemplate id = "EmptyBooProject"
- location = "templates/EmptyBooProject.xpt.xml"/>
- <ProjectTemplate id = "BooGtkSharpProject"
- location = "templates/BooGtkSharpProject.xpt.xml"/>
+ <ProjectTemplate id = "EmptyBooProject" resource = "EmptyBooProject.xpt.xml"/>
+ <ProjectTemplate id = "BooGtkSharpProject" resource = "BooGtkSharpProject.xpt.xml"/>
</Extension>
<Extension path = "/SharpDevelop/Workbench/ProjectOptions/ConfigurationProperties">
@@ -41,10 +37,10 @@
<Extension path = "/Workspace/Icons">
<Icon id = "BooPrj"
language = "Boo"
- resource = "Boo.ProjectIcon"/>
+ resource = "res:Boo.ProjectIcon"/>
<Icon id = "BooFile"
extensions = ".boo"
- resource = "Boo.FileIcon"/>
+ resource = "res:Boo.FileIcon"/>
</Extension>
<Extension path = "/SharpDevelop/Workbench/LanguageBindings">
Modified: trunk/MonoDevelop/Extras/BooBinding/ChangeLog
===================================================================
--- trunk/MonoDevelop/Extras/BooBinding/ChangeLog 2005-08-18 17:42:47 UTC (rev 2756)
+++ trunk/MonoDevelop/Extras/BooBinding/ChangeLog 2005-08-18 17:47:35 UTC (rev 2757)
@@ -1,3 +1,10 @@
+2005-08-12 Lluis Sanchez Gual <lluis at novell.com>
+
+ * templates/*:
+ * BooBinding.addin.xml: Properly reference resource icons and
+ templates.
+ * Makefile.am: Embed icon and templates as resources.
+
2005-08-15 Peter Johanson <latexer at gentoo.org>
* Gui/ShellTextvView: Fix file sharing violation that killed multiple
Modified: trunk/MonoDevelop/Extras/BooBinding/Makefile.am
===================================================================
--- trunk/MonoDevelop/Extras/BooBinding/Makefile.am 2005-08-18 17:42:47 UTC (rev 2756)
+++ trunk/MonoDevelop/Extras/BooBinding/Makefile.am 2005-08-18 17:47:35 UTC (rev 2757)
@@ -47,45 +47,38 @@
BOOSHELL_FILES = BooShell/BooShell.boo
-TEMPLATES = \
+RES = \
templates/BooGtkSharpProject.xpt.xml \
templates/BooGtkSharpWindow.xft.xml \
templates/EmptyBooFile.xft.xml \
-templates/EmptyBooProject.xpt.xml
+templates/EmptyBooProject.xpt.xml \
+icons/BooBinding.Base \
+icons/Boo.File.EmptyFile \
+icons/Boo.File.Form \
+icons/Boo.FileIcon \
+icons/Boo.Project.EmptyProject \
+icons/Boo.Project.Form \
+icons/Boo.ProjectIcon
build_sources = $(addprefix $(srcdir)/, $(FILES))
booshell_build_sources = $(addprefix $(srcdir)/, $(BOOSHELL_FILES))
ADDIN = BooBinding.addin.xml
-TEMPLATES_DIR = $(ADDIN_BUILD)/templates
-
-build_TEMPLATES = $(addprefix $(TEMPLATES_DIR)/, $(notdir $(TEMPLATES)))
-
-src_TEMPLATES = $(addprefix $(srcdir)/, $(TEMPLATES))
-
if ENABLE_BOO
-all: $(ASSEMBLY) $(ADDIN_BUILD)/$(ADDIN) $(build_TEMPLATES) \
+all: $(ASSEMBLY) $(ADDIN_BUILD)/$(ADDIN) \
$(BOOSHELL_LIB)
else
all:
endif
-$(filter %.xft.xml, $(build_TEMPLATES)): $(TEMPLATES_DIR)/%.xft.xml: $(srcdir)/templates/%.xft.xml
- mkdir -p $(TEMPLATES_DIR)
- cp $(srcdir)/templates/$(notdir $@) $@
-
-$(filter %.xpt.xml, $(build_TEMPLATES)): $(TEMPLATES_DIR)/%.xpt.xml: $(srcdir)/templates/%.xpt.xml
- mkdir -p $(TEMPLATES_DIR)
- cp $(srcdir)/templates/$(notdir $@) $@
-
$(ADDIN_BUILD)/$(ADDIN): $(srcdir)/$(ADDIN)
mkdir -p $(ADDIN_BUILD)
cp $(srcdir)/$(ADDIN) $(ADDIN_BUILD)/.
-$(ASSEMBLY): $(FILES) $(BOOSHELL_LIB)
+$(ASSEMBLY): $(FILES) $(BOOSHELL_LIB) $(RES)
mkdir -p $(ADDIN_BUILD)
- $(BOOC) $(DLLS) $(build_sources) -o:$@ -t:library
+ $(BOOC) $(DLLS) $(RES:%=/resource:%) $(build_sources) -o:$@ -t:library
$(BOOSHELL_LIB): $(BOOSHELL_FILES)
mkdir -p $(ADDIN_BUILD)
@@ -95,10 +88,8 @@
assemblydir = $(MD_ADDIN_DIR)/BackendBindings
assembly_DATA = $(ASSEMBLY) $(ADDIN) $(BOOSHELL_LIB)
-templatedir = $(assemblydir)/templates
-template_DATA = $(TEMPLATES)
endif
CLEANFILES = $(ASSEMBLY) $(BOOSHELL_LIB)
-EXTRA_DIST = $(FILES) $(ADDIN) $(TEMPLATES) $(BOOSHELL_FILES)
+EXTRA_DIST = $(FILES) $(ADDIN) $(RES) $(BOOSHELL_FILES)
Added: trunk/MonoDevelop/Extras/BooBinding/icons/Boo.File.EmptyFile
===================================================================
(Binary files differ)
Property changes on: trunk/MonoDevelop/Extras/BooBinding/icons/Boo.File.EmptyFile
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/MonoDevelop/Extras/BooBinding/icons/Boo.File.Form
===================================================================
(Binary files differ)
Property changes on: trunk/MonoDevelop/Extras/BooBinding/icons/Boo.File.Form
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/MonoDevelop/Extras/BooBinding/icons/Boo.FileIcon
===================================================================
(Binary files differ)
Property changes on: trunk/MonoDevelop/Extras/BooBinding/icons/Boo.FileIcon
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/MonoDevelop/Extras/BooBinding/icons/Boo.Project.EmptyProject
===================================================================
(Binary files differ)
Property changes on: trunk/MonoDevelop/Extras/BooBinding/icons/Boo.Project.EmptyProject
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/MonoDevelop/Extras/BooBinding/icons/Boo.Project.Form
===================================================================
(Binary files differ)
Property changes on: trunk/MonoDevelop/Extras/BooBinding/icons/Boo.Project.Form
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/MonoDevelop/Extras/BooBinding/icons/Boo.ProjectIcon
===================================================================
(Binary files differ)
Property changes on: trunk/MonoDevelop/Extras/BooBinding/icons/Boo.ProjectIcon
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/MonoDevelop/Extras/BooBinding/icons/BooBinding.Base
===================================================================
(Binary files differ)
Property changes on: trunk/MonoDevelop/Extras/BooBinding/icons/BooBinding.Base
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the Monodevelop-patches-list
mailing list