Author: mhutch
Date: 2008-02-13 14:53:13 -0500 (Wed, 13 Feb 2008)
New Revision: 95594
Modified:
branches/monodevelop/main/1.0/src/addins/CBinding/ChangeLog
branches/monodevelop/main/1.0/src/addins/CBinding/Compiler/GNUCompiler.cs
Log:
2008-02-13 Marcos David Mar?\195?\173n Amador <[EMAIL PROTECTED]>
* Compiler/GNUCompiler.cs: Make sure directory exists before attempting
to
delete it.
2008-02-13 Marcos David Mar?\195?\173n Amador <[EMAIL PROTECTED]>
* Compiler/GNUCompiler.cs: Use string.Join instead of custom method.
Modified: branches/monodevelop/main/1.0/src/addins/CBinding/ChangeLog
===================================================================
--- branches/monodevelop/main/1.0/src/addins/CBinding/ChangeLog 2008-02-13
19:50:33 UTC (rev 95593)
+++ branches/monodevelop/main/1.0/src/addins/CBinding/ChangeLog 2008-02-13
19:53:13 UTC (rev 95594)
@@ -1,3 +1,12 @@
+2008-02-13 Marcos David Marín Amador <[EMAIL PROTECTED]>
+
+ * Compiler/GNUCompiler.cs: Make sure directory exists before attempting
to
+ delete it.
+
+2008-02-13 Marcos David Marín Amador <[EMAIL PROTECTED]>
+
+ * Compiler/GNUCompiler.cs: Use string.Join instead of custom method.
+
2008-02-07 Michael Hutchinson <[EMAIL PROTECTED]>
* Parser/TagDatabaseManager.cs: Improve error handling. Should fix "Bug
Modified:
branches/monodevelop/main/1.0/src/addins/CBinding/Compiler/GNUCompiler.cs
===================================================================
--- branches/monodevelop/main/1.0/src/addins/CBinding/Compiler/GNUCompiler.cs
2008-02-13 19:50:33 UTC (rev 95593)
+++ branches/monodevelop/main/1.0/src/addins/CBinding/Compiler/GNUCompiler.cs
2008-02-13 19:53:13 UTC (rev 95594)
@@ -330,7 +330,7 @@
{
if (!NeedsUpdate (projectFiles, outputName)) return;
- string objectFiles = StringArrayToSingleString
(ObjectFiles (projectFiles, true));
+ string objectFiles = string.Join (" ", ObjectFiles
(projectFiles, true));
string pkgargs = GeneratePkgLinkerArgs (packages);
StringBuilder args = new StringBuilder ();
CCompilationParameters cp =
@@ -369,7 +369,7 @@
{
if (!NeedsUpdate (projectFiles, outputName)) return;
- string objectFiles = StringArrayToSingleString
(ObjectFiles (projectFiles, true));
+ string objectFiles = string.Join (" ", ObjectFiles
(projectFiles, true));
string args = string.Format ("rcs \"{0}\" {1}",
outputName, objectFiles);
monitor.BeginTask (GettextCatalog.GetString
("Generating static library {0} from object files", Path.GetFileName
(outputName)), 1);
@@ -389,7 +389,7 @@
{
if (!NeedsUpdate (projectFiles, outputName)) return;
- string objectFiles = StringArrayToSingleString
(ObjectFiles (projectFiles, true));
+ string objectFiles = string.Join (" ", ObjectFiles
(projectFiles, true));
string pkgargs = GeneratePkgLinkerArgs (packages);
StringBuilder args = new StringBuilder ();
CCompilationParameters cp =
@@ -549,31 +549,29 @@
}
CleanPrecompiledHeaders (configuration);
-
}
void CleanPrecompiledHeaders (CProjectConfiguration
configuration)
{
string precDir = Path.Combine
(configuration.SourceDirectory, ".prec");
+
+ if (string.IsNullOrEmpty (precDir))
+ return;
+
string precConfigDir = Path.Combine (precDir,
configuration.Name);
+
+ if (string.IsNullOrEmpty (precConfigDir))
+ return;
+
if (Directory.Exists (precConfigDir))
Directory.Delete (precConfigDir, true);
- if (Directory.GetFiles (precDir).Length == 0 &&
Directory.GetDirectories (precDir).Length == 0)
+
+ if (Directory.Exists (precDir) &&
+ Directory.GetFiles (precDir).Length == 0 &&
+ Directory.GetDirectories (precDir).Length == 0)
Directory.Delete (precDir);
}
-
- private string StringArrayToSingleString (string[] array)
- {
- StringBuilder str = new StringBuilder ();
-
- foreach (string s in array) {
- str.Append (s + " ");
- }
-
- return str.ToString ();
- }
-
private bool NeedsUpdate (ProjectFileCollection projectFiles,
string target)
{
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
