diff options
author | Lluis Sanchez <lluis@novell.com> | 2008-07-01 02:57:37 +0400 |
---|---|---|
committer | Lluis Sanchez <lluis@novell.com> | 2008-07-01 02:57:37 +0400 |
commit | 976a1292bea69763e52467af226e9c1944420bf8 (patch) | |
tree | 56ac7c7bc6632fa1591b94393b4da8eae2472df8 | |
parent | 8d2e9ecd316c196b183b6cf423ed62616d10c953 (diff) |
2008-06-30 Lluis Sanchez Gual <lluis@novell.com> main-1.9
* Project/CProject.cs: Workaround for bug #402336. The previous
fix can be applied to the branch.
svn path=/branches/monodevelop/main/1.9/; revision=106941
-rw-r--r-- | main/src/addins/CBinding/ChangeLog | 5 | ||||
-rw-r--r-- | main/src/addins/CBinding/Project/CProject.cs | 14 |
2 files changed, 14 insertions, 5 deletions
diff --git a/main/src/addins/CBinding/ChangeLog b/main/src/addins/CBinding/ChangeLog index de98395511..ac033d16cc 100644 --- a/main/src/addins/CBinding/ChangeLog +++ b/main/src/addins/CBinding/ChangeLog @@ -1,3 +1,8 @@ +2008-06-30 Lluis Sanchez Gual <lluis@novell.com> + + * Project/CProject.cs: Workaround for bug #402336. The previous + fix can be applied to the branch. + 2008-06-25 Lluis Sanchez Gual <lluis@novell.com> * Project/CProject.cs: Don't set the build action for files when diff --git a/main/src/addins/CBinding/Project/CProject.cs b/main/src/addins/CBinding/Project/CProject.cs index a939c55e67..86adb92cb2 100644 --- a/main/src/addins/CBinding/Project/CProject.cs +++ b/main/src/addins/CBinding/Project/CProject.cs @@ -184,12 +184,16 @@ namespace CBinding public override bool IsCompileable (string fileName) { string ext = Path.GetExtension (fileName.ToUpper ()); + Console.WriteLine ("ppla: " + language); - if (language == Language.C) { - return (ext == ".C"); - } else { + // HACK: this is a workaround for bug #402336. + // The proper fix is already applied in trunk. + +// if (language == Language.C) { +// return (ext == ".C"); +// } else { return (0 <= Array.IndexOf (SourceExtensions, ext)); - } +// } } public override IEnumerable<SolutionItem> GetReferencedItems (string configuration) @@ -402,7 +406,7 @@ namespace CBinding { base.OnFileAddedToProject (e); - if (!Loading && !IsCompileable (e.ProjectFile.Name) && + if (!IsCompileable (e.ProjectFile.Name) && e.ProjectFile.BuildAction == BuildAction.Compile) { e.ProjectFile.BuildAction = BuildAction.Nothing; } |