[Monodevelop-patches-list] r1638 - in trunk/MonoDevelop: build/AddIns src/Main/Base src/Main/Base/Services/Project

[commit-watcher at mono-cvs.ximian.com]

Author: tberman
Date: 2004-05-26 02:55:35 -0400 (Wed, 26 May 2004)
New Revision: 1638

Modified:
   trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin.xml
   trunk/MonoDevelop/src/Main/Base/ChangeLog
   trunk/MonoDevelop/src/Main/Base/Services/Project/DefaultProjectService.cs
Log:
remove generate makefiles, and autogenerate on appropriate project changes. We are most likely a bit generate happy, but its a good idea to write it too many times instead of missing something.


Modified: trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin.xml
===================================================================
--- trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin.xml	2004-05-26 05:28:21 UTC (rev 1637)
+++ trunk/MonoDevelop/build/AddIns/SharpDevelopCore.addin.xml	2004-05-26 06:55:35 UTC (rev 1638)
@@ -802,9 +802,9 @@
 		                          description = "${res:XML.MainMenu.RunMenu.Run.Description}" 
 		                          shortcut = "F5"
 		                          class = "MonoDevelop.Commands.RunCommand"/>
-				<MenuItem id = "GenerateMakefiles"
+				<!-- <MenuItem id = "GenerateMakefiles"
 				          _label = "Generate Makefiles"
-				          class = "MonoDevelop.Commands.GenerateMakefiles"/>
+				          class = "MonoDevelop.Commands.GenerateMakefiles"/>-->
 
 			</Conditional> 
 	        </MenuItem>

Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-05-26 05:28:21 UTC (rev 1637)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-05-26 06:55:35 UTC (rev 1638)
@@ -1,5 +1,10 @@
 2004-05-26  Todd Berman  <tberman at sevenl.net>
 
+	* Services/Project/DefaultProjectService.cs: auto-generate makefiles
+	on changes. I think i hit all the needed events, lets see.
+
+2004-05-26  Todd Berman  <tberman at sevenl.net>
+
 	* Services/ParserService/DefaultParserService.cs: Update Monodoc
 	and IsAs resolvers.
 	* Services/ParserService/IParserService.cs: Expose new search type

Modified: trunk/MonoDevelop/src/Main/Base/Services/Project/DefaultProjectService.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/Project/DefaultProjectService.cs	2004-05-26 05:28:21 UTC (rev 1637)
+++ trunk/MonoDevelop/src/Main/Base/Services/Project/DefaultProjectService.cs	2004-05-26 06:55:35 UTC (rev 1638)
@@ -108,8 +108,7 @@
 		{
 			if (CurrentOpenCombine != null) {
 				if (saveCombinePreferencies)
-				  SaveCombinePreferences(CurrentOpenCombine, openCombineFileName);
-				
+					SaveCombinePreferences(CurrentOpenCombine, openCombineFileName);
 				Combine closedCombine = CurrentOpenCombine;
 				CurrentSelectedProject = null;
 				CurrentOpenCombine = CurrentSelectedCombine = null;
@@ -590,6 +589,7 @@
 		//********* own events
 		protected virtual void OnCombineOpened(CombineEventArgs e)
 		{
+			GenerateMakefiles ();
 			if (CombineOpened != null) {
 				CombineOpened(this, e);
 			}
@@ -597,6 +597,7 @@
 		
 		protected virtual void OnCombineClosed(CombineEventArgs e)
 		{
+			GenerateMakefiles ();
 			if (CombineClosed != null) {
 				CombineClosed(this, e);
 			}
@@ -622,6 +623,7 @@
 		
 		public virtual void OnRenameProject(ProjectRenameEventArgs e)
 		{
+			GenerateMakefiles ();
 			if (ProjectRenamed != null) {
 				ProjectRenamed(this, e);
 			}
@@ -702,6 +704,7 @@
 		
 		protected virtual void OnFileRemovedFromProject (ProjectFileEventArgs e)
 		{
+			GenerateMakefiles ();
 			if (FileRemovedFromProject != null) {
 				FileRemovedFromProject(this, e);
 			}
@@ -709,6 +712,7 @@
 
 		protected virtual void OnFileAddedToProject (ProjectFileEventArgs e)
 		{
+			GenerateMakefiles ();
 			if (FileAddedToProject != null) {
 				FileAddedToProject (this, e);
 			}
@@ -716,6 +720,7 @@
 		
 		protected virtual void OnReferenceRemovedFromProject (ProjectReferenceEventArgs e)
 		{
+			GenerateMakefiles ();
 			if (ReferenceRemovedFromProject != null) {
 				ReferenceRemovedFromProject (this, e);
 			}
@@ -723,6 +728,7 @@
 		
 		protected virtual void OnReferenceAddedToProject (ProjectReferenceEventArgs e)
 		{
+			GenerateMakefiles ();
 			if (ReferenceAddedToProject != null) {
 				ReferenceAddedToProject (this, e);
 			}
@@ -766,7 +772,8 @@
 
 		public void GenerateMakefiles ()
 		{
-			openCombine.GenerateMakefiles ();
+			if (openCombine != null)
+				openCombine.GenerateMakefiles ();
 		}
 		
 		public event ProjectFileEventHandler FileRemovedFromProject;