[Monodevelop-patches-list] r1656 - in trunk/MonoDevelop: . src/AddIns/BackendBindings/CSharpBinding src/Main/Base src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode src/Main/Base/Internal/Project/Combine
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Thu May 27 14:48:25 EDT 2004
Author: tberman
Date: 2004-05-27 14:48:25 -0400 (Thu, 27 May 2004)
New Revision: 1656
Modified:
trunk/MonoDevelop/ChangeLog
trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs
trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/ChangeLog
trunk/MonoDevelop/src/Main/Base/ChangeLog
trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/CombineBrowserNode.cs
trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/Combine.cs
Log:
missed changelog from before, fixup makefile spacing issues, and check that solutions are not named with invalid characters. This list may need to get bigger, or potentially just allow [a-zA-z0-9], not sure.
Modified: trunk/MonoDevelop/ChangeLog
===================================================================
--- trunk/MonoDevelop/ChangeLog 2004-05-27 17:14:26 UTC (rev 1655)
+++ trunk/MonoDevelop/ChangeLog 2004-05-27 18:48:25 UTC (rev 1656)
@@ -1,3 +1,11 @@
+2004-05-27 Todd Berman <tberman at sevenl.net>
+
+ * *: Lots of new files, usable for editing MD within MD.
+ Building is not supported, either via the internal build system or
+ the generate makefiles, both will most likely break horribly.
+ These project files are first draft, and are most likely missing
+ references, and other needed info.
+
2004-05-27 Martin Willemoes Hansen <mwh at sysrq.dk>
* po/da_DK.po: Additional translations and corrections
Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs 2004-05-27 17:14:26 UTC (rev 1655)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/CSharpBindingCompilerManager.cs 2004-05-27 18:48:25 UTC (rev 1656)
@@ -279,7 +279,7 @@
public void GenerateMakefile (IProject project, Combine parentCombine)
{
- StreamWriter stream = new StreamWriter (Path.Combine (project.BaseDirectory, "Makefile." + project.Name));
+ StreamWriter stream = new StreamWriter (Path.Combine (project.BaseDirectory, "Makefile." + project.Name.Replace (" ", "")));
CSharpProject p = (CSharpProject)project;
CSharpCompilerParameters compilerparameters = (CSharpCompilerParameters)p.ActiveConfiguration;
@@ -363,7 +363,7 @@
stream.WriteLine ();
stream.WriteLine ("SOURCES = \\");
for (int i = 0; i < compile_files.Count; i++) {
- stream.Write (compile_files[i]);
+ stream.Write (((string)compile_files[i]).Replace (" ", "\\ "));
if (i != compile_files.Count - 1)
stream.WriteLine (" \\");
else
@@ -374,7 +374,7 @@
if (resources.Count > 0) {
stream.WriteLine ("RESOURCES = \\");
for (int i = 0; i < resources.Count; i++) {
- stream.Write (resources[i]);
+ stream.Write (((string)resources[i]).Replace (" ", "\\ "));
if (i != resources.Count - 1)
stream.WriteLine (" \\");
else
Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/ChangeLog 2004-05-27 17:14:26 UTC (rev 1655)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/ChangeLog 2004-05-27 18:48:25 UTC (rev 1656)
@@ -1,3 +1,8 @@
+2004-05-27 Todd Berman <tberman at sevenl.net>
+
+ * CSharpBindingCompilerManager.cs: fix up projects with space in
+ their name.
+
2004-05-26 Todd Berman <tberman at sevenl.net>
* CSharpBindingCompilerManager.cs: more makefile magic.
Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog 2004-05-27 17:14:26 UTC (rev 1655)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog 2004-05-27 18:48:25 UTC (rev 1656)
@@ -1,5 +1,12 @@
2004-05-27 Todd Berman <tberman at sevenl.net>
+ * Internal/Project/Project/Combine.cs: properly handle spaces in the
+ solution and project names.
+ * Gui/Pads/ProjectBrowser/BrowserNode/CombineBrowserNode.cs: check
+ for invalid characters.
+
+2004-05-27 Todd Berman <tberman at sevenl.net>
+
* Internal/Project/Project/AbstractProject.cs: Properly ignore
.svn and CVS directories.
* Gui/Pads/ClassScout/ClassScout.cs: Properly work around potential
Modified: trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/CombineBrowserNode.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/CombineBrowserNode.cs 2004-05-27 17:14:26 UTC (rev 1655)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Pads/ProjectBrowser/BrowserNode/CombineBrowserNode.cs 2004-05-27 18:48:25 UTC (rev 1656)
@@ -55,12 +55,21 @@
public override void AfterLabelEdit(string newName)
{
- if (newName != null && newName.Trim().Length > 0) {
+ if (newName != null && newName.Trim().Length > 0 && ContainsNoInvalidChars (newName)) {
combine.Name = newName;
}
UpdateCombineName (null, EventArgs.Empty);
}
+ bool ContainsNoInvalidChars (string name)
+ {
+ if (name.IndexOfAny (new char [] { '\'', '(', ')', '"', '{', '}', '|' } ) != -1) {
+ ((MessageService)ServiceManager.Services.GetService (typeof (MessageService))).ShowError (String.Format (GettextCatalog.GetString ("Solution name may not contain any of the following characters: {0}"), "', (, ), \", {, }, |"));
+ return false;
+ }
+ return true;
+ }
+
public override void UpdateNaming()
{
UpdateCombineName(this, EventArgs.Empty);
Modified: trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/Combine.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/Combine.cs 2004-05-27 17:14:26 UTC (rev 1655)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Project/Combine/Combine.cs 2004-05-27 18:48:25 UTC (rev 1656)
@@ -18,7 +18,6 @@
using Mono.Posix;
using FileMode = Mono.Posix.FileMode;
-
using MonoDevelop.Core.Services;
using MonoDevelop.Services;
@@ -643,13 +642,13 @@
buildstream.WriteLine ("# This file is autogenerated by MonoDevelop");
buildstream.WriteLine ("# Do not edit it.");
buildstream.WriteLine ();
- buildstream.WriteLine ("make -f Makefile.solution.{0} \"$@\"", Name);
+ buildstream.WriteLine ("make -f Makefile.solution.{0} \"$@\"", Name.Replace (" ",""));
buildstream.Flush ();
buildstream.Close ();
Syscall.chmod (Path.Combine (path, "make.sh"), FileMode.S_IRUSR | FileMode.S_IWUSR | FileMode.S_IXUSR | FileMode.S_IRGRP | FileMode.S_IWGRP | FileMode.S_IROTH);
- StreamWriter stream = new StreamWriter (Path.Combine (path, "Makefile.solution." + Name));
+ StreamWriter stream = new StreamWriter (Path.Combine (path, "Makefile.solution." + Name.Replace (" ", "")));
stream.WriteLine ("# This file is autogenerated by MonoDevelop");
stream.WriteLine ("# Do not edit it.");
stream.WriteLine ();
@@ -658,7 +657,7 @@
stream.WriteLine ();
stream.Write ("all: depcheck __init ");
foreach (IProject proj in projects) {
- stream.Write ("Makefile.{0}.all ", proj.Name);
+ stream.Write ("Makefile.{0}.all ", proj.Name.Replace (" ",""));
}
stream.WriteLine ();
stream.WriteLine ();
@@ -669,14 +668,14 @@
stream.Write ("clean: ");
foreach (IProject proj in projects) {
- stream.Write ("Makefile.{0}.clean ", proj.Name);
+ stream.Write ("Makefile.{0}.clean ", proj.Name.Replace (" ", ""));
}
stream.WriteLine ();
stream.WriteLine ();
stream.Write ("depcheck: ");
foreach (IProject proj in projects) {
- stream.Write ("Makefile.{0}.depcheck ", proj.Name);
+ stream.Write ("Makefile.{0}.depcheck ", proj.Name.Replace (" ", ""));
}
stream.WriteLine ();
stream.WriteLine ();
@@ -694,7 +693,7 @@
foreach (IProject proj in projects) {
string relativeLocation = fileUtilityService.AbsoluteToRelativePath (path, proj.BaseDirectory);
- stream.WriteLine ("Makefile.{0}.%:", proj.Name);
+ stream.WriteLine ("Makefile.{0}.%:", proj.Name.Replace (" ", ""));
stream.WriteLine ("\t at cd {0} && $(MAKE) -f $(subst .$*,,$@) $*", relativeLocation);
stream.WriteLine ();
}
More information about the Monodevelop-patches-list
mailing list