Added a -d/--debug option for wrapping the Qt debug libraries.

Signed-off-by: Dimitar Dobrev <[email protected]>

Author: ddobrev

QtSharp.CLI/Program.cs

@@ -24,14 +24,15 @@ public static int Main(string[] args)
             if (!File.Exists(qmake))
             {
                 Console.WriteLine("The specified qmake does not exist.");
-                return -1;
+                return 1;
             }
             string make = args[1];
             if (!File.Exists(make))
             {
                 Console.WriteLine("The specified make does not exist.");
-                return -1;
+                return 1;
             }
+            var debug = args.Length > 2 && (args[2] == "d" || args[2] == "debug");
 
             ConsoleLogger logredirect = new ConsoleLogger();
             logredirect.CreateLogDirectory();
@@ -45,30 +46,30 @@ public static int Main(string[] args)
             if (!string.IsNullOrEmpty(error))
             {
                 Console.WriteLine(error);
-                return -1;
+                return 1;
             }
             DirectoryInfo libsInfo = new DirectoryInfo(libs);
             if (!libsInfo.Exists)
             {
                 Console.WriteLine(
                     "The directory \"{0}\" that qmake returned as the lib direcory of the Qt installation, does not exist.",
                     libsInfo.Name);
-                return -1;
+                return 1;
             }
-            ICollection<string> libFiles = GetLibFiles(libsInfo);
+            ICollection<string> libFiles = GetLibFiles(libsInfo, debug);
             string headers = ProcessHelper.Run(qmake, "-query QT_INSTALL_HEADERS", out error);
             if (!string.IsNullOrEmpty(error))
             {
                 Console.WriteLine(error);
-                return -1;
+                return 1;
             }
             DirectoryInfo headersInfo = new DirectoryInfo(headers);
             if (!headersInfo.Exists)
             {
                 Console.WriteLine(
                     "The directory \"{0}\" that qmake returned as the header direcory of the Qt installation, does not exist.",
                     headersInfo.Name);
-                return -1;
+                return 1;
             }
             string docs = ProcessHelper.Run(qmake, "-query QT_INSTALL_DOCS", out error);
             string emptyFile = Environment.OSVersion.Platform == PlatformID.Win32NT ? "NUL" : "/dev/null";
@@ -95,6 +96,13 @@ public static int Main(string[] args)
                 }
             }
             var modules = new List<string> { "Qt5Core", "Qt5Gui", "Qt5Widgets", "Qt5Xml", "Qt5Designer" };
+            if (debug)
+            {
+                for (var i = 0; i < modules.Count; i++)
+                {
+                    modules[i] += "d";
+                }
+            }
             libFiles = libFiles.TopologicalSort(l => dependencies.ContainsKey(l) ? dependencies[l] : Enumerable.Empty<string>());
             var wrappedModules = new List<KeyValuePair<string, string>>(modules.Count);
             var astContexts = new List<ASTContext>(libFiles.Count);
@@ -130,7 +138,7 @@ public static int Main(string[] args)
             if (wrappedModules.Count == 0)
             {
                 Console.WriteLine("Generation failed.");
-                return 0;
+                return 1;
             }
 
             var qtSharpZip = "QtSharp.zip";
@@ -156,14 +164,22 @@ public static int Main(string[] args)
             return 0;
         }
 
-        private static IList<string> GetLibFiles(DirectoryInfo libsInfo)
+        private static IList<string> GetLibFiles(DirectoryInfo libsInfo, bool debug)
         {
             List<string> modules = (from file in libsInfo.EnumerateFiles()
                                     where Regex.IsMatch(file.Name, @"^Qt\d?\w+\.\w+$")
                                     select file.Name).ToList();
-            for (int i = modules.Count - 1; i >= 0; i--)
+            for (var i = modules.Count - 1; i >= 0; i--)
             {
-                modules.Remove(Path.GetFileNameWithoutExtension(modules[i]) + "d" + Path.GetExtension(modules[i]));
+                var module = Path.GetFileNameWithoutExtension(modules[i]);
+                if (debug && module != null && !module.EndsWith("d"))
+                {
+                    modules.Remove(module + Path.GetExtension(modules[i]));                    
+                }
+                else
+                {
+                    modules.Remove(module + "d" + Path.GetExtension(modules[i]));                    
+                }
             }
             return modules;
         }

QtSharp/QtSharp.cs

@@ -19,7 +19,7 @@ public QtSharp(QtModuleInfo qtModuleInfo, List<ASTContext> dependencies)
             this.dependencies = dependencies;
             this.qmake = qtModuleInfo.Qmake;
             this.includePath = qtModuleInfo.IncludePath.Replace('/', Path.DirectorySeparatorChar);
-            this.module = Regex.Match(qtModuleInfo.Library, @"Qt\d?(?<module>\w+)\.\w+$").Groups["module"].Value;
+            this.module = Regex.Match(qtModuleInfo.Library, @"Qt\d?(?<module>\w+?)d?\.\w+$").Groups["module"].Value;
             this.libraryPath = qtModuleInfo.LibraryPath.Replace('/', Path.DirectorySeparatorChar);
             this.library = qtModuleInfo.Library;
             this.target = qtModuleInfo.Target;