Read symbols from inlines on OS X and removed the redundancies of QString.

Author: ddobrev

QtSharp.CLI/Program.cs

@@ -63,7 +63,7 @@ class QtVersion
 
         static List<QtVersion> FindQt()
         {
-            var home = Environment.GetFolderPath(System.Environment.SpecialFolder.Personal);
+            var home = Environment.GetFolderPath(Environment.SpecialFolder.Personal);
             var qts = new List<QtVersion>();
 
             var qtPath = Path.Combine(home, "Qt");
@@ -154,7 +154,7 @@ static bool QueryQt(QtVersion qt, bool debug)
             const string includeDirsRegex = @"#include <\.\.\.> search starts here:(?<includes>.+)End of search list";
             string allIncludes = Regex.Match(output, includeDirsRegex, RegexOptions.Singleline).Groups["includes"].Value;
             var includeDirs = allIncludes.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries)
-                .Select(s => s.Trim());
+                .Select(s => s.Trim()).ToList();
 
             const string frameworkDirectory = "(framework directory)";
 
@@ -187,7 +187,7 @@ static IEnumerable<string> ParseDependenciesFromLibtool(string libFile)
 
             var matches = Regex.Matches(libs.Groups[1].Value, @"-framework\s+(\w+)");
             var frameworks = matches.OfType<Match>().Select(m => m.Groups[1].Value)
-                .Where(s => s.StartsWith("Qt"));
+                .Where(s => s.StartsWith("Qt", StringComparison.Ordinal));
 
             if (Platform.IsMacOS)
                 frameworks = frameworks.Select(framework => framework + ".framework");
@@ -315,7 +315,7 @@ public static int Main(string[] args)
                 if (!Platform.IsWindows)
                     lib = lib.Replace("Qt", "Qt5");
 
-                if (!modules.Any(m => m == Path.GetFileNameWithoutExtension(lib)))
+                if (modules.All(m => m != Path.GetFileNameWithoutExtension(lib)))
                     continue;
 
                 if (log)
@@ -328,8 +328,8 @@ public static int Main(string[] args)
                     libFile, qt.Target, qt.SystemIncludeDirs, qt.FrameworkDirs, qt.Docs));
                 ConsoleDriver.Run(qtSharp);
 
-                if (File.Exists(qtSharp.LibraryName) && File.Exists(Path.Combine("release", qtSharp.InlinesLibraryName)))
-                    wrappedModules.Add(new KeyValuePair<string, string>(qtSharp.LibraryName, qtSharp.InlinesLibraryName));
+                if (File.Exists(qtSharp.LibraryName) && File.Exists(qtSharp.InlinesLibraryPath))
+                    wrappedModules.Add(new KeyValuePair<string, string>(qtSharp.LibraryName, qtSharp.InlinesLibraryPath));
 
                 if (log)
                     logredirect.Stop();
@@ -357,7 +357,7 @@ public static int Main(string[] args)
                         zipArchive.CreateEntryFromFile(wrappedModule.Key, wrappedModule.Key);
                         var documentation = Path.ChangeExtension(wrappedModule.Key, "xml");
                         zipArchive.CreateEntryFromFile(documentation, documentation);
-                        zipArchive.CreateEntryFromFile(Path.Combine("release", wrappedModule.Value), wrappedModule.Value);
+                        zipArchive.CreateEntryFromFile(wrappedModule.Value, Path.GetFileName(wrappedModule.Value));
                     }
                     zipArchive.CreateEntryFromFile("CppSharp.Runtime.dll", "CppSharp.Runtime.dll");
                 }

QtSharp/QtSharp.cs

@@ -29,7 +29,7 @@ public QtSharp(QtModuleInfo qtModuleInfo)
         }
 
         public string LibraryName { get; set; }
-        public string InlinesLibraryName { get; set; }
+        public string InlinesLibraryPath { get; set; }
 
         public void Preprocess(Driver driver, ASTContext lib)
         {
@@ -74,6 +74,18 @@ public void Preprocess(Driver driver, ASTContext lib)
             string[] classesWithTypeEnums = { };
             switch (this.module)
             {
+                case "Core":
+                    // QString is type-mapped to string so we only need two methods for the conversion
+                    var qString = lib.FindCompleteClass("QString");
+                    foreach (var @class in qString.Declarations)
+                    {
+                        @class.ExplicitlyIgnore();
+                    }
+                    foreach (var method in qString.Methods.Where(m => m.OriginalName != "utf16" && m.OriginalName != "fromUtf16"))
+                    {
+                        method.ExplicitlyIgnore();
+                    }
+                    break;
                 case "Widgets":
                     classesWithTypeEnums = new[]
                                            {
@@ -160,6 +172,14 @@ public void Postprocess(Driver driver, ASTContext lib)
                         .FirstOrDefault(o => o.Parameters[0].Type.IsPrimitiveType(PrimitiveType.Int));
                     if (op != null)
                         op.ExplicitlyIgnore();
+                    // QString is type-mapped to string so we only need two methods for the conversion
+                    // go through the methods a second time to ignore free operators moved to the class
+                    var qString = lib.FindCompleteClass("QString");
+                    foreach (var method in qString.Methods.Where(
+                        m => !m.Ignore && m.OriginalName != "utf16" && m.OriginalName != "fromUtf16"))
+                    {
+                        method.ExplicitlyIgnore();
+                    }
                     break;
             }
         }
@@ -227,9 +247,11 @@ public void Setup(Driver driver)
                     driver.Options.CodeFiles.Add(Path.Combine(dir, "IQQmlParserStatus.cs"));
                     break;
             }
-            var extension = Path.GetExtension(this.library);
-            this.LibraryName = driver.Options.LibraryName + extension;
-            this.InlinesLibraryName = driver.Options.InlinesLibraryName + extension;
+            this.LibraryName = driver.Options.LibraryName + ".dll";
+            var prefix = Platform.IsWindows ? string.Empty : "lib";
+            var extension = Platform.IsWindows ? ".dll" : Platform.IsMacOS ? ".dylib" : ".so";
+            var inlinesLibraryFile = string.Format("{0}{1}{2}", prefix, driver.Options.InlinesLibraryName, extension);
+            this.InlinesLibraryPath = Path.Combine(driver.Options.OutputDir, Platform.IsWindows ? "release" : string.Empty, inlinesLibraryFile);
         }
 
         public void SetupPasses(Driver driver)