[Monodevelop-patches-list] r2751 - in trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding: . icons

Lluis Sanchez <lluis@ximian.com> lluis at mono-cvs.ximian.com
Thu Aug 18 13:37:06 EDT 2005


Author: lluis
Date: 2005-08-18 13:37:05 -0400 (Thu, 18 Aug 2005)
New Revision: 2751

Added:
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/icons/
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/icons/Nemerle.File.EmptyFile
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/icons/Nemerle.File.Form
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/icons/Nemerle.FileIcon
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/icons/Nemerle.Project.EmptyProject
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/icons/Nemerle.Project.Form
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/icons/Nemerle.ProjectIcon
Modified:
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/ChangeLog
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/EmptyNemerleFile.xft.xml
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Makefile.am
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleBinding.addin.xml
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleEmptyProject.xpt.xml
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleGnomeSharpProject.xpt.xml
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleGtkSharpProject.xpt.xml
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleGtkSharpWindow.xft.xml
Log:
2005-08-12  Lluis Sanchez Gual  <lluis at novell.com> 

	* NemerleGnomeSharpProject.xpt.xml:
	* NemerleGtkSharpProject.xpt.xml:
	* NemerleEmptyProject.xpt.xml:
	* EmptyNemerleFile.xft.xml:
	* NemerleGtkSharpWindow.xft.xml:
	* NemerleBinding.addin.xml: Properly reference resource icons and
	templates.
	* Makefile.am: Embed icon and templates as resources.



Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/ChangeLog	2005-08-18 17:36:44 UTC (rev 2750)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/ChangeLog	2005-08-18 17:37:05 UTC (rev 2751)
@@ -1,3 +1,14 @@
+2005-08-12  Lluis Sanchez Gual  <lluis at novell.com> 
+
+	* NemerleGnomeSharpProject.xpt.xml:
+	* NemerleGtkSharpProject.xpt.xml:
+	* NemerleEmptyProject.xpt.xml:
+	* EmptyNemerleFile.xft.xml:
+	* NemerleGtkSharpWindow.xft.xml:
+	* NemerleBinding.addin.xml: Properly reference resource icons and
+	templates.
+	* Makefile.am: Embed icon and templates as resources.
+
 2005-07-11  Lluis Sanchez Gual  <lluis at novell.com>
 
 	* Project/NemerleParameters.cs: Implement ICloneable.

Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/EmptyNemerleFile.xft.xml
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/EmptyNemerleFile.xft.xml	2005-08-18 17:36:44 UTC (rev 2750)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/EmptyNemerleFile.xft.xml	2005-08-18 17:37:05 UTC (rev 2751)
@@ -6,7 +6,7 @@
 	  
 	<TemplateConfiguration>
 		<_Name>Empty file</_Name>
-		<Icon>Nemerle.File.EmptyFile</Icon>
+		<Icon>res:Nemerle.File.EmptyFile</Icon>
 		<Category>Nemerle</Category>
 		<LanguageName>Nemerle</LanguageName>
 		<_Description>Creates an empty Nemerle file</_Description>

Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Makefile.am	2005-08-18 17:36:44 UTC (rev 2750)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/Makefile.am	2005-08-18 17:37:05 UTC (rev 2751)
@@ -17,45 +17,35 @@
 NemerleBindingCompilerServices.cs \
 NemerleLanguageBinding.cs 
 
-TEMPLATES = \
+RES = \
+Nemerle.glade \
 NemerleEmptyProject.xpt.xml \
 NemerleGnomeSharpProject.xpt.xml \
 NemerleGtkSharpProject.xpt.xml \
 NemerleGtkSharpWindow.xft.xml \
-EmptyNemerleFile.xft.xml
+EmptyNemerleFile.xft.xml \
+icons/Nemerle.File.EmptyFile \
+icons/Nemerle.File.Form \
+icons/Nemerle.FileIcon \
+icons/Nemerle.Project.EmptyProject \
+icons/Nemerle.Project.Form \
+icons/Nemerle.ProjectIcon
 
-build_TEMPLATES = $(addprefix $(ADDIN_BUILD)/templates/, $(TEMPLATES))
-
 ADDIN = NemerleBinding.addin.xml
 
-TEMPLATES_DIR = $(ADDIN_BUILD)/templates
-
-all: $(ASSEMBLY) $(ADDIN_BUILD)/$(ADDIN) $(build_TEMPLATES)
-
-$(filter %.xft.xml, $(build_TEMPLATES)): $(TEMPLATES_DIR)/%.xft.xml: $(srcdir)/%.xft.xml
-	mkdir -p $(TEMPLATES_DIR)
-	cp $(srcdir)/$(notdir $@) $@
-
-$(filter %.xpt.xml, $(build_TEMPLATES)): $(TEMPLATES_DIR)/%.xpt.xml: $(srcdir)/%.xpt.xml
-	mkdir -p $(TEMPLATES_DIR)
-	cp $(srcdir)/$(notdir $@) $@
-
 $(ADDIN_BUILD)/$(ADDIN): $(srcdir)/$(ADDIN)
 	mkdir -p $(ADDIN_BUILD)
 	cp $(srcdir)/$(ADDIN) $(ADDIN_BUILD)/.
 
-$(ASSEMBLY): $(FILES) $(srcdir)/Nemerle.glade
+$(ASSEMBLY): $(FILES) $(RES)
 	mkdir -p $(ADDIN_BUILD)
-	$(CSC) $(CSC_FLAGS) $(DLLS) $(build_sources) -out:$@ -target:library \
-	-resource:$(srcdir)/Nemerle.glade,Nemerle.glade
+	$(CSC) $(CSC_FLAGS) $(DLLS) $(RES:%=/resource:%) \
+		$(build_sources) -out:$@ -target:library
 
 assemblydir = $(MD_ADDIN_DIR)/BackendBindings/
 assembly_DATA = $(ASSEMBLY) $(ADDIN)
 
-templatedir = $(assemblydir)/templates
-template_DATA = $(TEMPLATES)
-
 CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
-EXTRA_DIST = $(FILES) Nemerle.glade $(ADDIN) $(TEMPLATES)
+EXTRA_DIST = $(FILES) $(ADDIN) $(RES)
 include $(top_srcdir)/Makefile.include
 

Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleBinding.addin.xml
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleBinding.addin.xml	2005-08-18 17:36:44 UTC (rev 2750)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleBinding.addin.xml	2005-08-18 17:37:05 UTC (rev 2751)
@@ -17,19 +17,14 @@
   </Extension>
 
   <Extension path = "/MonoDevelop/FileTemplates">
-    <FileTemplate id = "EmptyNemerleFile"
-                  location = "templates/EmptyNemerleFile.xft.xml"/>
-    <FileTemplate id = "NemerleGtkSharpWindow"
-                  location = "templates/NemerleGtkSharpWindow.xft.xml"/>
+    <FileTemplate id = "EmptyNemerleFile" resource = "EmptyNemerleFile.xft.xml"/>
+    <FileTemplate id = "NemerleGtkSharpWindow" resource = "NemerleGtkSharpWindow.xft.xml"/>
   </Extension>
 
   <Extension path = "/MonoDevelop/ProjectTemplates">
-    <ProjectTemplate id = "EmptyNemerleProject"
-                     location = "templates/NemerleEmptyProject.xpt.xml"/>
-    <ProjectTemplate id = "NemerleGtkSharpProject"
-                     location = "templates/NemerleGtkSharpProject.xpt.xml"/>
-    <ProjectTemplate id = "NemerleGnomeSharpProject"
-                     location = "templates/NemerleGnomeSharpProject.xpt.xml"/>
+    <ProjectTemplate id = "EmptyNemerleProject" resource = "NemerleEmptyProject.xpt.xml"/>
+    <ProjectTemplate id = "NemerleGtkSharpProject" resource = "NemerleGtkSharpProject.xpt.xml"/>
+    <ProjectTemplate id = "NemerleGnomeSharpProject" resource = "NemerleGnomeSharpProject.xpt.xml"/>
   </Extension>
 
   <Extension path = "/SharpDevelop/Workbench/ProjectOptions/ConfigurationProperties">
@@ -46,10 +41,10 @@
   <Extension path = "/Workspace/Icons">
     <Icon id = "NemerlePrj"
           language = "Nemerle"
-          resource = "Nemerle.ProjectIcon"/>
+          resource = "res:Nemerle.ProjectIcon"/>
     <Icon id = "NemerleFile"
           extensions = ".n"
-          resource = "Nemerle.FileIcon"/>
+          resource = "res:Nemerle.FileIcon"/>
   </Extension>
 
   <Extension path = "/SharpDevelop/Workbench/LanguageBindings">
@@ -57,5 +52,4 @@
                      supportedextensions = ".n"
                      class = "NemerleBinding.NemerleLanguageBinding" />
   </Extension>
-
 </AddIn>

Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleEmptyProject.xpt.xml
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleEmptyProject.xpt.xml	2005-08-18 17:36:44 UTC (rev 2750)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleEmptyProject.xpt.xml	2005-08-18 17:37:05 UTC (rev 2751)
@@ -7,7 +7,7 @@
 	<TemplateConfiguration>
 		<_Name>Empty Project</_Name>
 		<Category>Nemerle</Category>
-		<Icon>Nemerle.Project.EmptyProject</Icon>
+		<Icon>res:Nemerle.Project.EmptyProject</Icon>
 		<LanguageName>Nemerle</LanguageName>
 		<_Description>Creates an empty Nemerle project</_Description>
 	</TemplateConfiguration>

Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleGnomeSharpProject.xpt.xml
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleGnomeSharpProject.xpt.xml	2005-08-18 17:36:44 UTC (rev 2750)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleGnomeSharpProject.xpt.xml	2005-08-18 17:37:05 UTC (rev 2751)
@@ -7,7 +7,7 @@
 	<TemplateConfiguration>
 		<_Name>Gnome# Project</_Name>
 		<Category>Nemerle</Category>
-		<Icon>Nemerle.Project.Form</Icon>
+		<Icon>res:Nemerle.Project.Form</Icon>
 		<LanguageName>Nemerle</LanguageName>
 		<_Description>Creates a Nemerle/Gnome# project</_Description>
 	</TemplateConfiguration>

Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleGtkSharpProject.xpt.xml
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleGtkSharpProject.xpt.xml	2005-08-18 17:36:44 UTC (rev 2750)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleGtkSharpProject.xpt.xml	2005-08-18 17:37:05 UTC (rev 2751)
@@ -7,7 +7,7 @@
 	<TemplateConfiguration>
 		<_Name>Gtk# Project</_Name>
 		<Category>Nemerle</Category>
-		<Icon>Nemerle.Project.Form</Icon>
+		<Icon>res:Nemerle.Project.Form</Icon>
 		<LanguageName>Nemerle</LanguageName>
 		<_Description>Creates a Nemerle/Gtk# project</_Description>
 	</TemplateConfiguration>

Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleGtkSharpWindow.xft.xml
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleGtkSharpWindow.xft.xml	2005-08-18 17:36:44 UTC (rev 2750)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/NemerleGtkSharpWindow.xft.xml	2005-08-18 17:37:05 UTC (rev 2751)
@@ -6,7 +6,7 @@
 	  
 	<TemplateConfiguration>
 		<_Name>Gtk# Window</_Name>
-		<Icon>Nemerle.File.Form</Icon>
+		<Icon>res:Nemerle.File.Form</Icon>
 		<Category>Nemerle</Category>
 		<LanguageName>Nemerle</LanguageName>
 		<_Description>Creates a top-level Gtk# window</_Description>

Added: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/icons/Nemerle.File.EmptyFile
===================================================================
(Binary files differ)


Property changes on: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/icons/Nemerle.File.EmptyFile
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/icons/Nemerle.File.Form
===================================================================
(Binary files differ)


Property changes on: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/icons/Nemerle.File.Form
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/icons/Nemerle.FileIcon
===================================================================
(Binary files differ)


Property changes on: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/icons/Nemerle.FileIcon
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/icons/Nemerle.Project.EmptyProject
===================================================================
(Binary files differ)


Property changes on: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/icons/Nemerle.Project.EmptyProject
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/icons/Nemerle.Project.Form
===================================================================
(Binary files differ)


Property changes on: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/icons/Nemerle.Project.Form
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/icons/Nemerle.ProjectIcon
===================================================================
(Binary files differ)


Property changes on: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/NemerleBinding/icons/Nemerle.ProjectIcon
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream




More information about the Monodevelop-patches-list mailing list