From aefe0f98c2743e47b0e4bf3d8ea0152606b46232 Mon Sep 17 00:00:00 2001 From: Kevin Glynn Date: Fri, 9 Sep 2011 13:32:22 +0200 Subject: [PATCH] make excludes agnostic to trailing directory characters --- .../antlr3/src/CS2JTranslator/CS2JMain/CS2JMain.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JMain/CS2JMain.cs b/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JMain/CS2JMain.cs index 7a94ade..a862d07 100644 --- a/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JMain/CS2JMain.cs +++ b/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JMain/CS2JMain.cs @@ -83,7 +83,10 @@ namespace Twiglet.CS2J.Translator private static void addDirectories(IList strs, string rawStr) { string[] argDirs = rawStr.Split(';'); for (int i = 0; i < argDirs.Length; i++) - strs.Add(Path.GetFullPath(argDirs[i])); + { + string dir = Path.GetFullPath(argDirs[i]).TrimEnd(Path.DirectorySeparatorChar); + strs.Add(dir); + } } private static void addStrings(IList strs, string rawStr) { @@ -277,7 +280,7 @@ namespace Twiglet.CS2J.Translator { string canonicalPath = Path.GetFullPath(root); // If this is a directory, walk each file/dir in that directory - if (excludes == null || !excludes.Contains(canonicalPath)) + if (excludes == null || !excludes.Contains(canonicalPath.TrimEnd(Path.DirectorySeparatorChar))) { if (Directory.Exists(canonicalPath)) {