Moved the inlines for GPL-only/commercial-only modules to a separate library.

This way people who don't want to use GPL-ed code can safely do so.

Signed-off-by: Dimitar Dobrev <dpldobrev@protonmail.com>

Author: ddobrev

CHANGELOG

@@ -1,3 +1,10 @@
+0.6.2 - 1.10.2016
+BREAKING: The helping libraries with inlines are no longer separated per module.
+Instead, there are just two of them, Qt-inlines for the LGPL modules and Qt-GPL-inlines for the rest.
+Fixed:
+- Removed all sealed overrides in the bindings;
+- Removed the double name-space from QtDataVisualization.
+
 0.6.1 - 17.9.2016
 Fixed:
 - Removed all mappings to C# structures because their empty constructors are not correctly wrapped yet.

LICENSE

@@ -4,7 +4,8 @@ IMPORTANT: The Apache License below does not include the
 following bindings:
 - QtCharts.Sharp;
 - QtDataVisualization.Sharp;
-They are licensed under GPLv3 instead as they link GPLv3 code.
+along with Qt-GPL-inlines. These are licensed under GPLv3 instead
+as they link GPLv3 code.
 You may obtain a copy of GPLv3 at
 
     https://www.gnu.org/licenses/gpl-3.0.en.html

QtSharp.CLI/Program.cs

@@ -241,6 +241,8 @@ public static int Main(string[] args)
                     var extension = Platform.IsWindows ? "dll" : Platform.IsMacOS ? "dylib" : "so";
                     var inlines = string.Format("Qt-inlines.{0}", extension);
                     zipArchive.CreateEntryFromFile(string.Format("release/{0}", inlines), inlines);
+                    var gplInlines = string.Format("Qt-GPL-inlines.{0}", extension);
+                    zipArchive.CreateEntryFromFile(string.Format("release/{0}", gplInlines), gplInlines);
                 }
             }
             Console.WriteLine("Done in: " + s.Elapsed);

QtSharp/CompileInlinesPass.cs

@@ -6,6 +6,7 @@
 using CppSharp.Passes;
 using CppSharp;
 using CppSharp.Parser;
+using System.Collections.Generic;
 
 namespace QtSharp
 {
@@ -33,14 +34,19 @@ public override bool VisitLibrary(ASTContext context)
                 File.WriteAllText(qtVersionFile, qtVersion);
                 qtVersionFileInfo = new FileInfo(qtVersionFile);
             }
+            return CompileInlines(qtVersionFileInfo, "Qt-inlines") && CompileInlines(qtVersionFileInfo, "Qt-GPL-inlines", true);
+        }
+
+        private bool CompileInlines(FileInfo qtVersionFileInfo, string qtInlines, bool isGpl = false)
+        {
             var dir = Platform.IsMacOS ? this.Context.Options.OutputDir : Path.Combine(this.Context.Options.OutputDir, "release");
-            var inlines = Path.GetFileName(string.Format("{0}Qt-inlines.{1}", Platform.IsWindows ? string.Empty : "lib",
-                Platform.IsWindows ? "dll" : Platform.IsMacOS ? "dylib" : "so"));
+            var inlines = Path.GetFileName(string.Format("{0}{2}.{1}", Platform.IsWindows ? string.Empty : "lib",
+                                                         Platform.IsWindows ? "dll" : Platform.IsMacOS ? "dylib" : "so", qtInlines));
             var libFile = Path.Combine(dir, inlines);
             var inlinesFileInfo = new FileInfo(libFile);
             if (!inlinesFileInfo.Exists || qtVersionFileInfo.LastWriteTimeUtc > inlinesFileInfo.LastWriteTimeUtc)
             {
-                if (!this.CompileInlines())
+                if (!this.CompileInlines(qtInlines, isGpl))
                 {
                     return false;
                 }
@@ -61,24 +67,46 @@ public override bool VisitLibrary(ASTContext context)
             return true;
         }
 
-        private bool CompileInlines()
+        private bool CompileInlines(string qtInlines, bool isGpl = false)
         {
-            var pro = string.Format("Qt-inlines.pro");
+            var pro = string.Format("{0}.pro", qtInlines);
             var path = Path.Combine(this.Context.Options.OutputDir, pro);
             var proBuilder = new StringBuilder();
-            var qtModules = string.Join(" ", from module in this.Context.Options.Modules
+            string qtModules;
+            if (isGpl)
+            {
+                qtModules = "charts datavisualization";
+            }
+            else
+            {
+                qtModules = string.Join(" ", from module in this.Context.Options.Modules
                                              from header in module.Headers
-                                             where !header.EndsWith(".h", StringComparison.Ordinal)
+                                             where header != "QtCharts" && header != "QtDataVisualization" &&
+                                                   !header.EndsWith(".h", StringComparison.Ordinal)
                                              select header.Substring("Qt".Length).ToLowerInvariant());
+            }
             // QtTest is only library which has a "lib" suffix to its module alias for qmake
             qtModules = qtModules.Replace(" test ", " testlib ");
 
             proBuilder.AppendFormat("QT += {0}\n", qtModules);
             proBuilder.Append("CONFIG += c++11\n");
             proBuilder.Append("QMAKE_CXXFLAGS += -fkeep-inline-functions\n");
-            proBuilder.AppendFormat("TARGET = Qt-inlines\n");
+            proBuilder.AppendFormat("TARGET = {0}\n", qtInlines);
             proBuilder.Append("TEMPLATE = lib\n");
-            proBuilder.AppendFormat("SOURCES += {0}\n", string.Join(" ", this.Context.Options.Modules.Select(m => m.InlinesLibraryName + ".cpp")));
+            IEnumerable<string> sources;
+            if (isGpl)
+            {
+                sources = from module in this.Context.Options.Modules
+                          where module.Headers.Contains("QtCharts") || module.Headers.Contains("QtDataVisualization")
+                          select module.InlinesLibraryName + ".cpp";
+            }
+            else
+            {
+                sources = from module in this.Context.Options.Modules
+                          where !module.Headers.Contains("QtCharts") && ! module.Headers.Contains("QtDataVisualization")
+                          select module.InlinesLibraryName + ".cpp";
+            }
+            proBuilder.AppendFormat("SOURCES += {0}\n", string.Join(" ", sources));
             if (Environment.OSVersion.Platform == PlatformID.Win32NT)
             {
                 proBuilder.Append("LIBS += -loleaut32 -lole32");

README.md

@@ -14,13 +14,14 @@ Qt for OS X and Linux are planned, Qt for VC++ has not been planned for now.
 The source code is separated into a library that contains the settings and passes the generator needs, and a command-line client.
 In the future a GUI client, constructed with Qt# itself, is planned as well.
 
-The are binary releases for Windows and Qt MinGW at https://github.com/ddobrev/QtSharp/releases. They are in an alpha stage.
+There are binary releases for Windows and Qt MinGW at https://github.com/ddobrev/QtSharp/releases. They are in an alpha stage.
 As they get more stable, binaries for other operating systems will be added as well.
 
 ## Getting started
 
 You need to deploy Qt itself by following http://doc.qt.io/qt-5/windows-deployment.html#application-dependencies .
-In addition, for each Qt module you use you also need Qt<module>-inlines.dll deployed alongside your executable.
+In addition, you need to deploy Qt-inlines alongside your executable. If you use QtCharts or QtDataVisualization,
+you also need Qt-GPL-inlines.
 You can use QtSharp with any C# IDE, including Visual Studio, but make sure your executable is 32-bit by either using the
 x86 configuration or AnyCPU with "Prefer 32-bit" checked.