glib2 1.1.4 → 1.1.5

data/Rakefile

@@ -1,6 +1,7 @@
 # -*- ruby -*-
 
-require './lib/gnome2-raketask'
+$LOAD_PATH.unshift("./lib")
+require 'gnome2-raketask'
 
 package = GNOME2Package.new do |_package|
   _package.summary = "Ruby/GLib2 is a Ruby binding of GLib-2.x."
@@ -8,7 +9,20 @@ package = GNOME2Package.new do |_package|
   _package.dependency.gem.runtime = [["pkg-config", ">= 0"]]
   _package.dependency.gem.development = [["test-unit", ">= 2"]]
   _package.win32.packages = ["glib"]
-  _package.win32.dependencies = ["gettext-runtime"]
+  _package.win32.dependencies = ["gettext-runtime", "gnutls"]
+  _package.win32.build_packages = [
+    {
+      :name => "glib-networking",
+      :download_site => :gnome,
+      :label => "glib-networking",
+      :version => "2.28.7",
+      :configure_args => ["--without-libproxy",
+                          "--without-gnome-proxy",
+                          "--without-ca-certificates"],
+      :patches => ["glib-networking-2.28.7-fix-with-gnome-proxy.diff",
+                   "glib-networking-2.28.7-support-gnutls-2.4.2.diff"],
+      :need_autoreconf => true,
+    },
+  ]
 end
 package.define_tasks
-

data/ext/glib2/rbglib.h

@@ -35,7 +35,7 @@ extern "C" {
 
 #define RBGLIB_MAJOR_VERSION 1
 #define RBGLIB_MINOR_VERSION 1
-#define RBGLIB_MICRO_VERSION 4
+#define RBGLIB_MICRO_VERSION 5
 
 #ifndef RSTRING_PTR
 #  define RSTRING_PTR(s) (RSTRING(s)->ptr)

data/lib/gnome2-raketask.rb

@@ -9,19 +9,22 @@ 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
-    @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)
+    @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
@@ -55,7 +58,7 @@ class GNOME2Package
 
   def guess_version
     versions = {}
-    File.open("#{@glib2_root}/ext/glib2/rbglib.h") do |rbglib_h|
+    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
@@ -104,19 +107,20 @@ class GNOME2Package
   end
 
   def define_win32_tasks
-    define_win32_build_task
+    define_win32_extension_task
     define_win32_download_task
+    define_win32_build_task
   end
 
-  def define_win32_build_task
+  def define_win32_extension_task
     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_binary_dir = @win32_configuration.relative_binary_dir
           win32_files = []
-          if File.exist?(win32_dir)
-            Find.find(win32_dir) do |file|
+          if File.exist?(win32_binary_dir)
+            Find.find(win32_binary_dir) do |file|
               next if /\.zip\z/ =~ file
               win32_files << file
             end
@@ -130,22 +134,11 @@ class GNOME2Package
     end
 
     def define_win32_download_task
-      namespace :win32 do
-        namespace :downloader do
-          task :before do
-            $LOAD_PATH.unshift("#{@glib2_root}/lib")
-            require 'gnome2-win32-binary-downloader'
-          end
-          task :download do
-            GNOME2Win32BinaryDownloader.download(@win32_configuration.to_hash)
-          end
-          task :after
-        end
-        desc "download Windows binaries"
-        task :download => ["win32:downloader:before",
-                           "win32:downloader:download",
-                           "win32:downloader:after"]
-      end
+      GNOME2Win32BinaryDownloadTask.new(@win32_configuration)
+    end
+
+    def define_win32_build_task
+      GNOME2Win32BinaryBuildTask.new(@win32_configuration)
     end
   end
 
@@ -198,19 +191,30 @@ class GNOME2Package
   end
 
   class Win32Configuration
-    attr_accessor :packages, :dependencies
+    attr_reader :package
+    attr_accessor :packages, :dependencies, :build_packages, :build_dependencies
+    attr_accessor :build_host
+    attr_accessor :relative_binary_dir, :absolute_binary_dir
     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)
     end
 
     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,
       }
     end
   end
 end
-

data/lib/gnome2-win32-binary-build-task.rb

@@ -0,0 +1,191 @@
+# Copyright(C) 2012 Ruby-GNOME2 Project.
+#
+# This program is licenced under the same license of Ruby-GNOME2.
+
+require "open-uri"
+require "pathname"
+
+class GNOME2Win32BinaryBuildTask
+  include Rake::DSL
+
+  def initialize(configuration)
+    @configuration = configuration
+    define
+  end
+
+  private
+  def define
+    namespace :win32 do
+      namespace :builder do
+        task :before
+        define_download_tasks
+        define_build_tasks
+        build_tasks = build_packages.collect do |package|
+          "win32:builder:build:#{package[:name]}"
+        end
+        desc "Build Windows binaries"
+        task :build => build_tasks
+        task :after
+      end
+      desc "download source and build Windows binaries"
+      task :build => ["win32:builder:before",
+                      "win32:builder:build",
+                      "win32:builder:after"]
+    end
+  end
+
+  def define_download_tasks
+    namespace :download do
+      build_packages.each do |package|
+        base = "#{package[:name]}-#{package[:version]}"
+        tar_gz = "#{base}.tar.gz"
+        tar_gz_url = "#{download_base_url(package)}/#{tar_gz}"
+        tar_gz_full_path = download_dir + tar_gz
+
+        desc "Download #{package[:label]} into #{download_dir}."
+        task package[:name] => tar_gz_full_path.to_s
+
+        directory_path = tar_gz_full_path.dirname
+        directory directory_path.to_s
+        file tar_gz_full_path.to_s => directory_path.to_s do
+          rake_output_message "downloading... #{tar_gz_url}"
+          open(tar_gz_url) do |downloaded_tar_gz|
+            tar_gz_full_path.open("wb") do |tar_gz_file|
+              tar_gz_file.print(downloaded_tar_gz.read)
+            end
+          end
+        end
+      end
+    end
+  end
+
+  def define_build_tasks
+    namespace :build do
+      task :prepare do
+        depended_packages = @configuration.build_dependencies
+        use_packages = [@configuration.package.name] + depended_packages
+        pkg_config_path = use_packages.collect do |package|
+          "../#{package}/#{@configuration.relative_binary_dir}/lib/pkgconfig"
+        end
+        ENV["PKG_CONFIG_PATH"] = pkg_config_path.collect do |path|
+          File.expand_path(path)
+        end.join(":")
+        ENV["PKG_CONFIG_LIBDIR"] = rcairo_win32_pkgconfig_path
+      end
+
+      build_packages.each do |package|
+        download_task = "win32:builder:download:#{package[:name]}"
+        desc "Build #{package[:label]} and install it into #{dist_dir}."
+        task package[:name] => [:prepare, download_task] do
+          package_tmp_dir = tmp_dir + package[:name]
+          rm_rf(package_tmp_dir)
+          mkdir_p(package_tmp_dir)
+
+          base = "#{package[:name]}-#{package[:version]}"
+          tar_gz = "#{base}.tar.gz"
+          tar_gz_full_path = download_dir + tar_gz
+          Dir.chdir(package_tmp_dir.to_s) do
+            sh("tar", "xzf", tar_gz_full_path.to_s) or exit(false)
+          end
+
+          Dir.chdir((package_tmp_dir + base).to_s) do
+            (package[:patches] || []).each do |patch|
+              sh("patch -p1 < #{patches_dir}/#{patch}")
+            end
+            sh("./autogen.sh") if package[:need_autogen]
+            sh("autoreconf -i") if package[:need_autoreconf]
+            sh("./configure",
+               "CPPFLAGS=-I#{rcairo_win32_include_path} -I#{dist_dir + 'include'}",
+               "LDFLAGS=-L#{rcairo_win32_lib_path} -L#{dist_dir + 'lib'}",
+               "--prefix=#{dist_dir}",
+               "--host=#{@configuration.build_host}",
+               *package[:configure_args]) or exit(false)
+            common_make_args = []
+            common_make_args << "GLIB_COMPILE_SCHEMAS=glib-compile-schemas"
+            build_make_args = common_make_args.dup
+            install_make_args = common_make_args.dup
+            make_n_jobs = ENV["MAKE_N_JOBS"]
+            build_make_args << "-j#{make_n_jobs}" if make_n_jobs
+            ENV["GREP_OPTIONS"] = "--text"
+            sh("nice", "make", *build_make_args) or exit(false)
+            sh("make", "install", *install_make_args) or exit(false)
+
+            package_license_dir = license_dir + package[:name]
+            mkdir_p(package_license_dir)
+            package_license_files = ["AUTHORS", "COPYING", "COPYING.LIB"]
+            package_license_files = package_license_files.reject do |file|
+              not File.exist?(file)
+            end
+            cp(package_license_files, package_license_dir)
+            bundled_packages = package[:bundled_packages] || []
+            bundled_packages.each do |bundled_package|
+              bundled_package_license_dir = license_dir + bundled_package[:name]
+              mkdir_p(bundled_package_license_dir)
+              license_files = bundled_package[:license_files].collect do |file|
+                File.join(bundled_package[:path], file)
+              end
+              cp(license_files, bundled_package_license_dir)
+            end
+          end
+        end
+      end
+    end
+  end
+
+  def build_packages
+    @configuration.build_packages
+  end
+
+  def dist_dir
+    Pathname.new(@configuration.absolute_binary_dir)
+  end
+
+  def license_dir
+    dist_dir + "share" + "license"
+  end
+
+  def package_root_dir
+    Pathname.new(@configuration.package.root_dir)
+  end
+
+  def tmp_dir
+    package_root_dir + "tmp"
+  end
+
+  def download_dir
+    tmp_dir + "download"
+  end
+
+  def patches_dir
+    package_root_dir + "patches"
+  end
+
+  def rcairo_win32_dir
+    package_root_dir.parent.parent + "rcairo.win32"
+  end
+
+  def rcairo_win32_pkgconfig_path
+    "#{rcairo_win32_dir}/vendor/local/lib/pkgconfig"
+  end
+
+  def rcairo_win32_include_path
+    "#{rcairo_win32_dir}/vendor/local/include"
+  end
+
+  def rcairo_win32_lib_path
+    "#{rcairo_win32_dir}/vendor/local/lib"
+  end
+
+  def download_base_url(package)
+    download_base_url = package[:download_base_url]
+    return download_base_url if download_base_url
+
+    case package[:download_site]
+    when :gnome
+      download_base_url = "http://ftp.gnome.org/pub/gnome/sources"
+      release_series = package[:version].gsub(/\A(\d+\.\d+).+\z/, '\1')
+      download_base_url << "/#{package[:name]}/#{release_series}"
+    end
+    download_base_url
+  end
+end

data/lib/{gnome2-win32-binary-downloader.rb → gnome2-win32-binary-download-task.rb}

@@ -1,4 +1,4 @@
-# Copyright(C) 2010 Ruby-GNOME2 Project.
+# Copyright(C) 2010-2012 Ruby-GNOME2 Project.
 #
 # This program is licenced under the same license of Ruby-GNOME2.
 
@@ -6,25 +6,69 @@ require 'open-uri'
 require 'rubygems'
 require 'mechanize'
 
-class GNOME2Win32BinaryDownloader
-  class << self
-    def download(options)
-      downloader = new(options)
-      packages = options[:packages] || [options[:package]]
-      packages.compact.each do |package|
-        downloader.download_package(package)
-      end
-      dependencies = options[:dependencies] || [options[:dependency]]
-      dependencies.compact.each do |dependency|
-        downloader.download_dependency(dependency)
+class GNOME2Win32BinaryDownloadTask
+  include Rake::DSL
+
+  URL_BASE = "http://ftp.gnome.org/pub/gnome/binaries/win32"
+  def initialize(configuration)
+    @configuration = configuration
+    define
+  end
+
+  private
+  def define
+    namespace :win32 do
+      namespace :downloader do
+        task :before
+
+        download_tasks = []
+        namespace :download do
+          directory dist_dir
+          task :prepare => [dist_dir]
+
+          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 = download_tasks.collect do |task|
+          "win32:downloader:download:#{task}"
+        end
+        desc "download Windows binaries into #{dist_dir}"
+        task :download => download_tasks
+
+        task :after
       end
+      desc "download Windows binaries"
+      task :download => ["win32:downloader:before",
+                         "win32:downloader:download",
+                         "win32:downloader:after"]
     end
   end
 
-  URL_BASE = "http://ftp.gnome.org/pub/gnome/binaries/win32"
-  def initialize(options={})
-    output_dir = options[:output_dir] || File.join("vendor", "local")
-    @output_dir = File.expand_path(output_dir)
+  def dist_dir
+    @configuration.absolute_binary_dir
+  end
+
+  def packages
+    @configuration.packages
+  end
+
+  def dependencies
+    @configuration.dependencies
   end
 
   def download_package(package)
@@ -114,15 +158,14 @@ class GNOME2Win32BinaryDownloader
 
   def click_zip_link(link)
     zip = link.click
-    FileUtils.mkdir_p(@output_dir)
-    Dir.chdir(@output_dir) do
+    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=#{@output_dir}"}
+        pc = pc.gsub(/\Aprefix=.+$/) {"prefix=#{dist_dir}"}
         File.open(pc_path, "w") do |pc_file|
           pc_file.print(pc)
         end

metadata

@@ -1,67 +1,64 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: glib2
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 1.1.5
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 4
-  version: 1.1.4
 platform: ruby
-authors: 
+authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: pkg-config
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: test-unit
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
 description: Ruby/GLib2 is a Ruby binding of GLib-2.x.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
-
-extensions: 
+extensions:
 - ext/glib2/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - README
 - Rakefile
 - extconf.rb
 - lib/glib2/deprecatable.rb
+- lib/gnome2-win32-binary-build-task.rb
 - lib/gnome2-raketask.rb
-- lib/gnome2-win32-binary-downloader.rb
 - lib/glib2.rb
 - lib/mkmf-gnome2.rb
+- lib/gnome2-win32-binary-download-task.rb
 - lib/glib-mkenums.rb
 - ext/glib2/rbglib_timer.c
 - ext/glib2/rbglib_completion.c
@@ -163,38 +160,26 @@ files:
 - test/glib-test-init.rb
 homepage: http://ruby-gnome2.sourceforge.jp/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 61
-      segments: 
-      - 1
-      - 8
-      - 5
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.5
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby/GLib2 is a Ruby binding of GLib-2.x.
 test_files: []
-