glib2 2.2.3-x86-mingw32 → 2.2.4-x86-mingw32

data/lib/gnome2/rake/native-binary-build-task.rb

@@ -96,6 +96,8 @@ module GNOME2
              "PKG_CONFIG_PATH=#{pkg_config_path}",
              "--prefix=#{dist_dir}",
              *package.native.configure_args) or exit(false)
+          env = []
+          env << "PKG_CONFIG_PATH=#{pkg_config_path}"
           common_make_args = []
           common_make_args << "GLIB_COMPILE_SCHEMAS=glib-compile-schemas"
           build_make_args = common_make_args.dup
@@ -104,8 +106,8 @@ module GNOME2
             make_n_jobs = ENV["MAKE_N_JOBS"]
             build_make_args << "-j#{make_n_jobs}" if make_n_jobs
           end
-          sh("nice", "make", *build_make_args) or exit(false)
-          sh("make", "install", *install_make_args) or exit(false)
+          sh("env", *env, "nice", "make", *build_make_args) or exit(false)
+          sh("env", *env, "make", "install", *install_make_args) or exit(false)
         end
       end
 

data/lib/gnome2/rake/package-task.rb

@@ -14,8 +14,8 @@ require "gnome2/rake/package"
 require "gnome2/rake/external-package"
 require "gnome2/rake/source-download-task"
 require "gnome2/rake/native-binary-build-task"
-require "gnome2/rake/win32-binary-download-task"
-require "gnome2/rake/win32-binary-build-task"
+require "gnome2/rake/windows-binary-download-task"
+require "gnome2/rake/windows-binary-build-task"
 
 module GNOME2
   module Rake
@@ -44,7 +44,7 @@ module GNOME2
         define_spec
         define_source_tasks
         define_native_tasks
-        define_win32_tasks
+        define_windows_tasks
         define_package_tasks
       end
 
@@ -69,11 +69,6 @@ module GNOME2
         @package.windows
       end
 
-      # For backward compatibility
-      def win32
-        windows
-      end
-
       def native
         @package.native
       end
@@ -133,7 +128,9 @@ module GNOME2
           files                   = FileList["ChangeLog", "README",
                                              "Rakefile", "extconf.rb",
                                              "lib/**/*.rb",
-                                             "{ext,sample,test,test-unit}/**/*"]
+                                             "ext/**/depend",
+                                             "ext/**/*.{c,h,def,rb}",
+                                             "{sample,test}/**/*"]
           files.existing!
           s.files                 = files
           s.required_ruby_version = @required_ruby_version || ">= 1.9.3"
@@ -160,40 +157,44 @@ module GNOME2
         task.define
       end
 
-      def define_win32_tasks
-        define_win32_extension_task
-        define_win32_download_task
-        define_win32_build_task
+      def define_windows_tasks
+        define_windows_extension_task
+        define_windows_download_task
+        define_windows_build_task
       end
 
       def so_base_name
         @name.gsub(/-/, "_")
       end
 
-      def define_win32_extension_task
+      def define_windows_extension_task
         ::Rake::ExtensionTask.new(so_base_name, @spec) do |ext|
           ext.cross_platform = cross_platform
           ext.ext_dir = "ext/#{@name}"
           ext.cross_compile = true
           ext.cross_compiling do |spec|
             if /mingw|mswin/ =~ spec.platform.to_s
-              win32_binary_dir = @package.windows.relative_binary_dir
-              win32_files = []
-              if win32_binary_dir.exist?
-                Find.find(win32_binary_dir.to_s) do |path|
+              windows_binary_dir = @package.windows.relative_binary_dir
+              windows_files = []
+              if windows_binary_dir.exist?
+                Find.find(windows_binary_dir.to_s) do |path|
                   next unless File.file?(path)
                   next if /\.zip\z/ =~ path
-                  win32_files << path
+                  windows_files << path
                 end
               end
-              spec.files += win32_files
+              spec.files += windows_files
               stage_path = "#{ext.tmp_dir}/#{ext.cross_platform}/stage"
-              win32_files.each do |win32_file|
-                stage_win32_file = "#{stage_path}/#{win32_file}"
-                stage_win32_binary_dir = File.dirname(stage_win32_file)
-                directory stage_win32_binary_dir
-                file stage_win32_file => [stage_win32_binary_dir, win32_file] do
-                  cp win32_file, stage_win32_file
+              windows_files.each do |windows_file|
+                stage_windows_file = "#{stage_path}/#{windows_file}"
+                stage_windows_binary_dir = File.dirname(stage_windows_file)
+                directory stage_windows_binary_dir
+                stage_windows_file_dependencies = [
+                  stage_windows_binary_dir,
+                  windows_file,
+                ]
+                file stage_windows_file => stage_windows_file_dependencies do
+                  cp windows_file, stage_windows_file
                 end
               end
             end
@@ -212,12 +213,12 @@ module GNOME2
         end
       end
 
-      def define_win32_download_task
-        GNOME2Win32BinaryDownloadTask.new(@package)
+      def define_windows_download_task
+        GNOME2WindowsBinaryDownloadTask.new(@package)
       end
 
-      def define_win32_build_task
-        GNOME2Win32BinaryBuildTask.new(@package)
+      def define_windows_build_task
+        GNOME2WindowsBinaryBuildTask.new(@package)
       end
 
       def define_package_tasks

data/lib/gnome2/rake/package.rb

@@ -129,6 +129,15 @@ module GNOME2
         def build_architecture
           ENV["RUBY_GNOME2_BUILD_ARCHITECTURE"] || "x86"
         end
+
+        def build_architecture_suffix
+          case build_architecture
+          when "x86"
+            "win32"
+          when "x64"
+            "win64"
+          end
+        end
       end
 
       class NativeConfiguration

data/lib/gnome2/rake/{win32-binary-build-task.rb → windows-binary-build-task.rb}

@@ -5,7 +5,7 @@
 require "open-uri"
 require "pathname"
 
-class GNOME2Win32BinaryBuildTask
+class GNOME2WindowsBinaryBuildTask
   include Rake::DSL
 
   def initialize(package)
@@ -15,20 +15,20 @@ class GNOME2Win32BinaryBuildTask
 
   private
   def define
-    namespace :win32 do
+    namespace :windows do
       namespace :builder do
         task :before
         define_build_tasks
         build_tasks = build_packages.collect do |package|
-          "win32:builder:build:#{package.name}"
+          "windows:builder:build:#{package.name}"
         end
         task :build => build_tasks
         task :after
       end
       desc "Build Windows binaries"
-      task :build => ["win32:builder:before",
-                      "win32:builder:build",
-                      "win32:builder:after"]
+      task :build => ["windows:builder:before",
+                      "windows:builder:build",
+                      "windows:builder:after"]
     end
   end
 
@@ -46,17 +46,18 @@ class GNOME2Win32BinaryBuildTask
           ENV["PKG_CONFIG_PATH"] = pkg_config_path.collect do |path|
             File.expand_path(path)
           end.join(":")
-          ENV["PKG_CONFIG_LIBDIR"] = rcairo_win32_pkgconfig_path
+          ENV["PKG_CONFIG_LIBDIR"] = rcairo_windows_pkgconfig_path
         end
 
         prepare_task_names << "pkg_config_for_build"
         task :pkg_config_for_build do
-          ENV["PKG_CONFIG_FOR_BUILD"] = "env - pkg-config"
+          # XXX: Is it needless?
+          # ENV["PKG_CONFIG_FOR_BUILD"] = "env - pkg-config"
         end
       end
 
       full_prepare_task_names = prepare_task_names.collect do |name|
-        "win32:builder:build:prepare:#{name}"
+        "windows:builder:build:prepare:#{name}"
       end
       task :prepare => full_prepare_task_names
 
@@ -68,7 +69,7 @@ class GNOME2Win32BinaryBuildTask
           if built_file
             built_file = dist_dir + built_file
             file built_file.to_s do
-              Rake::Task["win32:builder:build:prepare"].invoke
+              Rake::Task["windows:builder:build:prepare"].invoke
               Rake::Task[download_task].invoke
               build_package_task_body(package)
             end
@@ -81,7 +82,7 @@ class GNOME2Win32BinaryBuildTask
           task :after
         end
 
-        prefix = "win32:builder:build:#{package.name}"
+        prefix = "windows:builder:build:#{package.name}"
         desc "Build #{package.label} and install it into #{dist_dir}."
         task package.name => [
           "#{prefix}:before",
@@ -214,24 +215,25 @@ SET(CMAKE_FIND_ROOT_PATH #{cmake_root_paths.join(" ")})
     "#{glib2_binary_base_dir}/lib"
   end
 
-  def rcairo_win32_dir
-    @package.project_root_dir.parent + "rcairo.win32"
+  def rcairo_windows_dir
+    suffix = @package.windows.build_architecture_suffix
+    @package.project_root_dir.parent + "rcairo.#{suffix}"
   end
 
-  def rcairo_win32_binary_base_dir
-    rcairo_win32_dir + "vendor" + "local"
+  def rcairo_windows_binary_base_dir
+    rcairo_windows_dir + "vendor" + "local"
   end
 
-  def rcairo_win32_pkgconfig_path
-    "#{rcairo_win32_binary_base_dir}/lib/pkgconfig"
+  def rcairo_windows_pkgconfig_path
+    "#{rcairo_windows_binary_base_dir}/lib/pkgconfig"
   end
 
-  def rcairo_win32_include_path
-    "#{rcairo_win32_binary_base_dir}/include"
+  def rcairo_windows_include_path
+    "#{rcairo_windows_binary_base_dir}/include"
   end
 
-  def rcairo_win32_lib_path
-    "#{rcairo_win32_binary_base_dir}/lib"
+  def rcairo_windows_lib_path
+    "#{rcairo_windows_binary_base_dir}/lib"
   end
 
   def cc(package)
@@ -248,7 +250,7 @@ SET(CMAKE_FIND_ROOT_PATH #{cmake_root_paths.join(" ")})
       include_paths += [glib2_include_path]
     end
     include_paths += [
-      rcairo_win32_include_path,
+      rcairo_windows_include_path,
       dist_dir + 'include',
     ]
     cppflags = include_paths.collect do |path|
@@ -263,7 +265,7 @@ SET(CMAKE_FIND_ROOT_PATH #{cmake_root_paths.join(" ")})
       library_paths += [glib2_lib_path]
     end
     library_paths += [
-      rcairo_win32_lib_path,
+      rcairo_windows_lib_path,
       dist_dir + 'lib',
     ]
     ldflags = library_paths.collect do |path|
@@ -275,7 +277,7 @@ SET(CMAKE_FIND_ROOT_PATH #{cmake_root_paths.join(" ")})
   def cmake_root_paths
     paths = [
       "/usr/#{@package.windows.build_host}",
-      rcairo_win32_binary_base_dir.to_path,
+      rcairo_windows_binary_base_dir.to_path,
     ]
     @package.windows.build_dependencies.each do |package|
       paths << "#{@package.project_root_dir}/#{package}/vendor/local"

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

@@ -6,10 +6,10 @@ require 'open-uri'
 require 'rubygems'
 require 'mechanize'
 
-class GNOME2Win32BinaryDownloadTask
+class GNOME2WindowsBinaryDownloadTask
   include Rake::DSL
 
-  URL_BASE = "http://ftp.gnome.org/pub/gnome/binaries/win32"
+  URL_BASE = "http://ftp.gnome.org/pub/gnome/binaries"
   def initialize(package)
     @package = package
     define
@@ -17,7 +17,7 @@ class GNOME2Win32BinaryDownloadTask
 
   private
   def define
-    namespace :win32 do
+    namespace :windows do
       namespace :downloader do
         task :before
 
@@ -45,7 +45,7 @@ class GNOME2Win32BinaryDownloadTask
         end
 
         download_tasks = download_tasks.collect do |task|
-          "win32:downloader:download:#{task}"
+          "windows:downloader:download:#{task}"
         end
         desc "download Windows binaries into #{dist_dir}"
         task :download => download_tasks
@@ -53,9 +53,9 @@ class GNOME2Win32BinaryDownloadTask
         task :after
       end
       desc "download Windows binaries"
-      task :download => ["win32:downloader:before",
-                         "win32:downloader:download",
-                         "win32:downloader:after"]
+      task :download => ["windows:downloader:before",
+                         "windows:downloader:download",
+                         "windows:downloader:after"]
     end
   end
 
@@ -71,8 +71,13 @@ class GNOME2Win32BinaryDownloadTask
     @package.windows.dependencies
   end
 
+  def build_architecture_suffix
+    @package.windows.build_architecture_suffix
+  end
+
   def download_package(package)
-    version_page_url = "#{URL_BASE}/#{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
@@ -86,8 +91,8 @@ class GNOME2Win32BinaryDownloadTask
     latest_version_page = latest_version_link.click
     latest_version = latest_version_page.links.collect do |link|
       case link.href
-      when /#{escaped_package}_([\d\.\-]+)_win32\.zip\z/,
-           /#{escaped_package}-([\d\.\-]+)-win32\.zip\z/, # old
+      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|
@@ -107,8 +112,8 @@ class GNOME2Win32BinaryDownloadTask
     escaped_latest_version = Regexp.escape(latest_version)
     latest_version_page.links.each do |link|
       case link.href
-      when /#{escaped_package}(?:-dev)?_#{escaped_latest_version}_win32\.zip\z/,
-           /#{escaped_package}(?:-dev)?-#{escaped_latest_version}-win32\.zip\z/, # old
+      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
@@ -116,6 +121,7 @@ class GNOME2Win32BinaryDownloadTask
   end
 
   def download_dependency(dependency)
+    suffix = build_architecture_suffix
     dependency_version = "any"
     dependency_version_re = /[\d\.\-]+/
     if dependency.is_a?(Array)
@@ -127,7 +133,7 @@ class GNOME2Win32BinaryDownloadTask
     dependencies_page = agent.get(dependencies_url)
     latest_version = dependencies_page.links.collect do |link|
       case link.href
-      when /\A#{escaped_dependency}_(#{dependency_version_re})_win32\.zip\z/
+      when /\A#{escaped_dependency}_(#{dependency_version_re})_#{suffix}\.zip\z/
         version = $1
         [version.split(/[\.\-]/).collect {|component| component.to_i}, version]
       else
@@ -145,7 +151,7 @@ class GNOME2Win32BinaryDownloadTask
     escaped_latest_version = Regexp.escape(latest_version)
     dependencies_page.links.each do |link|
       case link.href
-      when /\A#{escaped_dependency}(?:-dev)?_#{escaped_latest_version}_win32\.zip\z/
+      when /\A#{escaped_dependency}(?:-dev)?_#{escaped_latest_version}_#{suffix}\.zip\z/
         click_zip_link(link)
       end
     end

data/lib/mkmf-gnome2.rb

@@ -109,8 +109,8 @@ if ENV['GTK_BASEPATH'] and /cygwin/ !~ RUBY_PLATFORM
   $CFLAGS += " -I#{include_path} "
 end
 
-def setup_win32(target_name, base_dir=nil)
-  checking_for(checking_message("Win32 OS")) do
+def setup_windows(target_name, base_dir=nil)
+  checking_for(checking_message("Windows")) do
     case RUBY_PLATFORM
     when /cygwin|mingw|mswin/
       import_library_name = "libruby-#{target_name}.a"
@@ -130,6 +130,10 @@ def setup_win32(target_name, base_dir=nil)
     end
   end
 end
+# For backward compatibility
+def setup_win32(*args, &block)
+  setup_windows(*args, &block)
+end
 
 def find_gem_spec(package)
   begin
@@ -446,7 +450,27 @@ def glib_mkenums(prefix, files, g_type_prefix, include_files, options={})
 end
 
 def check_cairo(options={})
+  is_windows = (/mingw|cygwin|mswin/ === RUBY_PLATFORM)
+
   rcairo_source_dir = options[:rcairo_source_dir]
+  if rcairo_source_dir.nil?
+    suffix = nil
+    if is_windows
+      case RUBY_PLATFORM
+      when /\Ax86-mingw/
+        suffix = "win32"
+      when /\Ax64-mingw/
+        suffix = "win64"
+      end
+    end
+    rcairo_source_base_dir = "rcairo"
+    rcairo_source_base_dir << ".#{suffix}" if suffix
+    top_dir = options[:top_dir]
+    if top_dir
+      rcairo_source_dir = File.join(top_dir, "..", rcairo_source_base_dir)
+    end
+  end
+
   if rcairo_source_dir and !File.exist?(rcairo_source_dir)
     rcairo_source_dir = nil
   end
@@ -456,7 +480,7 @@ def check_cairo(options={})
   end
 
   unless rcairo_source_dir.nil?
-    if /mingw|cygwin|mswin/ =~ RUBY_PLATFORM
+    if is_windows
       options = {}
       build_dir = "tmp/#{RUBY_PLATFORM}/cairo/#{RUBY_VERSION}"
       if File.exist?(File.join(rcairo_source_dir, build_dir))