glib2 1.2.6-x86-mingw32 → 2.0.0-x86-mingw32

data/Rakefile

@@ -3,12 +3,14 @@
 $LOAD_PATH.unshift("./lib")
 require 'gnome2-raketask'
 
+include_dir        = nil
+glib2_include_dir  = nil
 libffi_lib_dir     = nil
-libffi_include_dir = nil
 
 package = GNOME2Package.new do |_package|
-  libffi_lib_dir     = File.join(_package.win32.absolute_binary_dir, "lib")
-  libffi_include_dir = File.join(_package.win32.absolute_binary_dir, "include")
+  include_dir        = (_package.windows.absolute_binary_dir + "include").to_s
+  glib2_include_dir  = File.join(include_dir, "glib-2.0")
+  libffi_lib_dir     = (_package.windows.absolute_binary_dir + "lib").to_s
 
   _package.summary = "Ruby/GLib2 is a Ruby binding of GLib-2.x."
   _package.description = "Ruby/GLib2 is a Ruby binding of GLib-2.x."
@@ -16,58 +18,69 @@ package = GNOME2Package.new do |_package|
   _package.dependency.gem.development = [["test-unit", ">= 2"]]
   _package.win32.packages = []
   _package.win32.dependencies = ["zlib", "libffi", "gettext-runtime"]
-  _package.win32.build_packages = [
+  _package.external_packages = [
     {
       :name => "glib",
       :download_site => :gnome,
       :label => "GLib",
       :version => "2.36.0",
-      :configure_args => [
-        "LIBFFI_CFLAGS=-I#{libffi_include_dir}",
-        "LIBFFI_LIBS=-L#{libffi_lib_dir} -lffi",
-        "--disable-modular-tests",
-      ],
       :compression_method => "xz",
+      :windows => {
+        :configure_args => [
+          "LIBFFI_CFLAGS=-I#{include_dir}",
+          "LIBFFI_LIBS=-L#{libffi_lib_dir} -lffi",
+          "--disable-modular-tests",
+        ],
+      },
     },
     {
       :name => "gmp",
       :download_base_url => "ftp://ftp.gmplib.org/pub/gmp-5.1.0",
       :label => "GNU MP",
       :version => "5.1.0",
-      :configure_args => [
-        "--disable-static",
-        "--enable-shared",
-      ],
       :compression_method => "bz2",
+      :windows => {
+        :configure_args => [
+          "--disable-static",
+          "--enable-shared",
+        ],
+      },
     },
     {
       :name => "nettle",
       :download_base_url => "http://www.lysator.liu.se/~nisse/archive",
       :label => "Nettle",
       :version => "2.5",
-      :configure_args => [],
+      :windows => {
+        :configure_args => [],
+      },
     },
     {
       :name => "gnutls",
       :download_base_url => "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1",
       :label => "GnuTLS",
       :version => "3.1.10",
-      :configure_args => [
-        "--with-libnettle-prefix=#{_package.win32.absolute_binary_dir}"
-      ],
       :compression_method => "xz",
+      :windows => {
+        :configure_args => [
+          "--with-libnettle-prefix=#{_package.win32.absolute_binary_dir}"
+        ],
+        :use_cc_environment_variable => false,
+      },
     },
     {
       :name => "glib-networking",
       :download_site => :gnome,
       :label => "glib-networking",
       :version => "2.36.0",
-      :configure_args => [
-        "--without-libproxy",
-        "--without-gnome-proxy",
-        "--without-ca-certificates",
-      ],
       :compression_method => "xz",
+      :windows => {
+        :configure_args => [
+          "--without-libproxy",
+          "--without-gnome-proxy",
+          "--without-ca-certificates",
+        ],
+      },
     },
   ]
 end
@@ -80,13 +93,35 @@ namespace :win32 do
       task :fix do
         libffi_version = "libffi-3.0.6"
         mv(Dir.glob(File.join(libffi_lib_dir, libffi_version, "include", "*.h")),
-           libffi_include_dir)
+           include_dir)
         rm_rf(File.join(libffi_lib_dir, libffi_version))
       end
     end
   end
 
   namespace :downloader do
-    task :after => ["win32:libffi:header:fix"]
+    task :after => [
+      "win32:libffi:header:fix",
+    ]
+  end
+
+  namespace :gettext do
+    namespace :header do
+      desc "Copy gettext headers to include/glib-2.0/"
+      task :fix do
+        cp(File.join(include_dir, "libintl.h"),
+           glib2_include_dir)
+      end
+    end
+  end
+
+  namespace :buildler do
+    namespace :build do
+      namespace :glib do
+        task :after => [
+          "win32:gettext:header:fix",
+        ]
+      end
+    end
   end
 end

data/ext/glib2/extconf.rb

@@ -57,7 +57,7 @@ include_paths = PKGConfig.cflags_only_I("glib-2.0")
 headers = include_paths.split.inject([]) do |result, path|
   result + Dir.glob(File.join(path.sub(/^-I/, ""), "glib", "*.h"))
 end.reject do |file|
-  /g(iochannel|scanner)\.h/ =~ file
+  /g(iochannel|main|scanner)\.h/ =~ file
 end
 include_paths = PKGConfig.cflags_only_I("gobject-2.0")
 headers = include_paths.split.inject(headers) do |result, path|

data/ext/glib2/glib2.def

@@ -133,3 +133,4 @@ EXPORTS
 	g_source_get_type
 	g_connect_flags_get_type
 	g_poll_fd_get_type
+	g_signal_flags_get_type

data/ext/glib2/rbglib.h

@@ -33,9 +33,9 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#define RBGLIB_MAJOR_VERSION 1
-#define RBGLIB_MINOR_VERSION 2
-#define RBGLIB_MICRO_VERSION 6
+#define RBGLIB_MAJOR_VERSION 2
+#define RBGLIB_MINOR_VERSION 0
+#define RBGLIB_MICRO_VERSION 0
 
 #ifndef RSTRING_PTR
 #  define RSTRING_PTR(s) (RSTRING(s)->ptr)

data/lib/glib2.rb

@@ -2,9 +2,7 @@
 # glib2.rb
 # Copyright(C) 2005-2010 Ruby-GNOME2 Project.
 #
-# This program is licenced under the same 
-# license of Ruby-GNOME2.
-#
+# This program is licenced under the same license of Ruby-GNOME2.
 
 require 'pathname'
 require 'English'
@@ -15,11 +13,11 @@ module GLib
   module_function
   def check_binding_version?(major, minor, micro)
     BINDING_VERSION[0] > major ||
-      (BINDING_VERSION[0] == major && 
+      (BINDING_VERSION[0] == major &&
        BINDING_VERSION[1] > minor) ||
-      (BINDING_VERSION[0] == major && 
+      (BINDING_VERSION[0] == major &&
        BINDING_VERSION[1] == minor &&
-       BINDING_VERSION[2] >= micro)  
+       BINDING_VERSION[2] >= micro)
   end
 
   def exit_application(exception, status)
@@ -72,13 +70,12 @@ module GLib
     end
   end
 
-  def prepend_environment_path(path)
+  def prepend_path_to_environment_variable(path, environment_name)
     path = Pathname(path) unless path.is_a?(Pathname)
     if path.exist?
-      environment_name = "PATH"
       separator = ::File::PATH_SEPARATOR
 
-      paths = (ENV[environment_name] || '').split(/#{separator}/)
+      paths = (ENV[environment_name] || '').split(/#{Regexp.escape(separator)}/)
       dir = path.to_s
       dir = dir.gsub(/\//, ::File::ALT_SEPARATOR) if ::File::ALT_SEPARATOR
       unless paths.include?(dir)
@@ -87,12 +84,16 @@ module GLib
       end
     end
   end
+
+  def prepend_dll_path(path)
+    prepend_path_to_environment_variable(path, "PATH")
+  end
 end
 
 
 base_dir = Pathname.new(__FILE__).dirname.dirname.expand_path
 vendor_dir = base_dir + "vendor" + "local"
-GLib.prepend_environment_path(vendor_dir + "bin")
+GLib.prepend_dll_path(vendor_dir + "bin")
 begin
   major, minor, _ = RUBY_VERSION.split(/\./)
   require "#{major}.#{minor}/glib2.so"

data/lib/gnome2-raketask.rb

@@ -1,230 +1,8 @@
-# coding: utf-8
-
-# Copyright(C) 2011 Ruby-GNOME2 Project.
+# Copyright(C) 2013 Ruby-GNOME2 Project.
 #
 # This program is licenced under the same license of Ruby-GNOME2.
 
-require 'find'
-
-require 'rubygems'
-require 'rubygems/package_task'
-require 'rake/extensiontask'
-require 'gnome2-win32-binary-download-task'
-require 'gnome2-win32-binary-build-task'
-
-class GNOME2Package
-  include Rake::DSL
-
-  attr_accessor :name, :summary, :description, :author, :email, :homepage, :required_ruby_version, :post_install_message
-  attr_reader :root_dir
-  def initialize
-    initialize_variables
-    initialize_configurations
-    file, line, method = caller[1].scan(/^(.*):(\d+)(?::.*`(.*)')?\Z/).first
-    @root_dir = File.dirname(file)
-    @glib2_root_dir = File.expand_path("#{@root_dir}/../glib2")
-    @packages = FileList["#{File.dirname(@root_dir)}/*"].map{|f| File.directory?(f) ? File.basename(f) : nil}.compact
-    @name = File.basename(@root_dir)
-    @cross_compiling_hooks = []
-    yield(self) if block_given?
-  end
-
-  def cross_compiling(&block)
-    @cross_compiling_hooks << block
-  end
-
-  def define_tasks
-    task :default => :build
-    define_spec
-    define_win32_tasks
-    define_package_tasks
-  end
-
-  def ruby_gnome2_package?(name)
-    @packages.include?(name)
-  end
-
-  def dependency
-    @dependency_configuration
-  end
-
-  def win32
-    @win32_configuration
-  end
-
-  def version
-    ENV["VERSION"] || guess_version
-  end
-
-  def guess_version
-    versions = {}
-    File.open("#{@glib2_root_dir}/ext/glib2/rbglib.h") do |rbglib_h|
-      rbglib_h.each_line do |line|
-        if /#define\s+RBGLIB_([A-Z]+)_VERSION\s+(\d+)/ =~ line
-          versions[$1.downcase] = $2.to_i
-        end
-      end
-    end
-    ["major", "minor", "micro"].collect {|type| versions[type]}.compact.join(".")
-  end
-
-  private
-  def initialize_variables
-    @name = ""
-    @summary = ""
-    @description = ""
-    @author = "The Ruby-GNOME2 Project Team"
-    @email = "ruby-gnome2-devel-en@lists.sourceforge.net"
-    @homepage = "http://ruby-gnome2.sourceforge.jp/"
-  end
-
-  def initialize_configurations
-    @dependency_configuration = DependencyConfiguration.new(self)
-    @win32_configuration = Win32Configuration.new(self)
-  end
-
-  def define_spec
-    @spec = Gem::Specification.new do |s|
-      s.name                  = @name
-      s.summary               = @summary
-      s.description           = @description
-      s.author                = @author
-      s.email                 = @email
-      s.homepage              = @homepage
-      s.version               = version
-      extensions              = FileList["ext/#{@name}/extconf.rb"]
-      extensions.existing!
-      s.extensions            = extensions
-      s.require_paths         = ["lib"]
-      files                   = FileList["ChangeLog", "README",
-                                         "Rakefile", "extconf.rb",
-                                         "lib/**/*.rb",
-                                         "{ext,sample,test,test-unit}/**/*"]
-      files.existing!
-      s.files                 = files
-      s.required_ruby_version = @required_ruby_version || ">= 1.8.5"
-      s.post_install_message  = @post_install_message
-      @dependency_configuration.apply(s)
-    end
-  end
-
-  def define_win32_tasks
-    define_win32_extension_task
-    define_win32_download_task
-    define_win32_build_task
-  end
-
-  def so_base_name
-    @name.gsub(/-/, "_")
-  end
-
-  def define_win32_extension_task
-    Rake::ExtensionTask.new(so_base_name, @spec) do |ext|
-      ext.ext_dir = "ext/#{@name}"
-      ext.cross_compile = true
-      ext.cross_compiling do |spec|
-        if /mingw|mswin/ =~ spec.platform.to_s
-          win32_binary_dir = @win32_configuration.relative_binary_dir
-          win32_files = []
-          if File.exist?(win32_binary_dir)
-            Find.find(win32_binary_dir) do |file|
-              next if /\.zip\z/ =~ file
-              win32_files << file
-            end
-          end
-          spec.files += win32_files
-        end
-        @cross_compiling_hooks.each do |hook|
-          hook.call(spec)
-        end
-      end
-    end
-
-    def define_win32_download_task
-      GNOME2Win32BinaryDownloadTask.new(@win32_configuration)
-    end
-
-    def define_win32_build_task
-      GNOME2Win32BinaryBuildTask.new(@win32_configuration)
-    end
-  end
-
-  def define_package_tasks
-    Gem::PackageTask.new(@spec) do |pkg|
-    end
-  end
-
-  class DependencyConfiguration
-    attr_accessor :platform, :ruby
-    def initialize(package)
-      @package = package
-      @platform = Gem::Platform::RUBY
-      @gem_configuration = GemConfiguration.new(@package)
-    end
-
-    def gem
-      @gem_configuration
-    end
-
-    def apply(spec)
-      spec.platform = @platform
-      @gem_configuration.apply(spec)
-    end
-
-    class GemConfiguration
-      attr_accessor :runtime, :development
-      def initialize(package)
-        @package = package
-        @runtime = []
-        @development = []
-      end
-
-      def apply(spec)
-        @runtime.each do |dependency|
-          spec.add_runtime_dependency(*append_version(dependency))
-        end
-
-        @development.each do |dependency|
-          spec.add_development_dependency(*append_version(dependency))
-        end
-      end
-
-      def append_version(dependency)
-        name, *ver = dependency.is_a?(Array) ? dependency : [dependency]
-        ver << ">= #{@package.version}" if @package.ruby_gnome2_package?(name)
-        [name, *ver]
-      end
-    end
-  end
-
-  class Win32Configuration
-    attr_reader :package
-    attr_accessor :packages, :dependencies, :build_packages, :build_dependencies
-    attr_accessor :build_host
-    attr_accessor :relative_binary_dir, :absolute_binary_dir
-    attr_accessor :support_concurrent_build
-    def initialize(package)
-      @package = package
-      @packages = []
-      @dependencies = []
-      @build_packages = []
-      @build_dependencies = []
-      @build_host = "i686-w64-mingw32"
-      @relative_binary_dir = File.join("vendor", "local")
-      @absolute_binary_dir = File.expand_path(@relative_binary_dir)
-      @support_concurrent_build = true
-    end
+# Just for backward compatibility.
+require "gnome2/rake/package-task"
 
-    def to_hash
-      {
-        :packages => @packages,
-        :dependencies => @dependencies,
-        :build_packages => @build_packages,
-        :build_host => @build_host,
-        :relative_binary_dir => @relative_binary_dir,
-        :absolute_binary_dir => @absolute_binary_dir,
-        :support_concurrent_build => @support_concurrent_build,
-      }
-    end
-  end
-end
+GNOME2Package = GNOME2::Rake::PackageTask