glib2 3.0.8 → 3.0.9

data/lib/gnome2/rake/windows-binary-download-task.rb

@@ -6,174 +6,177 @@ require 'open-uri'
 require 'rubygems'
 require 'mechanize'
 
-class GNOME2WindowsBinaryDownloadTask
-  include Rake::DSL
-
-  URL_BASE = "http://ftp.gnome.org/pub/gnome/binaries"
-  def initialize(package)
-    @package = package
-    define
-  end
+module GNOME2
+  module Rake
+    class WindowsBinaryDownloadTask
+      include ::Rake::DSL
+
+      URL_BASE = "http://ftp.gnome.org/pub/gnome/binaries"
+      def initialize(package)
+        @package = package
+      end
 
-  private
-  def define
-    namespace :windows do
-      namespace :downloader do
-        task :before
-
-        download_tasks = []
-        namespace :download do
-          directory dist_dir.to_s
-          task :prepare => [dist_dir.to_s]
-
-          packages.each do |package|
-            desc "download #{package}"
-            task package => [:prepare] do
-              download_package(package)
+      def define
+        namespace :windows do
+          namespace :downloader do
+            task :before
+
+            download_tasks = []
+            namespace :download do
+              directory dist_dir.to_s
+              task :prepare => [dist_dir.to_s]
+
+              packages.each do |package|
+                desc "download #{package}"
+                task package => [:prepare] do
+                  download_package(package)
+                end
+                download_tasks << package
+              end
+
+              dependencies.each do |dependency|
+                name, version = dependency
+                desc "download #{name}"
+                task name => [:prepare] do
+                  download_dependency(dependency)
+                end
+                download_tasks << name
+              end
             end
-            download_tasks << package
-          end
 
-          dependencies.each do |dependency|
-            name, version = dependency
-            desc "download #{name}"
-            task name => [:prepare] do
-              download_dependency(dependency)
+            download_tasks = download_tasks.collect do |task|
+              "windows:downloader:download:#{task}"
             end
-            download_tasks << name
-          end
-        end
+            desc "download Windows binaries into #{dist_dir}"
+            task :download => download_tasks
 
-        download_tasks = download_tasks.collect do |task|
-          "windows:downloader:download:#{task}"
+            task :after
+          end
+          desc "download Windows binaries"
+          task :download => ["windows:downloader:before",
+                             "windows:downloader:download",
+                             "windows:downloader:after"]
         end
-        desc "download Windows binaries into #{dist_dir}"
-        task :download => download_tasks
+      end
 
-        task :after
+      private
+      def dist_dir
+        @package.windows.absolute_binary_dir
       end
-      desc "download Windows binaries"
-      task :download => ["windows:downloader:before",
-                         "windows:downloader:download",
-                         "windows:downloader:after"]
-    end
-  end
 
-  def dist_dir
-    @package.windows.absolute_binary_dir
-  end
+      def packages
+        @package.windows.packages
+      end
 
-  def packages
-    @package.windows.packages
-  end
+      def dependencies
+        @package.windows.dependencies
+      end
 
-  def dependencies
-    @package.windows.dependencies
-  end
+      def build_architecture_suffix
+        @package.windows.build_architecture_suffix
+      end
 
-  def build_architecture_suffix
-    @package.windows.build_architecture_suffix
-  end
+      def download_package(package)
+        suffix = build_architecture_suffix
+        version_page_url = "#{URL_BASE}/#{suffix}/#{package}"
+        version_page = agent.get(version_page_url)
+        latest_version_link = version_page.links.sort_by do |link|
+          if /\A(\d+\.\d+)\/\z/ =~ link.href
+            $1.split(/\./).collect {|component| component.to_i}
+          else
+            [-1]
+          end
+        end.last
+
+        escaped_package = Regexp.escape(package)
+        latest_version_page = latest_version_link.click
+        latest_version = latest_version_page.links.collect do |link|
+          case link.href
+          when /#{escaped_package}_([\d\.\-]+)_#{suffix}\.zip\z/,
+               /#{escaped_package}-([\d\.\-]+)-#{suffix}\.zip\z/, # old
+               /#{escaped_package}-([\d\.\-]+)\.zip\z/ # old
+            version = $1
+            normalized_version = version.split(/[\.\-]/).collect do |component|
+              component.to_i
+            end
+            [normalized_version, version]
+          else
+            [[-1], nil]
+          end
+        end.sort_by do |normalized_version, version|
+          normalized_version
+        end.last[1]
 
-  def download_package(package)
-    suffix = build_architecture_suffix
-    version_page_url = "#{URL_BASE}/#{suffix}/#{package}"
-    version_page = agent.get(version_page_url)
-    latest_version_link = version_page.links.sort_by do |link|
-      if /\A(\d+\.\d+)\/\z/ =~ link.href
-        $1.split(/\./).collect {|component| component.to_i}
-      else
-        [-1]
-      end
-    end.last
-
-    escaped_package = Regexp.escape(package)
-    latest_version_page = latest_version_link.click
-    latest_version = latest_version_page.links.collect do |link|
-      case link.href
-      when /#{escaped_package}_([\d\.\-]+)_#{suffix}\.zip\z/,
-           /#{escaped_package}-([\d\.\-]+)-#{suffix}\.zip\z/, # old
-           /#{escaped_package}-([\d\.\-]+)\.zip\z/ # old
-        version = $1
-        normalized_version = version.split(/[\.\-]/).collect do |component|
-          component.to_i
+        if latest_version.nil?
+          raise "can't find package: <#{package}>:<#{version_page_url}>"
+        end
+        escaped_latest_version = Regexp.escape(latest_version)
+        latest_version_page.links.each do |link|
+          case link.href
+          when /#{escaped_package}(?:-dev)?_#{escaped_latest_version}_#{suffix}\.zip\z/,
+               /#{escaped_package}(?:-dev)?-#{escaped_latest_version}-#{suffix}\.zip\z/, # old
+               /#{escaped_package}(?:-dev)?-#{escaped_latest_version}\.zip\z/ # old
+            click_zip_link(link)
+          end
         end
-        [normalized_version, version]
-      else
-        [[-1], nil]
       end
-    end.sort_by do |normalized_version, version|
-      normalized_version
-    end.last[1]
 
-    if latest_version.nil?
-      raise "can't find package: <#{package}>:<#{version_page_url}>"
-    end
-    escaped_latest_version = Regexp.escape(latest_version)
-    latest_version_page.links.each do |link|
-      case link.href
-      when /#{escaped_package}(?:-dev)?_#{escaped_latest_version}_#{suffix}\.zip\z/,
-           /#{escaped_package}(?:-dev)?-#{escaped_latest_version}-#{suffix}\.zip\z/, # old
-           /#{escaped_package}(?:-dev)?-#{escaped_latest_version}\.zip\z/ # old
-        click_zip_link(link)
+      def download_dependency(dependency)
+        suffix = build_architecture_suffix
+        dependency_version = "any"
+        dependency_version_re = /[\d\.\-]+/
+        if dependency.is_a?(Array)
+          dependency, dependency_version = dependency
+          dependency_version_re = /#{Regexp.escape(dependency_version)}/
+        end
+        escaped_dependency = Regexp.escape(dependency)
+        dependencies_url = "#{URL_BASE}/dependencies"
+        dependencies_page = agent.get(dependencies_url)
+        latest_version = dependencies_page.links.collect do |link|
+          case link.href
+          when /\A#{escaped_dependency}_(#{dependency_version_re})_#{suffix}\.zip\z/
+            version = $1
+            [version.split(/[\.\-]/).collect {|component| component.to_i}, version]
+          else
+            [[-1], nil]
+          end
+        end.sort_by do |normalized_version, version|
+          normalized_version
+        end.last[1]
+
+        if latest_version.nil?
+          message = "can't find dependency package: " +
+            "<#{dependency}>(#{dependency_version}):<#{dependencies_url}>"
+          raise message
+        end
+        escaped_latest_version = Regexp.escape(latest_version)
+        dependencies_page.links.each do |link|
+          case link.href
+          when /\A#{escaped_dependency}(?:-dev)?_#{escaped_latest_version}_#{suffix}\.zip\z/
+            click_zip_link(link)
+          end
+        end
       end
-    end
-  end
 
-  def download_dependency(dependency)
-    suffix = build_architecture_suffix
-    dependency_version = "any"
-    dependency_version_re = /[\d\.\-]+/
-    if dependency.is_a?(Array)
-      dependency, dependency_version = dependency
-      dependency_version_re = /#{Regexp.escape(dependency_version)}/
-    end
-    escaped_dependency = Regexp.escape(dependency)
-    dependencies_url = "#{URL_BASE}/dependencies"
-    dependencies_page = agent.get(dependencies_url)
-    latest_version = dependencies_page.links.collect do |link|
-      case link.href
-      when /\A#{escaped_dependency}_(#{dependency_version_re})_#{suffix}\.zip\z/
-        version = $1
-        [version.split(/[\.\-]/).collect {|component| component.to_i}, version]
-      else
-        [[-1], nil]
+      private
+      def agent
+        @agent ||= Mechanize.new
       end
-    end.sort_by do |normalized_version, version|
-      normalized_version
-    end.last[1]
-
-    if latest_version.nil?
-      message = "can't find dependency package: " +
-        "<#{dependency}>(#{dependency_version}):<#{dependencies_url}>"
-      raise message
-    end
-    escaped_latest_version = Regexp.escape(latest_version)
-    dependencies_page.links.each do |link|
-      case link.href
-      when /\A#{escaped_dependency}(?:-dev)?_#{escaped_latest_version}_#{suffix}\.zip\z/
-        click_zip_link(link)
-      end
-    end
-  end
-
-  private
-  def agent
-    @agent ||= Mechanize.new
-  end
 
-  def click_zip_link(link)
-    zip = link.click
-    Dir.chdir(dist_dir) do
-      open(zip.filename, "wb") do |file|
-        file.print(zip.body)
-      end
-      system("unzip", "-o", zip.filename)
-      Dir.glob("lib/pkgconfig/*.pc") do |pc_path|
-        pc = File.read(pc_path)
-        pc = pc.gsub(/\Aprefix=.+$/) {"prefix=#{dist_dir}"}
-        File.open(pc_path, "w") do |pc_file|
-          pc_file.print(pc)
+      def click_zip_link(link)
+        zip = link.click
+        Dir.chdir(dist_dir) do
+          open(zip.filename, "wb") do |file|
+            file.print(zip.body)
+          end
+          system("unzip", "-o", zip.filename)
+          Dir.glob("lib/pkgconfig/*.pc") do |pc_path|
+            pc = File.read(pc_path)
+            pc = pc.gsub(/\Aprefix=.+$/) {"prefix=#{dist_dir}"}
+            File.open(pc_path, "w") do |pc_file|
+              pc_file.print(pc)
+            end
+          end
         end
       end
     end

data/lib/mkmf-gnome2.rb

@@ -151,8 +151,16 @@ def find_gem_spec(package)
   end
 end
 
+def setup_homebrew_libffi
+  return unless package_platform == :homebrew
+
+  PKGConfig.add_path("/usr/local/opt/libffi/lib/pkgconfig")
+end
+
 #add_depend_package("glib2", "ext/glib2", "/...../ruby-gnome2")
 def add_depend_package(target_name, target_srcdir, top_srcdir, options={})
+  setup_homebrew_libffi if target_name == "gobject-introspection"
+
   gem_spec = find_gem_spec(target_name)
   if gem_spec
     target_source_dir = File.join(gem_spec.full_gem_path, "ext/#{target_name}")
@@ -410,34 +418,6 @@ def make_version_header(app_name, pkgname, dir = "src")
       out.close
 end
 
-def check_ruby_func
-  #Other options
-  ruby_header = "ruby.h"
-  have_func("rb_define_alloc_func", ruby_header) # for ruby-1.8
-  have_func("rb_block_proc", ruby_header) # for ruby-1.8
-
-  STDOUT.print("checking for new allocation framework... ") # for ruby-1.7
-  if Object.respond_to? :allocate
-    STDOUT.print "yes\n"
-    $defs << "-DHAVE_OBJECT_ALLOCATE"
-  else
-    STDOUT.print "no\n"
-  end
-
-  STDOUT.print("checking for attribute assignment... ") # for ruby-1.7
-  STDOUT.flush
-  if defined? try_compile and try_compile <<SRC
-#include "ruby.h"
-#include "node.h"
-int node_attrasgn = (int)NODE_ATTRASGN;
-SRC
-    STDOUT.print "yes\n"
-    $defs << "-DHAVE_NODE_ATTRASGN"
-  else
-    STDOUT.print "no\n"
-  end
-end
-
 def add_obj(name)
   ensure_objs
   $objs << name unless $objs.index(name)
@@ -617,6 +597,9 @@ def required_pkg_config_package(package_info, native_package_info=nil)
   else
     required_package_info = [package_info]
   end
+  if required_package_info.include?("gobject-introspection-1.0")
+    setup_homebrew_libffi
+  end
   return true if PKGConfig.have_package(*required_package_info)
 
   native_package_info ||= {}
@@ -635,8 +618,6 @@ end
 add_include_path.call("sitearchdir")
 add_include_path.call("vendorarchdir")
 
-check_ruby_func
-
 if /mingw/ =~ RUBY_PLATFORM
   $ruby.gsub!('\\', '/')
 end

data/test/test-binding.rb

@@ -16,82 +16,173 @@
 
 class TestGLibBinding < Test::Unit::TestCase
   include GLibTestUtils
+  sub_test_case "bind_property" do
+    class DataObjectDefault < GLib::Object
+      type_register
 
-  class DataObject < GLib::Object
-    type_register
-
-    install_property(GLib::Param::Int.new("source", # name
-                                          "Source", # nick
-                                          "The source data", # blurb
-                                          0,     # min
-                                          100,   # max
-                                          0,     # default
-                                          GLib::Param::READABLE |
-                                          GLib::Param::WRITABLE))
-    install_property(GLib::Param::Int.new("target", # name
-                                          "Target", # nick
-                                          "The target data", # blurb
-                                          0,     # min
-                                          100,   # max
-                                          0,     # default
-                                          GLib::Param::READABLE |
-                                          GLib::Param::WRITABLE))
-
-    attr_reader :source, :target
-    def initialize
-      @source = 0
-      @target = 0
-      super
-    end
-
-    def source=(value)
-      @source = value
-      notify("source")
-    end
-
-    def target=(value)
-      @target = value
-      notify("target")
+      install_property(GLib::Param::Int.new("source", # name
+                                            "Source", # nick
+                                            "The source data", # blurb
+                                            0,     # min
+                                            100,   # max
+                                            0,     # default
+                                            GLib::Param::READABLE |
+                                            GLib::Param::WRITABLE))
+      install_property(GLib::Param::Int.new("target", # name
+                                            "Target", # nick
+                                            "The target data", # blurb
+                                            0,     # min
+                                            100,   # max
+                                            0,     # default
+                                            GLib::Param::READABLE |
+                                            GLib::Param::WRITABLE))
+
+      attr_reader :source, :target
+      def initialize
+        @source = 0
+        @target = 0
+        super
+      end
+
+      def source=(value)
+        @source = value
+        notify("source")
+      end
+
+      def target=(value)
+        @target = value
+        notify("target")
+      end
     end
-  end
 
-  setup do
-    only_glib_version(2, 26, 0)
-  end
+    setup do
+      only_glib_version(2, 26, 0)
+    end
 
-  setup do
-    @source = DataObject.new
-    @target = DataObject.new
-    @binding = @source.bind_property("source", @target, "target", :default)
-  end
+    setup do
+      @source = DataObjectDefault.new
+      @target = DataObjectDefault.new
+      @binding = @source.bind_property("source", @target, "target", :default)
+    end
 
-  test "#source" do
-    assert_equal(@source, @binding.source)
-  end
+    test "#source" do
+      assert_equal(@source, @binding.source)
+    end
 
-  test "#source_property" do
-    assert_equal("source", @binding.source_property)
-  end
+    test "#source_property" do
+      assert_equal("source", @binding.source_property)
+    end
 
-  test "#target" do
-    assert_equal(@target, @binding.target)
-  end
+    test "#target" do
+      assert_equal(@target, @binding.target)
+    end
 
-  test "#target_property" do
-    assert_equal("target", @binding.target_property)
-  end
+    test "#target_property" do
+      assert_equal("target", @binding.target_property)
+    end
 
-  test "#flags" do
-    assert_equal(GLib::BindingFlags::DEFAULT, @binding.flags)
+    test "#flags" do
+      assert_equal(GLib::BindingFlags::DEFAULT, @binding.flags)
+    end
+
+    test "#unbind" do
+      only_glib_version(2, 38, 0)
+      assert_equal(0, @target.target)
+      @source.source = 10
+      assert_equal(10, @target.target)
+      @binding.unbind
+      @source.source = 20
+      assert_equal(10, @target.target)
+    end
   end
+  sub_test_case "bind_property_full" do
+    class DataObjectBidir < GLib::Object
+      type_register
+
+      install_property(GLib::Param::Int.new("source", # name
+                                            "Source", # nick
+                                            "The source data", # blurb
+                                            0,     # min
+                                            100,   # max
+                                            0,     # default
+                                            GLib::Param::READABLE |
+                                            GLib::Param::WRITABLE))
+      install_property(GLib::Param::String.new("target", # name
+                                               "Target", # nick
+                                               "The target data", # blurb
+                                               "",     # default
+                                               GLib::Param::READABLE |
+                                               GLib::Param::WRITABLE))
+
+      attr_reader :source, :target
+      def initialize
+        @source = 0
+        @target = "nan"
+        super
+      end
 
-  test "#unbind" do
-    only_glib_version(2, 38, 0)
-    assert_equal(0, @target.target)
-    @source.source = 10
-    assert_equal(10, @target.target)
-    @binding.unbind
-    @source.source = 20
-    assert_equal(10, @target.target)
+      def source=(value)
+        @source = value
+        notify("source")
+      end
+
+      def target=(value)
+        @target = value
+        notify("target")
+      end
+    end
+
+    setup do
+      only_glib_version(2, 26, 0)
+    end
+
+    setup do
+      @source = DataObjectBidir.new
+      @target = DataObjectBidir.new
+      transform_to_callback = proc do |source_value|
+        source_value.to_s
+      end
+
+      transform_from_callback = proc do |target_value|
+        target_value.to_i
+      end
+
+      @binding = @source.bind_property("source", @target, "target",
+                                       :bidirectional,
+                                       :transform_to => transform_to_callback,
+                                       :transform_from => transform_from_callback)
+    end
+
+    test "#source" do
+      assert_equal(@source, @binding.source)
+    end
+
+    test "#source_property" do
+      assert_equal("source", @binding.source_property)
+    end
+
+    test "#target" do
+      assert_equal(@target, @binding.target)
+    end
+
+    test "#target_property" do
+      assert_equal("target", @binding.target_property)
+    end
+
+    test "#flags" do
+      assert_equal(GLib::BindingFlags::BIDIRECTIONAL, @binding.flags)
+    end
+
+    test "#unbind" do
+      only_glib_version(2, 38, 0)
+      assert_equal("nan", @target.target)
+      @source.source = 10
+      assert_equal("10", @target.target)
+      @target.target = "30"
+      assert_equal(30, @source.source)
+      @binding.unbind
+      @source.source = 20
+      assert_equal("30", @target.target)
+    end
   end
 end