Updated to Gtk 3.12

.gitignore

@@ -25,7 +25,7 @@ config.*
 configure
 depcomp
 doc/gtk-sharp-3-docs.*
-generated
+generated/*/*.cs
 generated.c
 generated-stamp
 install-sh
@@ -42,3 +42,14 @@ stamp-h1
 AssemblyInfo.cs
 Makefile
 Makefile.in
+
+# Nuget build files
+NuGet/build
+NuGet/nupkg
+
+# Python compiled files
+*.egg-*
+*.pyc
+.eggs
+dist
+*.suo

NuGet/Readme.md

@@ -0,0 +1,67 @@
+# Readme
+
+## Overview
+
+This is a series of python scripts to generate the binaries and NuGet Packages for GtkSharp and Gtk
+
+  * NuGet Packages for the GtkSharp .Net libraries
+  * NuGet Packages for the Windows 32bit / 64bit Gtk dll's
+
+## Windows
+
+### Depends
+
+The following is used as part of the build process
+
+  * MSYS2 - Windows install
+
+Also it's assumed that you've already installed the 32bit and 64bit binaries for gtk within the MSYS environment
+if your going to generate the Win32 / Win64 Nuget Packages for windows
+
+```
+pacman -S mingw-w64-i686-pango mingw-w64-i686-atk mingw-w64-i686-gtk3
+pacman -S mingw-w64-x86_64-pango mingw-w64-x86_64-atk mingw-w64-x86_64-gtk3
+```
+
+And installed the executor python module
+```
+C:\Python35\Scripts\pip.exe install executor yattag vsgen
+```
+
+### Running Build
+
+To run the build
+```
+cd gtk-sharp\NuGet
+build.py all
+```
+
+## Linux
+
+### Depends
+
+For Ubuntu we need to install pip for python 3 and a few other packages
+```
+sudo apt-get install python3-pip autoconf libtool libtool-bin mono-complete 
+sudo apt-get install libglib2.0-dev libpango1.0-dev libatk1.0-dev libgtk-3-dev
+```
+
+Then install the executor python module
+```
+pip3 install executor yattag vsgen
+```
+
+The version of Nuget needs to be the latest for linux
+```
+sudo wget https://dist.nuget.org/win-x86-commandline/v3.5.0-rc1/NuGet.exe -O /usr/local/bin/nuget.exe
+sudo chmod +x /usr/local/bin/nuget.exe
+```
+
+### Running Build
+
+To run the build
+```
+cd gtk-sharp/NuGet
+chmod +x build.py
+./build.py all
+```

NuGet/build.py

@@ -0,0 +1,92 @@
+#!/usr/bin/python3
+"""Script to build out the .Net dll's and package them into a Nuget Package for gtksharp3"""
+import sys
+from pybuild.profiles.GtkSharp import GtkSharp
+from pybuild.profiles.GtkSharp_Core import GtkSharp_Core
+from pybuild.profiles.Glue_Win32 import Glue_Win32
+from pybuild.profiles.Glue_Win64 import Glue_Win64
+from pybuild.profiles.Gtk_Win32 import Gtk_Win32
+from pybuild.profiles.Gtk_Win64 import Gtk_Win64
+from pybuild.Helper import Helper
+
+
+# Ideally I'd like to see the GtkSharp Build system redone via the build system of .Net core (dotnet cli tool)
+# and using Scons / Cuppa for the glue libraries
+# For now though we rely on the use of make to build the .Net dll's
+# under linux we run this natively, under windows we can use MSYS2
+
+class Build(object):
+    # Clean the Build directory
+    @staticmethod
+    def clean():
+        """Clean the build dir"""
+        Helper.emptydir('./build')
+        print("Clean finished")
+
+    # Print Usage
+    @staticmethod
+    def usage():
+        print("Please use GtkSharp3_Build.py <target> where <target> is one of")
+        print("  clean                 to clean the output directory: ./build")
+
+        print("  gtksharp              to build .Net libs for GtkSharp, via .Net 4.5")
+        print("  gtksharp_core         to build .Net libs for GtkSharp, via .Net 4.5 using the dotnet cli tool")
+
+        print("  gtk_win32             to build the Nuget package for GtkSharp.Win32")
+        print("  gtk_win64             to build the Nuget package for GtkSharp.Win64")
+        print("  all                   to make all")
+
+    def main(self):
+        if len(sys.argv) != 2:
+            self.usage()
+            return
+
+        if sys.argv[1] == 'all':
+            self.runbuild('gtksharp')
+            self.runbuild('gtk_win32')
+            self.runbuild('gtk_win64')
+            return
+
+        self.runbuild(sys.argv[1])
+
+    def runbuild(self, build_type):
+
+        if build_type == 'clean':
+            self.clean()
+            return
+
+        Helper.install_pacman_deps()
+
+        if build_type == 'gtksharp':
+            profile = GtkSharp()
+            profile.clean()
+            profile.build()
+            profile.copy()
+            profile.build_nuget()
+
+        elif build_type == 'gtksharp_core':
+            profile = GtkSharp_Core()
+            profile.clean()
+            profile.build()
+            profile.copy_dll()
+            profile.build_nuget()
+
+        elif build_type == 'gtk_win32':
+            profile_glue = Glue_Win32()
+            profile_glue.clean()
+            profile_glue.build()
+            profile_gtk = Gtk_Win32()
+            profile_gtk.build()
+            profile_gtk.build_nuget()
+
+        elif build_type == 'gtk_win64':
+            profile_glue = Glue_Win64()
+            profile_glue.clean()
+            profile_glue.build()
+            profile = Gtk_Win64()
+            profile.build()
+            profile.build_nuget()
+
+
+if __name__ == "__main__":
+    Build().main()

NuGet/misc/GtkSharp.Native.targets

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="CopyNativeDLLs" AfterTargets="AfterBuild">
+    <CreateItem Include="$(MSBuildThisFileDirectory)\*.dl_">
+      <Output TaskParameter="Include" ItemName="NativeDLLs" />
+    </CreateItem>
+
+    <Copy SourceFiles="@(NativeDLLs)" DestinationFiles="@(NativeDLLs->'$(OutDir)\%(RecursiveDir)%(Filename).dll')" />
+  </Target>
+</Project>
+

NuGet/misc/GtkSharp.nuspec

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+  <metadata>
+    <id>GBD.GtkSharp</id>
+    <version>3.22.0</version>
+    <authors>Grbd</authors>
+    <owners>grbd</owners>
+    <licenseUrl>https://github.com/mono/gtk-sharp/blob/master/COPYING</licenseUrl>
+    <projectUrl>https://github.com/mono/gtk-sharp</projectUrl>
+    <iconUrl>https://upload.wikimedia.org/wikipedia/en/5/5f/Gtk_Sharp_Logo.png</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>Gtk# is a .NET language binding for the GTK+ toolkit and assorted GNOME libraries. Gtk# is free software, licensed under the GNU LGPL.</description>
+    <copyright>Copyright 2016</copyright>
+    <tags>GTK3 GTK# gtk3-sharp</tags>
+  </metadata>
+</package>

NuGet/misc/GtkSharp.targets

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="CopyMapConfigs" AfterTargets="AfterBuild">
+    <CreateItem Include="$(MSBuildThisFileDirectory)\*.config">
+      <Output TaskParameter="Include" ItemName="MapConfigs" />
+    </CreateItem>
+
+    <Copy SourceFiles="@(MapConfigs)" DestinationFiles="@(MapConfigs->'$(OutDir)\%(RecursiveDir)%(Filename)%(Extension)')" />
+  </Target>
+</Project>

NuGet/pybuild/Helper.py

@@ -0,0 +1,101 @@
+#!/usr/bin/python3
+"""Helper Functions"""
+
+import os
+from os.path import join
+
+from executor import ExternalCommand
+
+
+class Helper(object):
+    @staticmethod
+    def emptydir(top):
+        """Empty a Directory"""
+        if top == '/' or top == "\\":
+            return
+        else:
+            for root, dirs, files in os.walk(top, topdown=False):
+                for name in files:
+                    os.remove(os.path.join(root, name))
+                for name in dirs:
+                    os.rmdir(os.path.join(root, name))
+
+    @staticmethod
+    def run_cmd(cmdarray, workdir):
+        """Run a command on the shell"""
+        cmd = ExternalCommand(*cmdarray, capture=True, capture_stderr=True, async=True, shell=False, directory=workdir)
+        cmd.start()
+        last_out = ''
+        last_err = ''
+        while cmd.is_running:
+            new_out = cmd.stdout.decode(cmd.encoding, 'ignore').replace(last_out, '')
+            new_err = cmd.stderr.decode(cmd.encoding, 'ignore').replace(last_err, '')
+
+            last_out += new_out
+            last_err += new_err
+            new_out = new_out.replace(u"\u2018", "'").replace(u"\u2019", "'")
+            new_err = new_err.replace(u"\u2018", "'").replace(u"\u2019", "'")
+            if new_out != '':
+                print(new_out, end='')
+            if new_err != '':
+                print(new_err, end='')
+
+        if cmd.returncode != 0:
+            raise RuntimeError('Failure to run command')
+        return cmd
+
+    @staticmethod
+    def winpath_to_msyspath(winpath):
+        """Convert a Windows path to a Msys type path"""
+        winpath = '/' + winpath[0] + winpath[2:].replace('\\', '/')
+        return winpath
+
+    @staticmethod
+    def get_gtksharp_version(srcdir):
+        """Get the Version of GTK Sharp in use from the source directory"""
+        ret = None
+        with open(join(srcdir, 'configure.ac')) as f:
+            for line in f:
+                if line.startswith('AC_INIT'):
+                    ret = line
+                    ret = ret.replace('AC_INIT(gtk-sharp,', '')
+                    ret = ret.replace(' ', '')
+                    ret = ret.replace(')\n', '')
+                    break
+        return ret
+
+    @staticmethod
+    def install_pacman_deps():
+        Helper.run_pacman_cmd(['-Sy'])
+
+        args = ['--needed', '--nodeps', '--noprogressbar', '--noconfirm', '-S']
+        args += 'unzip autoconf automake libtool pkg-config make'.split(' ')
+
+        deps_arch = 'gcc glib2 pango atk gtk3 zlib libiconv'
+        args += ['mingw-w64-i686-{0}'.format(i) for i in deps_arch.split(' ')]
+        args += ['mingw-w64-x86_64-{0}'.format(i) for i in deps_arch.split(' ')]
+
+        Helper.run_pacman_cmd(args)
+
+    @staticmethod
+    def run_pacman_cmd(pacman_args):
+        msyspath = 'C:\\msys64'
+        pacman_path = join(msyspath, 'usr\\bin\\pacman.exe')
+        return Helper.run_cmd([pacman_path] + pacman_args, msyspath)
+
+    @staticmethod
+    def get_gtk_version_msys(msyspath):
+        ret = ''
+        pacman_path = join(msyspath, 'usr\\bin\\pacman.exe')
+        # pull version from msys2 / pacman
+        # pacman -Qi mingw-w64-i686-gtk3
+        cmd = Helper.run_cmd([pacman_path, '-Qi', 'mingw-w64-i686-gtk3'], msyspath)
+
+        for line in cmd.output.split('\n'):
+            if 'Version' in line:
+                ret = line.replace('Version', '')
+                ret = ret.replace(' ', '').replace(':', '')
+                if '-' in ret:
+                    ret = ret[:-2]
+                break
+        return ret