[Monodevelop-patches-list] r2755 - in trunk/MonoDevelop/Extras/NUnit: . Gui

[Lluis Sanchez <lluis@ximian.com>]

Author: lluis
Date: 2005-08-18 13:41:33 -0400 (Thu, 18 Aug 2005)
New Revision: 2755

Modified:
   trunk/MonoDevelop/Extras/NUnit/ChangeLog
   trunk/MonoDevelop/Extras/NUnit/Gui/NUnitAssemblyGroupConfigurationNodeBuilder.cs
   trunk/MonoDevelop/Extras/NUnit/Makefile.am
   trunk/MonoDevelop/Extras/NUnit/MonoDevelopNUnit.addin.xml
Log:
2005-08-12  Lluis Sanchez Gual  <lluis at novell.com> 

	* templates/*:
	* MonoDevelopNUnit.addin.xml: Properly reference resource icons and
	templates.
	* Makefile.am: Embed icon and templates as resources.
	* Gui/NUnitAssemblyGroupConfigurationNodeBuilder.cs: Track changes in
	the Stock class.



Modified: trunk/MonoDevelop/Extras/NUnit/ChangeLog
===================================================================
--- trunk/MonoDevelop/Extras/NUnit/ChangeLog	2005-08-18 17:40:40 UTC (rev 2754)
+++ trunk/MonoDevelop/Extras/NUnit/ChangeLog	2005-08-18 17:41:33 UTC (rev 2755)
@@ -1,3 +1,12 @@
+2005-08-12  Lluis Sanchez Gual  <lluis at novell.com> 
+
+	* templates/*:
+	* MonoDevelopNUnit.addin.xml: Properly reference resource icons and
+	templates.
+	* Makefile.am: Embed icon and templates as resources.
+	* Gui/NUnitAssemblyGroupConfigurationNodeBuilder.cs: Track changes in
+	the Stock class.
+
 2005-08-10  Lluis Sanchez Gual  <lluis at novell.com>
 
 	* Services/NUnitService.cs:

Modified: trunk/MonoDevelop/Extras/NUnit/Gui/NUnitAssemblyGroupConfigurationNodeBuilder.cs
===================================================================
--- trunk/MonoDevelop/Extras/NUnit/Gui/NUnitAssemblyGroupConfigurationNodeBuilder.cs	2005-08-18 17:40:40 UTC (rev 2754)
+++ trunk/MonoDevelop/Extras/NUnit/Gui/NUnitAssemblyGroupConfigurationNodeBuilder.cs	2005-08-18 17:41:33 UTC (rev 2755)
@@ -68,7 +68,7 @@
 		{
 			IConfiguration conf = dataObject as IConfiguration;
 			label = conf.Name;
-			icon = Context.GetIcon (Stock.ClosedFolderBitmap);
+			icon = Context.GetIcon (Stock.ClosedFolder);
 		}
 
 		public override void BuildChildNodes (ITreeBuilder builder, object dataObject)

Modified: trunk/MonoDevelop/Extras/NUnit/Makefile.am
===================================================================
--- trunk/MonoDevelop/Extras/NUnit/Makefile.am	2005-08-18 17:40:40 UTC (rev 2754)
+++ trunk/MonoDevelop/Extras/NUnit/Makefile.am	2005-08-18 17:41:33 UTC (rev 2755)
@@ -49,57 +49,40 @@
 Services/UnitTestResultsStore.cs \
 Services/XmlResultsStore.cs
 
-TEMPLATES = \
-templates/NUnitAssemblyGroup.xpt.xml
+RES = \
+nunit.glade \
+templates/NUnitAssemblyGroup.xpt.xml \
+Gui/NUnit.Running.png \
+Gui/NUnit.Failed.png \
+Gui/NUnit.SuccessAndFailed.png \
+Gui/NUnit.None.png \
+Gui/NUnit.NotRun.png \
+Gui/NUnit.Loading.png \
+Gui/NUnit.Success.png
 
-RES = -resource:$(srcdir)/Gui/NUnit.Running.png \
-	-resource:$(srcdir)/Gui/NUnit.Failed.png \
-	-resource:$(srcdir)/Gui/NUnit.SuccessAndFailed.png \
-	-resource:$(srcdir)/Gui/NUnit.None.png \
-	-resource:$(srcdir)/Gui/NUnit.NotRun.png \
-	-resource:$(srcdir)/Gui/NUnit.Loading.png \
-	-resource:$(srcdir)/Gui/NUnit.Success.png \
-	-resource:$(srcdir)/nunit.glade
-
 ADDIN = MonoDevelopNUnit.addin.xml
 
-TEMPLATES_DIR = $(ADDIN_BUILD)/templates
-
-build_TEMPLATES = $(addprefix $(TEMPLATES_DIR)/, $(notdir $(TEMPLATES)))
-
-src_TEMPLATES = $(addprefix $(srcdir)/, $(TEMPLATES))
-
 if ENABLE_NUNIT
-all: $(ASSEMBLY) $(ADDIN_BUILD)/$(ADDIN) $(build_TEMPLATES)
+all: $(ASSEMBLY) $(ADDIN_BUILD)/$(ADDIN)
 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) $(srcdir)/nunit.glade
+$(ASSEMBLY): $(FILES) $(RES)
 	mkdir -p $(ADDIN_BUILD)
-	$(CSC) $(CSC_FLAGS) $(DLLS) $(RES) $(build_sources) -out:$@ -target:library
+	$(CSC) $(CSC_FLAGS) $(DLLS) $(RES:%=/resource:%) $(build_sources) -out:$@ -target:library
 
 if ENABLE_NUNIT
 assemblydir = $(MD_ADDIN_DIR)/NUnit
 assembly_DATA = $(ASSEMBLY) $(ADDIN)
 
-templatedir = $(assemblydir)/templates
-template_DATA = $(TEMPLATES)
 endif
 
 CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
-EXTRA_DIST = $(FILES) nunit.glade $(ADDIN) $(TEMPLATES)
+EXTRA_DIST = $(FILES) $(ADDIN) $(RES)
 
 include $(top_srcdir)/Makefile.include

Modified: trunk/MonoDevelop/Extras/NUnit/MonoDevelopNUnit.addin.xml
===================================================================
--- trunk/MonoDevelop/Extras/NUnit/MonoDevelopNUnit.addin.xml	2005-08-18 17:40:40 UTC (rev 2754)
+++ trunk/MonoDevelop/Extras/NUnit/MonoDevelopNUnit.addin.xml	2005-08-18 17:41:33 UTC (rev 2755)
@@ -100,7 +100,7 @@
 	</Extension>
 
 	<Extension path = "/MonoDevelop/ProjectTemplates">
-		<ProjectTemplate id = "NUnitAssemblyGroup" location = "templates/NUnitAssemblyGroup.xpt.xml"/>
+		<ProjectTemplate id = "NUnitAssemblyGroup" resource = "NUnitAssemblyGroup.xpt.xml"/>
 	</Extension>
   
 	<Extension path = "/SharpDevelop/Workbench/ProjectFileFormats">