glib2 0.20.0 → 0.90.2

data/extconf.rb

@@ -1,61 +1,49 @@
-=begin
-extconf.rb for Ruby/GLib extention library
-=end
-
-TOPDIR = File.expand_path(File.dirname(__FILE__))
-MKMF_GNOME2_DIR = TOPDIR + '/src/lib'
-SRCDIR = TOPDIR + '/src'
-
-$LOAD_PATH.unshift MKMF_GNOME2_DIR
-
-PACKAGE_NAME = "glib2"
-PACKAGE_ID   = "gobject-2.0"
-
-require 'mkmf-gnome2'
-
-PKGConfig.have_package(PACKAGE_ID) or exit 1
-PKGConfig.have_package('gthread-2.0')
-
-setup_win32(PACKAGE_NAME)
-
-have_header("unistd.h")
-have_header("io.h")
-
-glib_header = "glib.h"
-have_func("g_spawn_close_pid", glib_header)
-have_func("g_thread_init", glib_header)
-have_func("g_main_depth", glib_header)
-have_func("g_listenv", glib_header)
-
-ruby_header = "ruby.h"
-have_func("rb_check_array_type", ruby_header)
-have_func("rb_exec_recursive", ruby_header)
-have_func("rb_errinfo", ruby_header)
-have_func("rb_sourcefile", ruby_header)
-have_func("rb_sourceline", ruby_header)
-have_func("ruby_set_current_source", ruby_header)
-have_func("rb_thread_blocking_region", ruby_header)
-have_func("ruby_native_thread_p", ruby_header)
-have_func("rb_str_encode", ruby_header)
-
-have_var("curr_thread", [ruby_header, "node.h"])
-have_var("rb_curr_thread", [ruby_header, "node.h"])
-
-create_pkg_config_file("Ruby/GLib2", PACKAGE_ID)
-
-create_makefile_at_srcdir(PACKAGE_NAME, SRCDIR, "-DRUBY_GLIB2_COMPILATION") do
-  enum_type_prefix = "glib-enum-types"
-  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
-  end
-  include_paths = PKGConfig.cflags_only_I("gobject-2.0")
-  headers = include_paths.split.inject(headers) do |result, path|
-    result + Dir.glob(File.join(path.sub(/^-I/, ""), "gobject", "gsignal.h"))
-  end
-  glib_mkenums(enum_type_prefix, headers, "G_TYPE_", ["glib-object.h"])
+#!/usr/bin/env ruby
+
+require 'pathname'
+require 'mkmf'
+require 'rbconfig'
+require 'fileutils'
+
+package = "glib2"
+
+base_dir = Pathname(__FILE__).dirname.expand_path
+ext_dir = base_dir + "ext" + package
+mkmf_gnome2_dir = base_dir + 'lib'
+
+ruby = File.join(RbConfig::CONFIG['bindir'],
+                 RbConfig::CONFIG['ruby_install_name'] +
+                 RbConfig::CONFIG["EXEEXT"])
+
+build_dir = Pathname("ext") + package
+FileUtils.mkdir_p(build_dir.to_s) unless build_dir.exist?
+extconf_rb_path = ext_dir + "extconf.rb"
+system(ruby, "-C", build_dir.to_s, extconf_rb_path.to_s, *ARGV) || exit(false)
+
+create_makefile(package)
+FileUtils.mv("Makefile", "Makefile.lib")
+
+File.open("Makefile", "w") do |makefile|
+  makefile.puts(<<-EOM)
+all:
+	(cd ext/#{package} && $(MAKE))
+	$(MAKE) -f Makefile.lib
+
+install:
+	(cd ext/#{package} && $(MAKE) install)
+	$(MAKE) -f Makefile.lib install
+
+site-install:
+	(cd ext/#{package} && $(MAKE) site-install)
+	$(MAKE) -f Makefile.lib site-install
+
+clean:
+	(cd ext/#{package} && $(MAKE) clean)
+	$(MAKE) -f Makefile.lib clean
+
+distclean:
+	(cd ext/#{package} && $(MAKE) distclean)
+	$(MAKE) -f Makefile.lib distclean
+	@rm -f Makefile.lib
+EOM
 end
-
-create_top_makefile

data/{src/lib → lib}/glib-mkenums.rb

@@ -167,7 +167,7 @@ GType #{@enum_name}_get_type (void);
 
     # Create a C source as a String.
     def create_c
-      ret = "\n/* Generated by glib-mkenums.rb ($Id$) */ \n\n"
+      ret = "\n/* Generated by glib-mkenums.rb ($Id: glib-mkenums.rb 3896 2010-09-25 07:49:34Z ktou $) */ \n\n"
       ret << %Q[#include "#{@target_filename}.h"\n]
       @include_files.each do |file|
         ret << "#include <#{file}>\n"
@@ -183,7 +183,7 @@ GType #{@enum_name}_get_type (void);
       header = "#{@target_filename}.h"
       const = "__#{File.basename(header).upcase.gsub(/-|\./, '_')}__"
 
-      ret = "\n/* Generated by glib-mkenums.rb ($Id$) */ \n\n"
+      ret = "\n/* Generated by glib-mkenums.rb ($Id: glib-mkenums.rb 3896 2010-09-25 07:49:34Z ktou $) */ \n\n"
       ret << "#ifndef #{const}\n"
       ret << "#define #{const}\n\n"
       ret << "#include <glib-object.h>\n\n"

data/{src/lib → lib}/glib2.rb

@@ -1,18 +1,12 @@
 #
 # glib2.rb
-# Copyright(C) 2005 Ruby-GNOME2 Project.
+# Copyright(C) 2005-2010 Ruby-GNOME2 Project.
 #
 # This program is licenced under the same 
 # license of Ruby-GNOME2.
 #
 
-require 'rbconfig'
-if /mingw|mswin|mswin32/ =~ RUBY_PLATFORM
-  ENV['PATH'] = %w(bin lib).collect{|dir|
-    "#{Config::CONFIG["prefix"]}\\lib\\GTK\\#{dir};"
-  }.join('') + ENV['PATH']
-end
-
+require 'pathname'
 require 'English'
 require 'thread'
 
@@ -66,9 +60,34 @@ module GLib
       end
     end
   end
+
+  def prepend_environment_path(path)
+    path = Pathname(path) unless path.is_a?(Pathname)
+    if path.exist?
+      environment_name = "PATH"
+      separator = File::PATH_SEPARATOR
+
+      paths = (ENV[environment_name] || '').split(/#{separator}/)
+      dir = path.to_s
+      dir = dir.gsub(/\//, File::ALT_SEPARATOR) if File::ALT_SEPARATOR
+      unless paths.include?(dir)
+        paths = [dir] + paths
+        ENV[environment_name] = paths.join(separator)
+      end
+    end
+  end
 end
 
-require 'glib2.so'
+
+base_dir = Pathname.new(__FILE__).dirname.dirname.expand_path
+vendor_dir = base_dir + "vendor" + "local"
+GLib.prepend_environment_path(vendor_dir + "bin")
+begin
+  major, minor, micro, = RUBY_VERSION.split(/\./)
+  require "#{major}.#{minor}/glib2.so"
+rescue LoadError
+  require 'glib2.so'
+end
 
 module GLib
   

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

@@ -0,0 +1,92 @@
+# Copyright(C) 2010 Ruby-GNOME2 Project.
+#
+# This program is licenced under the same license of Ruby-GNOME2.
+
+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)
+      end
+    end
+  end
+
+  URL_BASE = "http://ftp.gnome.org/pub/gnome/binaries/win32"
+  def initialize(options={})
+    @output_dir = options[:output_dir] || File.join("vendor", "local")
+  end
+
+  def download_package(package)
+    version_page = agent.get("#{URL_BASE}/#{package}")
+    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
+
+    latest_version_page = latest_version_link.click
+    latest_version = latest_version_page.links.collect do |link|
+      if /_([\d\.\-]+)_win32\.zip\z/ =~ link.href
+        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]
+
+    latest_version_page.links.each do |link|
+      if /_#{Regexp.escape(latest_version)}_win32\.zip\z/ =~ link.href
+        click_zip_link(link)
+      end
+    end
+  end
+
+  def download_dependency(dependency)
+    dependencies_page = agent.get("#{URL_BASE}/dependencies")
+    latest_version = dependencies_page.links.collect do |link|
+      if /\A#{Regexp.escape(dependency)}_([\d\.\-]+)_win32\.zip\z/ =~ link.href
+        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]
+    dependencies_page.links.each do |link|
+      if /\A#{Regexp.escape(dependency)}(?:-dev)?_#{Regexp.escape(latest_version)}_win32.zip/ =~ link.href
+        click_zip_link(link)
+      end
+    end
+  end
+
+  private
+  def agent
+    @agent ||= Mechanize.new
+  end
+
+  def click_zip_link(link)
+    zip = link.click
+    FileUtils.mkdir_p(@output_dir)
+    Dir.chdir(@output_dir) do
+      open(zip.filename, "wb") do |file|
+        file.print(zip.body)
+      end
+      system("unzip '#{zip.filename}'")
+    end
+  end
+end

data/{src/lib → lib}/mkmf-gnome2.rb

@@ -10,7 +10,13 @@
 #
 
 require 'mkmf'
-require 'pkg-config'
+begin
+  require 'pkg-config'
+rescue LoadError
+  require 'rubygems'
+  gem 'pkg-config'
+  require 'pkg-config'
+end
 require 'glib-mkenums'
 
 unless defined?(macro_defined?)
@@ -42,90 +48,55 @@ if ENV['GTK_BASEPATH'] and /cygwin/ !~ RUBY_PLATFORM
   $CFLAGS += " -I#{include_path} "
 end
 
-def check_win32()
-  $G_PLATFORM_WIN32 = false
-  $G_OS_WIN32       = false
-  $G_WITH_CYGWIN    = false
-
-  STDOUT.print("checking for G_PLATFORM_WIN32... ")
-  STDOUT.flush
-  if macro_defined?('G_PLATFORM_WIN32', "#include <glibconfig.h>\n")
-    STDOUT.print "yes\n"
-    $G_PLATFORM_WIN32 = true
-  else
-    STDOUT.print "no\n"
-  end
-
-  if $G_PLATFORM_WIN32
-    STDOUT.print("checking for G_OS_WIN32... ")
-    STDOUT.flush
-    if macro_defined?('G_OS_WIN32', "#include <glibconfig.h>\n")
-      STDOUT.print "yes\n"
-      $G_OS_WIN32 = true
-      if $cc_is_gcc
-	if /^2\./ =~ `#{Config::CONFIG['CC']} -dumpversion`.chomp
-	  $CFLAGS += ' -fnative-struct'
-	else
-	  $CFLAGS += ' -mms-bitfields'
-	end
-      end
-    else
-      STDOUT.print "no\n"
-    end
-
-#    STDOUT.print("checking for G_WITH_CYGWIN... ")
-#    STDOUT.flush
-#    if macro_defined?('G_WITH_CYGWIN', "#include <glibconfig.h>\n")
-#      STDOUT.print "yes\n"
-#      $G_WITH_CYGWIN = true
-#    else
-#      STDOUT.print "no\n"
-#    end
-  end
-
-  nil
-end
-
-def set_output_lib(target_name)
-  if /cygwin|mingw/ =~ RUBY_PLATFORM
-    filename = "libruby-#{target_name}.a"
-    if RUBY_VERSION > "1.8.0"
-      $DLDFLAGS << ",--out-implib=#{filename}" if filename
-    elsif RUBY_VERSION > "1.8"
-      $DLDFLAGS.gsub!(/ -Wl,--out-implib=[^ ]+/, '')
-      $DLDFLAGS << " -Wl,--out-implib=#{filename}" if filename
+def setup_win32(target_name, base_dir=nil)
+  checking_for(checking_message("Win32 OS")) do
+    case RUBY_PLATFORM
+    when /cygwin|mingw|mswin32/
+      import_library_name = "libruby-#{target_name}.a"
+      $DLDFLAGS << " -Wl,--out-implib=#{import_library_name}"
+      $cleanfiles << import_library_name
+      base_dir ||= Pathname($0).dirname.parent.parent.expand_path
+      base_dir = Pathname(base_dir) if base_dir.is_a?(String)
+      binary_base_dir = base_dir + "vendor" + "local"
+      $CFLAGS += " -I#{binary_base_dir}/include"
+      pkg_config_dir = binary_base_dir + "lib" + "pkgconfig"
+      PKGConfig.add_path(pkg_config_dir.to_s)
+      PKGConfig.set_override_variable("prefix", binary_base_dir.to_s)
+      true
     else
-      $DLDFLAGS.gsub!(/ --output-lib\s+[^ ]+/, '')
-      $DLDFLAGS << " --output-lib #{filename}" if filename
+      false
     end
-  elsif /mswin32/ =~ RUBY_PLATFORM
-      filename = "libruby-#{target_name}.lib"
-      $DLDFLAGS.gsub!(/ --output-lib\s+[^ ]+/, '')
-      $DLDFLAGS.gsub!(/ \/IMPLIB:[^ ]+/, '')
-      $DLDFLAGS << " /IMPLIB:#{filename}" if filename   
   end
 end
 
-def setup_win32(target_name)
-  check_win32
-  set_output_lib(target_name)
-end
-
 #add_depend_package("glib2", "glib/src", "/...../ruby-gnome2")
-def add_depend_package(target_name, target_srcdir, top_srcdir)
+def add_depend_package(target_name, target_srcdir, top_srcdir, options={})
   [top_srcdir, $configure_args['--topdir']].each do |topdir|
     topdir = File.expand_path(topdir)
-    if RUBY_VERSION < "1.8.5"
-      $CFLAGS = "-I#{File.join(topdir, target_srcdir)} #{$CFLAGS}"
-    else
-      $INCFLAGS = "-I#{File.join(topdir, target_srcdir)} #{$INCFLAGS}"
+    target_source_dir_full_path = File.join(topdir, target_srcdir)
+    if File.exist?(target_source_dir_full_path)
+      $INCFLAGS = "-I#{target_source_dir_full_path} #{$INCFLAGS}"
+    end
+
+    top_build_dir = options[:top_build_dir] || topdir
+    target_build_dir = options[:target_build_dir] || target_srcdir
+    target_build_dir_full_path = File.join(top_build_dir, target_build_dir)
+    unless File.exist?(target_build_dir_full_path)
+      target_build_dir_full_path = File.join(top_build_dir, target_srcdir)
+    end
+    unless File.exist?(target_build_dir_full_path)
+      target_build_dir_full_path = File.join(topdir, target_build_dir)
+    end
+    unless File.exist?(target_build_dir_full_path)
+      target_build_dir_full_path = File.join(topdir, target_srcdir)
     end
+    $INCFLAGS = "-I#{target_build_dir_full_path} #{$INCFLAGS}"
 
     if /cygwin|mingw/ =~ RUBY_PLATFORM
       $libs << " -lruby-#{target_name}"
-      $LDFLAGS << " -L#{topdir}/#{target_srcdir}"
+      $LDFLAGS << " -L#{target_build_dir_full_path}"
     elsif /mswin32/ =~ RUBY_PLATFORM
-      $DLDFLAGS << " /libpath:#{topdir}/#{target_srcdir}"
+      $DLDFLAGS << " /libpath:#{target_build_dir_full_path}"
       $libs << " libruby-#{target_name}.lib"
     end
   end
@@ -157,7 +128,8 @@ def create_pkg_config_file(package_name, c_package,
 end
 
 def ruby_gnome2_version(glib_source_directory=nil)
-  glib_source_directory ||= File.join(File.dirname(__FILE__), "..")
+  glib_source_directory ||= File.join(File.dirname(__FILE__), "..",
+                                      "ext", "glib2")
   rbglib_h = File.join(glib_source_directory, "rbglib.h")
   return nil unless File.exist?(rbglib_h)
 
@@ -179,6 +151,20 @@ def ruby_gnome2_version(glib_source_directory=nil)
   version
 end
 
+def ensure_objs
+  return unless $objs.nil?
+
+  source_dir = '$(srcdir)'
+  RbConfig.expand(source_dir)
+
+  pattern = "*.{#{SRC_EXT.join(',')}}"
+  srcs = Dir[File.join(source_dir, pattern)]
+  srcs |= Dir[File.join(".", pattern)]
+  $objs = srcs.collect do |f|
+    File.basename(f, ".*") + ".o"
+  end.uniq
+end
+
 def create_makefile_at_srcdir(pkg_name, srcdir, defs = nil)
   base_dir = File.basename(Dir.pwd)
   last_common_index = srcdir.rindex(base_dir)
@@ -192,14 +178,7 @@ def create_makefile_at_srcdir(pkg_name, srcdir, defs = nil)
     yield if block_given?
 
     $defs << defs if defs
-
-    pattern = "*.{#{SRC_EXT.join(',')}}"
-    srcs = Dir[File.join(srcdir, pattern)]
-    srcs |= Dir[File.join(".", pattern)]
-    $objs = srcs.collect do |src|
-      File.basename(src, ".*") + ".o"
-    end.flatten.uniq
-
+    ensure_objs
     create_makefile(pkg_name, srcdir)
   end
 end
@@ -328,6 +307,7 @@ SRC
 end
 
 def add_obj(name)
+  ensure_objs
   $objs << name unless $objs.index(name)
 end
 
@@ -335,11 +315,17 @@ def glib_mkenums(prefix, files, g_type_prefix, include_files, options={})
   add_distcleanfile(prefix + ".h")
   add_distcleanfile(prefix + ".c")
   GLib::MkEnums.create(prefix, files, g_type_prefix, include_files, options)
+  add_obj("#{prefix}.o")
 end
 
-def check_cairo
+def check_cairo(options={})
   return false unless PKGConfig.have_package('cairo')
 
+  rcairo_source_dir = options[:rcairo_source_dir]
+  if rcairo_source_dir and !File.exist?(rcairo_source_dir)
+    rcairo_source_dir = nil
+  end
+  $CFLAGS += " -I#{rcairo_source_dir}/ext/cairo" if rcairo_source_dir
   have_rb_cairo_h = have_header('rb_cairo.h')
   unless have_rb_cairo_h
     begin
@@ -347,8 +333,8 @@ def check_cairo
       gem 'cairo'
       require 'cairo'
       rcairo_src_gem_path_re =
-        /\A#{Regexp.escape(Gem.dir)}\/gems\/cairo-[\d.]+\/src\z/
-      $:.each do |path|
+        /\A#{Regexp.escape(Gem.dir)}\/gems\/cairo-[\d.]+\/ext\/cairo\z/
+      $LOAD_PATH.each do |path|
         if rcairo_src_gem_path_re =~ path
           $CFLAGS += " -I#{path} "
           have_rb_cairo_h = have_header('rb_cairo.h')
@@ -361,11 +347,12 @@ def check_cairo
 
   if have_rb_cairo_h
     if /mingw|cygwin|mswin32/ =~ RUBY_PLATFORM
-      unless ENV["CAIRO_PATH"]
-        puts "Error! Set CAIRO_PATH."
-        exit 1
+      options = {}
+      build_dir = "tmp/#{RUBY_PLATFORM}/cairo/#{RUBY_VERSION}"
+      if File.exist?(File.join(rcairo_source_dir, build_dir))
+        options[:target_build_dir] = build_dir
       end
-      add_depend_package("cairo", "src", ENV["CAIRO_PATH"])
+      add_depend_package("cairo", "ext/cairo", rcairo_source_dir, options)
       $defs << "-DRUBY_CAIRO_PLATFORM_WIN32"
     end
   end
@@ -373,7 +360,7 @@ def check_cairo
 end
 
 add_include_path = Proc.new do |dir_variable|
-  value = Config::CONFIG[dir_variable]
+  value = RbConfig::CONFIG[dir_variable]
   if value and File.exist?(value)
     $INCFLAGS << " -I$(#{dir_variable}) "
   end