glib2 0.90.5-x86-mingw32 → 0.90.6-x86-mingw32

data/ChangeLog

@@ -1,3 +1,82 @@
+2011-01-30  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/mkmf-gnome2.rb (setup_win32): add vendor/local/ existence check.
+
+	* lib/gnome2-win32-binary-downloader.rb
+	(GNOME2Win32BinaryDownloader#download_package): support old Win32
+	binary URL for goocanvas.
+
+	* lib/gnome2-win32-binary-downloader.rb
+	(GNOME2Win32BinaryDownloader#download_package): support old Win32
+	binary URL for gtksourceview.
+
+	* lib/gnome2-win32-binary-downloader.rb
+	(GNOME2Win32BinaryDownloader#download_dependency): support
+	specifying version.
+
+	* lib/gnome2-win32-binary-downloader.rb
+	(GNOME2Win32BinaryDownloader#download_dependency): improve error
+	handling.
+
+	* lib/gnome2-win32-binary-downloader.rb
+	(GNOME2Win32BinaryDownloader#download_package): just handle
+	"PACKAGE_VERSION-win32.zip" and "PACKAGE-dev_VERSION-win32.zip".
+
+	* lib/mkmf-gnome2.rb (setup_win32): use rcairo's
+	vendor/local/lib/pkgconfig if it exists.
+
+	* lib/mkmf-gnome2.rb (setup_win32): don't override 'prefix=' in *.pc.
+
+	* lib/mkmf-gnome2.rb (add_depend_package): add dependency
+	package's vendor/local/lib/pkgconfig to PKGConfig path.
+
+	* lib/gnome2-raketask.rb (GNOME2Package#define_win32_tasks): don't
+	require 'vendor/local'.
+
+	* lib/gnome2-win32-binary-downloader.rb: override "prefix=" for
+	downloaded *.pc.
+
+	* lib/gnome2-raketask.rb: add missing "require 'find'".
+
+	* lib/gnome2-win32-binary-downloader.rb
+	(GNOME2Win32BinaryDownloader#click_zip_link): override existing
+	files without prompting.
+
+2011-01-29  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/mkmf-gnome2.rb:
+	- add load error check.
+	- remove needless rb_cairo.h check.
+
+2011-01-28  Masaaki Aoyagi
+
+	* lib/mkmf-gnome2.rb: fix check_cairo.
+
+2011-01-21  Masaaki Aoyagi
+
+	* lib/gnome2-raketask.rb: add.
+
+	* Rakefile: change to use gnome2-raketask.rb.
+
+2011-01-02  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/mkmf-gnome2.rb: support "2.0b7" style module
+	version for xulrunner-2.0b7. #3141244
+	Reported by reandr. Thanks!!!
+
+2010-11-04  Nikolai Weibull
+
+	* lib/glib2.rb: Use ::File to access Ruby File class.
+
+2010-10-30  Kouhei Sutou  <kou@cozmixng.org>
+
+	* ext/glib2/rbgobj_type.c (rbgobj_gtype_new): fix GType
+	conversion. GType is unsigned long not unsigned int.
+
+2010-10-28  Kouhei Sutou  <kou@clear-code.com>
+
+	* ext/glib2/rbglib.h: 0.90.5 -> 0.90.6.
+
 2010-10-27  Kouhei Sutou  <kou@clear-code.com>
 
 	* lib/glib-mkenums.rb: work on LANG=C environment.

data/Rakefile

@@ -1,70 +1,13 @@
 # -*- ruby -*-
 
-require 'find'
-require 'rubygems'
-require 'rake/extensiontask'
+require './lib/gnome2-raketask'
 
-task :default => :build
-
-def version
-  @version ||= ENV["VERSION"] || guess_version
-end
-
-def guess_version
-  versions = {}
-  File.open("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
-
-package_name = "glib2"
-
-spec = Gem::Specification.new do |s|
-  s.name = package_name
-  s.summary = "Ruby/GLib2 is a Ruby binding of GLib-2.x."
-  s.description = "Ruby/GLib2 is a Ruby binding of GLib-2.x."
-  s.author = "The Ruby-GNOME2 Proejct Team"
-  s.email = "ruby-gnome2-devel-en@lists.sourceforge.net"
-  s.homepage = "http://ruby-gnome2.sourceforge.jp/"
-  s.version = version
-  s.platform = Gem::Platform::RUBY
-  s.extensions = FileList["ext/#{package_name}/extconf.rb"]
-  s.require_paths = ["lib"]
-  s.add_dependency("pkg-config", ">= 0")
-  s.files = FileList["ChangeLog", "README", "Rakefile", "extconf.rb",
-                     "lib/**/*.rb", "{ext,sample,test,test-unit}/**/*"]
+package = GNOME2Package.new do |_package|
+  _package.summary = "Ruby/GLib2 is a Ruby binding of GLib-2.x."
+  _package.description = "Ruby/GLib2 is a Ruby binding of GLib-2.x."
+  _package.dependency.gem.runtime = [["pkg-config", ">= 0"]]
+  _package.win32.packages = ["glib"]
+  _package.win32.dependencies = ["gettext-runtime"]
 end
+package.define_tasks
 
-Rake::GemPackageTask.new(spec) do |pkg|
-end
-
-Rake::ExtensionTask.new(package_name, spec) do |ext|
-  ext.cross_compile = true
-  ext.cross_compiling do |spec|
-    if /mingw|mswin/ =~ spec.platform.to_s
-      win32_dir = File.join("vendor", "local")
-      win32_files = []
-      Find.find(win32_dir) do |file|
-        next if /\.zip\z/ =~ file
-        win32_files << file
-      end
-      spec.files += win32_files
-    end
-  end
-end
-
-namespace :win32 do
-  desc "download Windows binaries"
-  task :download do
-    base_dir = File.join(File.dirname(__FILE__), "lib")
-    $LOAD_PATH.unshift(base_dir)
-    require 'gnome2-win32-binary-downloader'
-    GNOME2Win32BinaryDownloader.download(:package => "glib",
-                                         :dependencies => ["gettext-runtime"])
-  end
-end

data/ext/glib2/rbglib.h

@@ -23,7 +23,7 @@ extern "C" {
 
 #define RBGLIB_MAJOR_VERSION 0
 #define RBGLIB_MINOR_VERSION 90
-#define RBGLIB_MICRO_VERSION 5
+#define RBGLIB_MICRO_VERSION 6
 
 #ifndef RSTRING_PTR
 #  define RSTRING_PTR(s) (RSTRING(s)->ptr)

data/ext/glib2/rbgobj_type.c

@@ -411,7 +411,7 @@ rbgobj_gtype_new(gtype)
     GType gtype;
 {
     VALUE result = rb_obj_alloc(rbgobj_cType);
-    VALUE arg = UINT2NUM(gtype);
+    VALUE arg = ULONG2NUM(gtype);
     rb_obj_call_init(result, 1, &arg);
     return result;
 }

data/lib/glib2.rb

@@ -65,11 +65,11 @@ module GLib
     path = Pathname(path) unless path.is_a?(Pathname)
     if path.exist?
       environment_name = "PATH"
-      separator = File::PATH_SEPARATOR
+      separator = ::File::PATH_SEPARATOR
 
       paths = (ENV[environment_name] || '').split(/#{separator}/)
       dir = path.to_s
-      dir = dir.gsub(/\//, File::ALT_SEPARATOR) if File::ALT_SEPARATOR
+      dir = dir.gsub(/\//, ::File::ALT_SEPARATOR) if ::File::ALT_SEPARATOR
       unless paths.include?(dir)
         paths = [dir] + paths
         ENV[environment_name] = paths.join(separator)

data/lib/gnome2-raketask.rb

@@ -0,0 +1,185 @@
+# coding: utf-8
+
+# Copyright(C) 2011 Ruby-GNOME2 Project.
+#
+# This program is licenced under the same license of Ruby-GNOME2.
+
+require 'find'
+
+require 'rubygems'
+require 'rake/extensiontask'
+
+class GNOME2Package
+  attr_accessor :name, :summary, :description, :author, :email, :homepage, :post_install_message
+  def initialize
+    initialize_variables
+    initialize_configurations
+    file, line, method = caller[1].scan(/^(.*):(\d+)(?::.*`(.*)')?\Z/).first
+    @package_root = File.dirname(file)
+    @glib2_root = File.expand_path("#{@package_root}/../glib2")
+    @packages = FileList["#{File.dirname(@package_root)}/*"].map{|f| File.directory?(f) ? File.basename(f) : nil}.compact
+    @name = File.basename(@package_root)
+    yield(self) if block_given?
+  end
+
+  def define_tasks
+    task :default => :build
+    define_gem_tasks
+    define_win32_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}/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 Proejct 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_gem_tasks
+    @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
+      s.extensions            = FileList["ext/#{@name}/extconf.rb"]
+      s.require_paths         = ["lib"]
+      s.files                 = FileList[
+          "ChangeLog", "README", "Rakefile", "extconf.rb",
+          "lib/**/*.rb", "{ext,sample,test,test-unit}/**/*"]
+      s.post_install_message  = @post_install_message
+      @dependency_configuration.apply(s)
+    end
+
+    Rake::GemPackageTask.new(@spec) do |pkg|
+    end
+  end
+
+  def define_win32_tasks
+    Rake::ExtensionTask.new(@name, @spec) do |ext|
+      ext.cross_compile = true
+      ext.cross_compiling do |spec|
+        if /mingw|mswin/ =~ spec.platform.to_s
+          win32_dir = File.join("vendor", "local")
+          win32_files = []
+          if File.exist?(win32_dir)
+            Find.find(win32_dir) do |file|
+              next if /\.zip\z/ =~ file
+              win32_files << file
+            end
+          end
+          spec.files += win32_files
+        end
+      end
+    end
+
+    namespace :win32 do
+      desc "download Windows binaries"
+      task :download do
+        $LOAD_PATH.unshift("#{@glib2_root}/lib")
+        require 'gnome2-win32-binary-downloader'
+        GNOME2Win32BinaryDownloader.download(@win32_configuration.to_hash)
+      end
+    end
+  end
+
+  class DependencyConfiguration
+    attr_accessor :platform, :ruby
+    def initialize(package)
+      @package = package
+      @platform = Gem::Platform::RUBY
+      @ruby = ">=1.8.5"
+      @gem_configuration = GemConfiguration.new(@package)
+    end
+
+    def gem
+      @gem_configuration
+    end
+
+    def apply(spec)
+      spec.platform = @platform
+      spec.required_ruby_version = @ruby
+      @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_accessor :packages, :dependencies
+    def initialize(package)
+      @package = package
+      @packages = []
+      @dependencies = []
+    end
+
+    def to_hash
+      {
+        :packages => @packages,
+        :dependencies => @dependencies,
+      }
+    end
+  end
+end
+

data/lib/gnome2-win32-binary-downloader.rb

@@ -23,11 +23,13 @@ class GNOME2Win32BinaryDownloader
 
   URL_BASE = "http://ftp.gnome.org/pub/gnome/binaries/win32"
   def initialize(options={})
-    @output_dir = options[:output_dir] || File.join("vendor", "local")
+    output_dir = options[:output_dir] || File.join("vendor", "local")
+    @output_dir = File.expand_path(output_dir)
   end
 
   def download_package(package)
-    version_page = agent.get("#{URL_BASE}/#{package}")
+    version_page_url = "#{URL_BASE}/#{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}
@@ -36,11 +38,18 @@ class GNOME2Win32BinaryDownloader
       end
     end.last
 
+    escaped_package = Regexp.escape(package)
     latest_version_page = latest_version_link.click
     latest_version = latest_version_page.links.collect do |link|
-      if /_([\d\.\-]+)_win32\.zip\z/ =~ link.href
+      case link.href
+      when /#{escaped_package}_([\d\.\-]+)_win32\.zip\z/,
+           /#{escaped_package}-([\d\.\-]+)-win32\.zip\z/, # old
+           /#{escaped_package}-([\d\.\-]+)\.zip\z/ # old
         version = $1
-        [version.split(/[\.\-]/).collect {|component| component.to_i}, version]
+        normalized_version = version.split(/[\.\-]/).collect do |component|
+          component.to_i
+        end
+        [normalized_version, version]
       else
         [[-1], nil]
       end
@@ -48,17 +57,33 @@ class GNOME2Win32BinaryDownloader
       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|
-      if /_#{Regexp.escape(latest_version)}_win32\.zip\z/ =~ link.href
+      case link.href
+      when /#{escaped_package}(?:-dev)?_#{escaped_latest_version}_win32\.zip\z/,
+           /#{escaped_package}(?:-dev)?-#{escaped_latest_version}-win32\.zip\z/, # old
+           /#{escaped_package}(?:-dev)?-#{escaped_latest_version}\.zip\z/ # old
         click_zip_link(link)
       end
     end
   end
 
   def download_dependency(dependency)
-    dependencies_page = agent.get("#{URL_BASE}/dependencies")
+    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|
-      if /\A#{Regexp.escape(dependency)}_([\d\.\-]+)_win32\.zip\z/ =~ link.href
+      case link.href
+      when /\A#{escaped_dependency}_(#{dependency_version_re})_win32\.zip\z/
         version = $1
         [version.split(/[\.\-]/).collect {|component| component.to_i}, version]
       else
@@ -67,8 +92,16 @@ class GNOME2Win32BinaryDownloader
     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|
-      if /\A#{Regexp.escape(dependency)}(?:-dev)?_#{Regexp.escape(latest_version)}_win32.zip/ =~ link.href
+      case link.href
+      when /\A#{escaped_dependency}(?:-dev)?_#{escaped_latest_version}_win32.zip/
         click_zip_link(link)
       end
     end
@@ -86,7 +119,14 @@ class GNOME2Win32BinaryDownloader
       open(zip.filename, "wb") do |file|
         file.print(zip.body)
       end
-      system("unzip '#{zip.filename}'")
+      system("unzip", "-o", zip.filename)
+      Dir.glob("lib/pkgconfig/*.pc") do |pc_path|
+        pc = File.read(pc_path)
+        pc = pc.gsub(/\Aprefix=.+$/) {"prefix=#{@output_dir}"}
+        File.open(pc_path, "w") do |pc_file|
+          pc_file.print(pc)
+        end
+      end
     end
   end
 end