[Monodevelop-patches-list] r1548 - in branches/MonoDevelop-generate-what: build/data/resources/icons build/data/templates/file/CSharp docs src/AddIns/BackendBindings/CSharpBinding src/AddIns/DebuggerAddIn src/AddIns/DisplayBindings/SourceEditor src/AddIns/DisplayBindings/SourceEditor/Gui src/Main/Base src/Main/Base/Internal/Project/Project

commit-watcher at mono-cvs.ximian.com commit-watcher at mono-cvs.ximian.com
Thu Apr 29 09:32:13 EDT 2004


Author: iainmc
Date: 2004-04-29 09:32:13 -0400 (Thu, 29 Apr 2004)
New Revision: 1548

Modified:
   branches/MonoDevelop-generate-what/build/data/resources/icons/Icons.16x16.ClearAllBookmarks
   branches/MonoDevelop-generate-what/build/data/resources/icons/Icons.16x16.FindNextIcon
   branches/MonoDevelop-generate-what/build/data/resources/icons/Icons.16x16.GotoNextbookmark
   branches/MonoDevelop-generate-what/build/data/resources/icons/Icons.16x16.GotoPrevbookmark
   branches/MonoDevelop-generate-what/build/data/resources/icons/Icons.16x16.OutputIcon
   branches/MonoDevelop-generate-what/build/data/resources/icons/Icons.16x16.SplitWindow
   branches/MonoDevelop-generate-what/build/data/resources/icons/Icons.16x16.TaskListIcon
   branches/MonoDevelop-generate-what/build/data/resources/icons/Icons.16x16.ToggleBookmark
   branches/MonoDevelop-generate-what/build/data/templates/file/CSharp/EmptyCSharpFile.xft
   branches/MonoDevelop-generate-what/docs/SourceMap.html
   branches/MonoDevelop-generate-what/docs/Translations.html
   branches/MonoDevelop-generate-what/docs/WritingAddIns.html
   branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs
   branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingExecutionManager.cs
   branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/ChangeLog
   branches/MonoDevelop-generate-what/src/AddIns/DebuggerAddIn/ChangeLog
   branches/MonoDevelop-generate-what/src/AddIns/DebuggerAddIn/DebuggingService.cs
   branches/MonoDevelop-generate-what/src/AddIns/DebuggerAddIn/Makefile.am
   branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
   branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs
   branches/MonoDevelop-generate-what/src/Main/Base/ChangeLog
   branches/MonoDevelop-generate-what/src/Main/Base/Internal/Project/Project/AbstractProject.cs
Log:
Merging with HEAD:
svn merge -r 1534:1546 svn+ssh://iainmc@mono-cvs.ximian.com/svn/monodevelop/trunk/MonoDevelop


Modified: branches/MonoDevelop-generate-what/build/data/resources/icons/Icons.16x16.ClearAllBookmarks
===================================================================
(Binary files differ)

Modified: branches/MonoDevelop-generate-what/build/data/resources/icons/Icons.16x16.FindNextIcon
===================================================================
(Binary files differ)

Modified: branches/MonoDevelop-generate-what/build/data/resources/icons/Icons.16x16.GotoNextbookmark
===================================================================
(Binary files differ)

Modified: branches/MonoDevelop-generate-what/build/data/resources/icons/Icons.16x16.GotoPrevbookmark
===================================================================
(Binary files differ)

Modified: branches/MonoDevelop-generate-what/build/data/resources/icons/Icons.16x16.OutputIcon
===================================================================
(Binary files differ)

Modified: branches/MonoDevelop-generate-what/build/data/resources/icons/Icons.16x16.SplitWindow
===================================================================
(Binary files differ)

Modified: branches/MonoDevelop-generate-what/build/data/resources/icons/Icons.16x16.TaskListIcon
===================================================================
(Binary files differ)

Modified: branches/MonoDevelop-generate-what/build/data/resources/icons/Icons.16x16.ToggleBookmark
===================================================================
(Binary files differ)

Modified: branches/MonoDevelop-generate-what/build/data/templates/file/CSharp/EmptyCSharpFile.xft
===================================================================
--- branches/MonoDevelop-generate-what/build/data/templates/file/CSharp/EmptyCSharpFile.xft	2004-04-29 13:21:50 UTC (rev 1547)
+++ branches/MonoDevelop-generate-what/build/data/templates/file/CSharp/EmptyCSharpFile.xft	2004-04-29 13:32:13 UTC (rev 1548)
@@ -10,7 +10,7 @@
 	</TemplateConfiguration>
 	
 	<TemplateFiles>
-		<File DefaultExtension=".cs" DefaultName="EmptyC#file">
+		<File DefaultExtension=".cs" DefaultName="EmptyCSharpfile">
 			<![CDATA[// created on ${Date} at ${Time}]]>
 		</File>
 	</TemplateFiles>

Modified: branches/MonoDevelop-generate-what/docs/SourceMap.html
===================================================================
--- branches/MonoDevelop-generate-what/docs/SourceMap.html	2004-04-29 13:21:50 UTC (rev 1547)
+++ branches/MonoDevelop-generate-what/docs/SourceMap.html	2004-04-29 13:32:13 UTC (rev 1548)
@@ -1,7 +1,7 @@
 <html>
   <head>
     <title>MonoDevelop source map</title>
-  <head>
+  </head>
 
   <body>
     <h3>Introduction</h3>

Modified: branches/MonoDevelop-generate-what/docs/Translations.html
===================================================================
--- branches/MonoDevelop-generate-what/docs/Translations.html	2004-04-29 13:21:50 UTC (rev 1547)
+++ branches/MonoDevelop-generate-what/docs/Translations.html	2004-04-29 13:32:13 UTC (rev 1548)
@@ -1,7 +1,7 @@
 <html>
   <head>
     <title>Translations in MonoDevelop</title>
-  <head>
+  </head>
   <body>
     <h3>Introduction</h3>
 	<p>MonoDevelop has chosen to use gettext instead of resources
@@ -18,6 +18,8 @@
 	  </li>
 	  <li>Add files with these strings to MonoDevelop/po/POTFILES.in</li>
 	</ol>
+	FIXME add info about checking for missing files in POTFILES.in
+	glade, xml files
 	</p>
 	<h3>Translators</h3>
 	<p>See <a href="http://www.gnome.org/i18n/">Gnome I18N</a> for
@@ -28,6 +30,7 @@
       <li><a href="http://developer.gnome.org/projects/gtp/resources.html">Resources</a></li>
 	</ul>
 	<ol>
+	  //FIXME how do you do this:
 	  <li>Create xx_XX.po (based on you Language code)</li>
 	  <li>Translate the strings</li>
 	  <li>add your language code to ALL_LINGUAS in configure.in</li>

Modified: branches/MonoDevelop-generate-what/docs/WritingAddIns.html
===================================================================
--- branches/MonoDevelop-generate-what/docs/WritingAddIns.html	2004-04-29 13:21:50 UTC (rev 1547)
+++ branches/MonoDevelop-generate-what/docs/WritingAddIns.html	2004-04-29 13:32:13 UTC (rev 1548)
@@ -1,7 +1,7 @@
 <html>
   <head>
     <title>Writing an addin for MonoDevelop</title>
-  <head>
+  </head>
   <body>
     <h3>Introduction</h3>
 	<p>MonoDevelop (and SharpDevelop) have been written so that they
@@ -10,7 +10,8 @@
 	the code for your addin.  Second, providing an .addin XML file that
     maps your code into MonoDevelop.  There is a detailed pdf available
     at SharpDevelop's website <a href="http://www.icsharpcode.net/TechNotes/ProgramArchitecture.pdf">here</a> that you will want to read for a 
-    full understanding of the entire system and possiblities.  This is
+    full understanding of the entire system and possiblities.  The
+	SharpDevelop book has information on this as well.  This is
     intended as a simple and quick overview.</p>
 
 	<h3>Terms</h3>
@@ -109,7 +110,10 @@
 
 	<h3>AddIn tree</h3>
 	<p>The various addins are loaded and merge into an AddInTree, which
-	is how the IDE knows what and where to load</p>
+	is how the IDE knows what and where to load.  Look at
+	<code>build/AddIns/SharpDevelopCore.addin.xml</code> to see the
+	various places to attach your addin, such as the menu items.
+	</p>
 
     <h3>AddIn xml format</h3>
 	<p>There is an AddIn.xsd file that specifies the required/optional
@@ -122,6 +126,19 @@
     will want to make sure both your .addin.xml file and .dll are placed
     into the AddIn directory in both places.  <b>Note:</b> this this may change
     at some point in the future.</p>
+	<p>For those not familiar with autoconf/automake here is a brief
+	description of what you need to do, if you are wanting to add your
+	addin to the current build process.  This will not be required when
+	we are self-hosting.  Have a Makefile.am that compiles and installs
+	your dll and addin.xml files.  I highly recommend you copy one of
+	the existing ones as a reference.  Add
+	<code>path/to/your/addin/Makefile</code> to the
+	<code>AC_OUTPUT</code> section of configure.in. 
+	This creates the Makefile from Makefile.am.  In the parent
+	directory of your addin add your directory to the SUBDIRS variable.
+	If you are especially prudent you can make sure
+	<code>make distcheck</code> from the top directory still works.
+	</p>
 
 	<h3>Existing Examples</h3>
 <ul>
@@ -143,6 +160,12 @@
 	suggestions on making sharing things as easy as possible would be
 	appreciated.</p>
 
+	<h3>Internationalization</h3>
+	<p>Since we are using Gettext and not resources, you will want to
+	read the translation guide as that is handled in a
+	different way than SharpDevelop, and deserves its own explanation.
+	</p>
+
     <h3>AddIn ideas</h3>
     <p>There are various things that would be nice to have implemented
     as addins.  Here is a brief list of the top of my head.

Modified: branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs	2004-04-29 13:21:50 UTC (rev 1547)
+++ branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs	2004-04-29 13:32:13 UTC (rev 1548)
@@ -302,17 +302,22 @@
 			
 			ArrayList compile_files = new ArrayList ();
 			ArrayList gac_references = new ArrayList ();
+			ArrayList assembly_references = new ArrayList ();
+			ArrayList project_references = new ArrayList ();
+			ArrayList resources = new ArrayList ();
 			
 			foreach (ProjectFile finfo in project.ProjectFiles) {
 				if (finfo.Subtype != Subtype.Directory) {
 					switch (finfo.BuildAction) {
 					case BuildAction.Compile:
 						string rel_path = fileUtilityService.AbsoluteToRelativePath (project.BaseDirectory, Path.GetDirectoryName (finfo.Name));
+						if (CanCompile (finfo.Name));
 						compile_files.Add (Path.Combine (rel_path, Path.GetFileName (finfo.Name)));
 						break;
 						
 					case BuildAction.EmbedAsResource:
-						//writer.WriteLine("--linkres " + finfo.Name);
+						string resource_rel_path = fileUtilityService.AbsoluteToRelativePath (project.BaseDirectory, Path.GetDirectoryName (finfo.Name));
+						resources.Add (Path.Combine (resource_rel_path, Path.GetFileName (finfo.Name)));
 						break;
 					}
 				}
@@ -321,9 +326,28 @@
 			foreach (ProjectReference lib in project.ProjectReferences) {
 				switch (lib.ReferenceType) {
 				case ReferenceType.Gac:
-					string fileName = lib.GetReferencedFileName(project);
-					gac_references.Add (Path.GetFileNameWithoutExtension (fileName));
+					string gac_fileName = lib.GetReferencedFileName (project);
+					gac_references.Add (Path.GetFileNameWithoutExtension (gac_fileName));
 					break;
+				case ReferenceType.Assembly:
+					string assembly_fileName = lib.GetReferencedFileName (project);
+					string rel_path_to = fileUtilityService.AbsoluteToRelativePath (project.BaseDirectory, Path.GetDirectoryName (assembly_fileName));
+					assembly_references.Add (Path.Combine (rel_path_to, Path.GetFileName (assembly_fileName)));
+					break;
+				case ReferenceType.Project:
+					string project_fileName = lib.GetReferencedFileName (project);
+					IProjectService prjService = (IProjectService)ServiceManager.Services.GetService (typeof (IProjectService));
+					ArrayList allProjects = Combine.GetAllProjects(prjService.CurrentOpenCombine);
+					
+					foreach (ProjectCombineEntry projectEntry in allProjects) {
+						if (projectEntry.Project.Name == lib.Reference) {
+							string project_base_dir = fileUtilityService.AbsoluteToRelativePath (project.BaseDirectory, projectEntry.Project.BaseDirectory);
+							
+							string project_output_fileName = prjService.GetOutputAssemblyName (projectEntry.Project);
+							project_references.Add (Path.Combine (project_base_dir, Path.GetFileName (project_output_fileName)));
+						}
+					}
+					break;
 				}
 			}
 
@@ -335,8 +359,20 @@
 				else
 					stream.WriteLine ();
 			}
+			stream.WriteLine ();
 
+			stream.WriteLine ("RESOURCES = \\");
+			for (int i = 0; i < resources.Count; i++) {
+				stream.Write (resources[i]);
+				if (i != resources.Count - 1)
+					stream.WriteLine (" \\");
+				else
+					stream.WriteLine ();
+			}
 			stream.WriteLine ();
+			stream.WriteLine ("RESOURCES_BUILD = $(foreach res,$(RESOURCES), $(addprefix -resource:,$(res)),$(notdir $(res)))");
+
+			stream.WriteLine ();
 			stream.WriteLine ("GAC_REFERENCES = \\");
 			for (int i = 0; i < gac_references.Count; i++) {
 				stream.Write (gac_references[i]);
@@ -350,11 +386,41 @@
 			stream.WriteLine ("GAC_REFERENCES_BUILD = $(addprefix /r:, $(GAC_REFERENCES))");
 			stream.WriteLine ();
 
+			stream.WriteLine ("ASSEMBLY_REFERENCES = \\");
+			for (int i = 0; i < assembly_references.Count; i++) {
+				stream.Write (assembly_references[i]);
+				if (i != assembly_references.Count - 1)
+					stream.WriteLine (" \\");
+				else
+					stream.WriteLine ();
+			}
+
+			stream.WriteLine ();
+			stream.WriteLine ("ASSEMBLY_REFERENCES_BUILD = $(addprefix /r:, $(ASSEMBLY_REFERENCES))");
+			stream.WriteLine ();
+
+			stream.WriteLine ("PROJECT_REFERENCES = \\");
+			for (int i = 0; i < project_references.Count; i++) {
+				stream.Write (project_references[i]);
+				if (i != project_references.Count - 1)
+					stream.WriteLine (" \\");
+				else
+					stream.WriteLine ();
+			}
+
+			stream.WriteLine ();
+			stream.WriteLine ("PROJECT_REFERENCES_BUILD = $(addprefix /r:, $(PROJECT_REFERENCES))");
+			stream.WriteLine ();
+
 			stream.WriteLine ("all: " + outputName);
 			stream.WriteLine ();
 			
-			stream.WriteLine (outputName + ": $(SOURCES)");
-			stream.WriteLine ("\tmcs /target:{0} /out:{1} $(GAC_REFERENCES_BUILD) $(SOURCES)", target, outputName);
+			stream.WriteLine (outputName + ": $(SOURCES) $(RESOURCES)");
+			stream.WriteLine ("\tmcs /target:{0} /out:{1} $(RESOURCES_BUILD) $(GAC_REFERENCES_BUILD) $(ASSEMBLY_REFERENCES_BUILD) $(PROJECT_REFERENCES_BUILD) $(SOURCES)", target, outputName);
+
+			stream.WriteLine ();
+			stream.WriteLine ("clean:");
+			stream.WriteLine ("\trm -f {0}", outputName);
 			
 			stream.Flush ();
 			stream.Close ();

Modified: branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingExecutionManager.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingExecutionManager.cs	2004-04-29 13:21:50 UTC (rev 1547)
+++ branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingExecutionManager.cs	2004-04-29 13:32:13 UTC (rev 1548)
@@ -68,11 +68,11 @@
 				psi = new ProcessStartInfo("\"" + parameters.ExecuteScript + "\"");
 				psi.UseShellExecute = false;
 			} else {
-				string runtimeStarter = "mono ";
+				string runtimeStarter = "mono --debug ";
 				
 				switch (parameters.NetRuntime) {
 					case NetRuntime.Mono:
-						runtimeStarter = "mono ";
+						runtimeStarter = "mono --debug ";
 						break;
 					case NetRuntime.MonoInterpreter:
 						runtimeStarter = "mint ";

Modified: branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/ChangeLog
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/ChangeLog	2004-04-29 13:21:50 UTC (rev 1547)
+++ branches/MonoDevelop-generate-what/src/AddIns/BackendBindings/CSharpBinding/ChangeLog	2004-04-29 13:32:13 UTC (rev 1548)
@@ -3,8 +3,27 @@
 	* Parser/Resolver.cs: changed to reflect creation of the
 	CompletionDataService
 
+2004-04-29  Todd Berman  <tberman at sevenl.net>
+
+	* CSharpBindingCompilerManager.cs: add a clean target
+
 2004-04-28  Todd Berman  <tberman at sevenl.net>
 
+	* CSharpBindingExecutionManager.cs: People running apps from the IDE
+	can be assumed to want line numbers if we can give them. Adding --debug
+	to the execution.
+
+2004-04-28  Todd Berman  <tberman at sevenl.net>
+
+	* CSharpBindingCompilerManager.cs: add code for project references.
+
+2004-04-28  Todd Berman  <tberman at sevenl.net>
+
+	* CSharpBindingCompilerManger.cs: add code for assembly references
+	and embeding resources.
+
+2004-04-28  Todd Berman  <tberman at sevenl.net>
+
 	* CSharpLanguageBinding.cs: implemented GetMakefile passthru.
 	* CSharpBindingCompilerManager.cs: dirty dirty dirty first draft run
 	through of GenerateMakefile, I have tested this with exactly *one*

Modified: branches/MonoDevelop-generate-what/src/AddIns/DebuggerAddIn/ChangeLog
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/DebuggerAddIn/ChangeLog	2004-04-29 13:21:50 UTC (rev 1547)
+++ branches/MonoDevelop-generate-what/src/AddIns/DebuggerAddIn/ChangeLog	2004-04-29 13:32:13 UTC (rev 1548)
@@ -1,3 +1,9 @@
+2004-04-29  Todd Berman  <tberman at sevenl.net>
+
+	* Makefile.am: dont build debugger for now. will add info in configure
+	soon
+	* DebuggingService.cs: bring up to speed with debugger from cvs.
+
 2004-04-04  Todd Berman  <tberman at sevenl.net>
 
 	* Makefile.am: change to .addin.xml for i18n
@@ -4,7 +10,6 @@
 	* MonoDevelopDebugger.addin.xml: mv
 	* MonoDevelopDebugger.addin: rm
 
-
 2004-03-29  Todd Berman  <tberman at sevenl.net>
 
 	* Gui/DebuggerVariablePad.cs: use AmbienceService to convert from

Modified: branches/MonoDevelop-generate-what/src/AddIns/DebuggerAddIn/DebuggingService.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/DebuggerAddIn/DebuggingService.cs	2004-04-29 13:21:50 UTC (rev 1547)
+++ branches/MonoDevelop-generate-what/src/AddIns/DebuggerAddIn/DebuggingService.cs	2004-04-29 13:32:13 UTC (rev 1548)
@@ -219,7 +219,7 @@
 
 			backend = new DebuggerBackend ();
 			backend.ThreadManager.InitializedEvent += new ThreadEventHandler (initialized_event);
-			backend.Run (ProcessStart.Create (null, argv));
+			backend.Run (new ProcessStart (null, argv));
 		}
 
 		public void Stop ()

Modified: branches/MonoDevelop-generate-what/src/AddIns/DebuggerAddIn/Makefile.am
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/DebuggerAddIn/Makefile.am	2004-04-29 13:21:50 UTC (rev 1547)
+++ branches/MonoDevelop-generate-what/src/AddIns/DebuggerAddIn/Makefile.am	2004-04-29 13:32:13 UTC (rev 1548)
@@ -18,8 +18,10 @@
 
 if ENABLE_DEBUGGER
 
-all: $(ASSEMBLY)
+#all: $(ASSEMBLY)
+all:
 
+
 build_sources = $(addprefix $(srcdir)/, $(FILES))
 
 ../../../build/AddIns/$(ADDIN):

Modified: branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2004-04-29 13:21:50 UTC (rev 1547)
+++ branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2004-04-29 13:32:13 UTC (rev 1548)
@@ -3,6 +3,11 @@
 	* CodeCompletion/CodeCompletionDataProvider.cs: changed to
 	reflect creation of the CompletionDataService
 
+2004-04-28  Pawel Rozanski  <tokugawa at afn.no-ip.org>
+
+	* Gui/SourceEditorDisplayBinding.cs: added a case for setting mime for
+	new Nemerle files.
+
 2004-04-27  Todd Berman  <tberman at sevenl.net>
 
 	* Gui/SourceEditorDisplayBinding.cs: workaround some to reduce the

Modified: branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs	2004-04-29 13:21:50 UTC (rev 1547)
+++ branches/MonoDevelop-generate-what/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs	2004-04-29 13:32:13 UTC (rev 1548)
@@ -75,6 +75,9 @@
 				//case language "VBNET":
 				//	language = "text/x-vbnet";
 				//	break;
+				case "NEMERLE":
+					language = "text/x-nemerle";
+					break;
 				default:
 					language = "text/plain";
 					break;

Modified: branches/MonoDevelop-generate-what/src/Main/Base/ChangeLog
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/ChangeLog	2004-04-29 13:21:50 UTC (rev 1547)
+++ branches/MonoDevelop-generate-what/src/Main/Base/ChangeLog	2004-04-29 13:32:13 UTC (rev 1548)
@@ -15,6 +15,11 @@
 
 2004-04-28  Todd Berman  <tberman at sevenl.net>
 
+	* Internal/Project/Project/AbstractProject.cs: Actually make that check
+	and the others like it work.
+
+2004-04-28  Todd Berman  <tberman at sevenl.net>
+
 	* Internal/Project/Project/AbstractProject.cs: For now, dont ask
 	to add new Makefiles.
 

Modified: branches/MonoDevelop-generate-what/src/Main/Base/Internal/Project/Project/AbstractProject.cs
===================================================================
--- branches/MonoDevelop-generate-what/src/Main/Base/Internal/Project/Project/AbstractProject.cs	2004-04-29 13:21:50 UTC (rev 1547)
+++ branches/MonoDevelop-generate-what/src/Main/Base/Internal/Project/Project/AbstractProject.cs	2004-04-29 13:32:13 UTC (rev 1548)
@@ -201,10 +201,11 @@
 			StringCollection newFiles   = new StringCollection();
 			StringCollection collection = fileUtilityService.SearchDirectory(basedirectory, "*");
 
-			foreach (string file in collection) {
-				string extension = Path.GetExtension(file).ToUpper();
+			foreach (string sfile in collection) {
+				string extension = Path.GetExtension(sfile).ToUpper();
+				string file = Path.GetFileName (sfile);
 
-				if (!IsFileInProject(file) &&
+				if (!IsFileInProject(sfile) &&
 				     extension != ".SCC" &&  // source safe control files -- Svante Lidmans
 				     extension != ".DLL" &&
 				     extension != ".PDB" &&
@@ -216,10 +217,10 @@
 				     !file.StartsWith (".") &&
 				     !Path.GetDirectoryName(file).EndsWith("CVS") &&
 				     !Path.GetDirectoryName(file).EndsWith(".svn") &&
-					 !file.StartsWith ("Makefile") &&
+				     !file.StartsWith ("Makefile") &&
 				     !Path.GetDirectoryName(file).EndsWith("ProjectDocumentation")) {
 
-					newFiles.Add(file);
+					newFiles.Add(sfile);
 				}
 			}
 			




More information about the Monodevelop-patches-list mailing list