glib2 1.0.3 → 1.1.0

data/ext/glib2/rbgutildeprecated.h

@@ -0,0 +1,63 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003 Masao Mutoh
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#ifndef __RBGUTILDEPRECATED_H__
+#define __RBGUTILDEPRECATED_H__
+
+G_BEGIN_DECLS
+
+#define G_DEF_SETTER(klass, name) \
+    rb_funcall(klass, rbgutil_id_module_eval, 1, rb_str_new2( \
+    "def " name "=(val); set_" name "(val); val; end\n"))
+#define G_DEF_SETTERS(klass) rbgutil_def_setters(klass)
+
+#define GLIST2ARY(list)           (rbgutil_glist2ary(list))
+#define GLIST2ARY_FREE(list)      (rbgutil_glist2ary_and_free(list))
+#define GLIST2ARYF(list)          (GLIST2ARY_FREE(list))
+#define GLIST2ARY2(list, gtype)   (rbgutil_glist2ary_boxed(list, gtype))
+#define GLIST2ARY2F(list, gtype)  (rbgutil_glist2ary_boxed_and_free(list, gtype))
+#define GLIST2ARY_STR(list)       (rbgutil_glist2ary_string(list))
+#define GLIST2ARY_STR_FREE(list)  (rbgutil_glist2ary_string_and_free(list))
+#define GSLIST2ARY(list)          (rbgutil_gslist2ary(list))
+#define GSLIST2ARY_FREE(list)     (rbgutil_gslist2ary_and_free(list))
+#define GSLIST2ARYF(list)         (GSLIST2ARY_FREE(list))
+#define GSLIST2ARY2(list, gtype)  (rbgutil_gslist2ary_boxed(list, gtype))
+#define GSLIST2ARY2F(list, gtype) (rbgutil_gslist2ary_boxed_and_free(list, gtype))
+
+#define G_SET_SYMBOL_PROPERTY(gtype, name) \
+     rbgobj_register_property_getter(gtype, name, rbgutil_sym_g2r_func)
+
+#define G_BLOCK_PROC rb_block_proc
+
+extern VALUE rbgutil_glist2ary(const GList *list);
+extern VALUE rbgutil_glist2ary_and_free(GList* list);
+extern VALUE rbgutil_glist2ary_boxed(const GList *list, GType gtype);
+extern VALUE rbgutil_glist2ary_boxed_and_free(GList *list, GType gtype);
+extern VALUE rbgutil_glist2ary_string(const GList *list);
+extern VALUE rbgutil_glist2ary_string_and_free(GList *list);
+extern VALUE rbgutil_gslist2ary(const GSList *list);
+extern VALUE rbgutil_gslist2ary_and_free(GSList *list);
+extern VALUE rbgutil_gslist2ary_boxed(const GSList *list, GType gtype);
+extern VALUE rbgutil_gslist2ary_boxed_and_free(GSList *list, GType gtype);
+
+G_END_DECLS
+
+#endif /* __RBGUTILDEPRECATED_H__ */

data/lib/glib-mkenums.rb

@@ -168,7 +168,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: glib-mkenums.rb 3990 2010-10-27 03:38:42Z ktou $) */ \n\n"
+      ret = "\n/* Generated by glib-mkenums.rb ($Id$) */ \n\n"
       ret << %Q[#include "#{@target_filename}.h"\n]
       @include_files.each do |file|
         ret << "#include <#{file}>\n"
@@ -184,7 +184,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: glib-mkenums.rb 3990 2010-10-27 03:38:42Z ktou $) */ \n\n"
+      ret = "\n/* Generated by glib-mkenums.rb ($Id$) */ \n\n"
       ret << "#ifndef #{const}\n"
       ret << "#define #{const}\n\n"
       ret << "#include <glib-object.h>\n\n"

data/lib/glib2.rb

@@ -9,6 +9,7 @@
 require 'pathname'
 require 'English'
 require 'thread'
+require 'glib2/deprecatable'
 
 module GLib
   module_function
@@ -215,31 +216,6 @@ GLib::Log.set_log_domain(GLib::Object::LOG_DOMAIN)
 GLib::Log.set_log_domain(GLib::Thread::LOG_DOMAIN)
 GLib::Log.set_log_domain(GLib::Module::LOG_DOMAIN)
 
-# Ruby-GetText-Package support
-begin
-  require 'gettext'
-rescue LoadError
-  unless defined? GetText
-    module GetText
-      module_function
-      def _(msgid); msgid; end
-      def N_(msgid); msgid; end
-      def n_(msgid, msgid_plural, n)
-	n == 1 ? msgid : msgid_plural
-      end
-      def s_(msgid, div = '|')
-	if index = msgid.rindex(div)
-	  msgid = msgid[(index + 1)..-1]
-	else
-	  msgid
-	end
-      end
-      def bindtextdomain(domainname, path = nil, locale = nil, charset = nil)
-      end
-    end
-  end
-end
-
 =begin
 Don't we need this?
 ObjectSpace.define_finalizer(GLib) {
@@ -247,3 +223,4 @@ ObjectSpace.define_finalizer(GLib) {
   puts "GLib::Log.cancel_handler was called." if $DEBUG
 }
 =end
+

data/lib/glib2/deprecatable.rb

@@ -0,0 +1,149 @@
+module GLib
+  module Deprecatable
+    unless respond_to?(:define_singleton_method)
+      def define_singleton_method(name, &block)
+        singleton_class = class << self; self; end
+        singleton_class.__send__(:define_method, name, &block)
+      end
+    end
+
+    @@deprecated_const = {}
+    def define_deprecated_const(deprecated_const, new_const = {})
+      @@deprecated_const[self] ||= {}
+      @@deprecated_const[self][deprecated_const.to_sym] = new_const
+    end
+
+    def define_deprecated_enums(enums, prefix = nil)
+      enums = module_eval(enums.to_s) rescue return
+      enums.constants.each do |const|
+        deprecated_const = prefix ? "#{prefix}_#{const}" : const
+        new_const = [enums, const].join('::')
+        define_deprecated_const(deprecated_const, new_const)
+      end
+    end
+    alias :define_deprecated_flags :define_deprecated_enums
+
+    def define_deprecated_singleton_method(deprecated_method, new_method = {}, &block)
+      __define_deprecated_method__(:singleton, deprecated_method, new_method, &block)
+    end
+
+    def define_deprecated_method(deprecated_method, new_method = {}, &block)
+      __define_deprecated_method__(:instance, deprecated_method, new_method, &block)
+    end
+
+    def define_deprecated_method_by_hash_args(deprecated_method, old_args, new_args, req_argc = 0, &block)
+      klass = self
+      alias_name = "__deprecatable_#{deprecated_method}__"
+      alias_method alias_name, deprecated_method
+      private alias_name
+
+      define_method(deprecated_method) do |*margs, &mblock|
+        if (margs.size == req_argc) || (margs.size == (req_argc + 1) && margs.last.is_a?(Hash))
+        else
+          margs = block.call(self, *margs, &mblock)
+          msg = "#{caller[0]}: '#{klass}##{deprecated_method}(#{old_args})' style has been deprecated."
+          warn "#{msg} Use '#{klass}##{deprecated_method}(#{new_args})' style."
+        end
+        __send__(alias_name, *margs, &mblock)
+      end
+    end
+
+    @@deprecated_signal = {}
+    def define_deprecated_signal(deprecated_signal, new_signal = {})
+      @@deprecated_signal[self] ||= {}
+      @@deprecated_signal[self][deprecated_signal.to_s.gsub('_', '-').to_sym] = new_signal
+    end
+
+    def self.extended(class_or_module)
+      GLib::Instantiatable.class_eval do
+        %w(signal_connect signal_connect_after).each do |connect_method|
+          alias_name = "__deprecatable_#{connect_method}__"
+          next if private_method_defined?(alias_name)
+          alias_method alias_name, connect_method
+          private alias_name
+
+          define_method(connect_method) do |signal, *margs, &mblock|
+            signal = signal.to_s.gsub('_', '-').to_sym
+            signals = @@deprecated_signal[self]
+            if new_signal = (signals || {})[signal]
+              msg = "#{caller[0]}: '#{signal}' signal has been deprecated."
+              case new_signal
+              when String, Symbol
+                warn "#{msg} Use '#{new_signal}' signal."
+                signal = new_signal
+              when Hash
+                if new_signal[:raise]
+                  raise DeprecatedError.new("#{msg} #{new_signal[:raise]}")
+                elsif new_signal[:warn]
+                  warn "#{msg} #{new_signal[:warn]}"
+                else
+                  warn "#{msg} Don't use this signal anymore."
+                end
+                return
+              end
+            end
+            __send__(alias_name, signal, *margs, &mblock)
+          end
+        end
+      end
+    end
+
+    private
+
+    def const_missing(deprecated_const)
+      if new_const = (@@deprecated_const[self] || {})[deprecated_const.to_sym]
+        msg = "#{caller[0]}: '#{[name, deprecated_const].join('::')}' has been deprecated."
+        case new_const
+        when String, Symbol
+          new_const_val = constant_get(new_const)
+          case new_const_val
+          when GLib::Enum, GLib::Flags
+            alt = " or ':#{new_const_val.nick.gsub('-', '_')}'"
+          end
+          warn "#{msg} Use '#{new_const}'#{alt}."
+          return const_set(deprecated_const, new_const_val)
+        when Hash
+          if new_const[:raise]
+            raise DeprecatedError.new("#{msg} #{new_const[:raise]}")
+          elsif new_const[:warn]
+            warn "#{msg} #{new_const[:warn]}"
+          else
+            warn "#{msg} Don't use this constant anymore."
+          end
+          return
+        end
+      end
+      raise NameError.new("uninitialized constant #{[self, deprecated_const].join('::')}")
+    end
+
+    def constant_get(const)
+      const.split('::').inject(Object){|r, c| r.const_get(c)}
+    end
+
+    def __define_deprecated_method__(type, deprecated_method, new_method = {}, &block)
+      def_method = type == :singleton ? :define_singleton_method : :define_method
+      sep = type == :singleton ? '.' : '#'
+      klass = self
+
+      __send__(def_method, deprecated_method) do |*margs, &mblock|
+        msg = "#{caller[0]}: '#{klass}#{sep}#{deprecated_method}' has been deprecated."
+        case new_method
+        when String, Symbol
+          warn "#{msg} Use '#{klass}#{sep}#{new_method}'."
+          __send__(new_method, *margs, &mblock)
+        when Hash
+          if new_method[:raise]
+            raise DeprecatedError.new("#{msg} #{new_method[:raise]}")
+          elsif new_method[:warn]
+            warn "#{msg} #{new_method[:warn]}"
+            block.call(self, *margs, &mblock) if block
+          end
+        end
+      end
+    end
+  end
+
+  class DeprecatedError < RuntimeError
+  end
+end
+

data/lib/gnome2-raketask.rb

@@ -7,6 +7,7 @@
 require 'find'
 
 require 'rubygems'
+require 'rubygems/package_task'
 require 'rake/extensiontask'
 
 class GNOME2Package
@@ -21,13 +22,19 @@ class GNOME2Package
     @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)
+    @cross_compiling_hooks = []
     yield(self) if block_given?
   end
 
+  def cross_compiling(&block)
+    @cross_compiling_hooks << block
+  end
+
   def define_tasks
     task :default => :build
-    define_gem_tasks
+    define_spec
     define_win32_tasks
+    define_package_tasks
   end
 
   def ruby_gnome2_package?(name)
@@ -63,7 +70,7 @@ class GNOME2Package
     @name = ""
     @summary = ""
     @description = ""
-    @author = "The Ruby-GNOME2 Proejct Team"
+    @author = "The Ruby-GNOME2 Project Team"
     @email = "ruby-gnome2-devel-en@lists.sourceforge.net"
     @homepage = "http://ruby-gnome2.sourceforge.jp/"
   end
@@ -73,7 +80,7 @@ class GNOME2Package
     @win32_configuration = Win32Configuration.new(self)
   end
 
-  def define_gem_tasks
+  def define_spec
     @spec = Gem::Specification.new do |s|
       s.name                  = @name
       s.summary               = @summary
@@ -84,18 +91,23 @@ class GNOME2Package
       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}/**/*"]
+      files                   = FileList["ChangeLog", "README",
+                                         "Rakefile", "extconf.rb",
+                                         "lib/**/*.rb",
+                                         "{ext,sample,test,test-unit}/**/*"]
+      files.existing!
+      s.files                 = files
       s.post_install_message  = @post_install_message
       @dependency_configuration.apply(s)
     end
-
-    Gem::PackageTask.new(@spec) do |pkg|
-    end
   end
 
   def define_win32_tasks
+    define_win32_build_task
+    define_win32_download_task
+  end
+
+  def define_win32_build_task
     Rake::ExtensionTask.new(@name, @spec) do |ext|
       ext.cross_compile = true
       ext.cross_compiling do |spec|
@@ -110,19 +122,37 @@ class GNOME2Package
           end
           spec.files += win32_files
         end
+        @cross_compiling_hooks.each do |hook|
+          hook.call(spec)
+        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)
+    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
     end
   end
 
+  def define_package_tasks
+    Gem::PackageTask.new(@spec) do |pkg|
+    end
+  end
+
   class DependencyConfiguration
     attr_accessor :platform, :ruby
     def initialize(package)

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

@@ -101,7 +101,7 @@ class GNOME2Win32BinaryDownloader
     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/
+      when /\A#{escaped_dependency}(?:-dev)?_#{escaped_latest_version}_win32\.zip\z/
         click_zip_link(link)
       end
     end

data/lib/mkmf-gnome2.rb

@@ -20,27 +20,46 @@ rescue LoadError
 end
 require 'glib-mkenums'
 
-unless defined?(macro_defined?)
-  def macro_defined?(macro, src, opt="")
-    try_cpp(src + <<EOP, opt)
-#ifndef #{macro}
-# error
-#endif
-EOP
+$CFLAGS += " #{ENV['CFLAGS']}" if ENV['CFLAGS']
+
+def try_compiler_option(opt, &block)
+  checking_for "#{opt} option to compiler" do
+    $CFLAGS += " #{opt}" if try_compile '', opt, &block
   end
 end
 
-
-STDOUT.print("checking for GCC... ")
-STDOUT.flush
-if macro_defined?("__GNUC__", "")
-  STDOUT.print "yes\n"
-  $CFLAGS += ' -Wall'
-  $cc_is_gcc = true
-else
-  STDOUT.print "no\n"
-  $cc_is_gcc = false
-end
+try_compiler_option '-Wall'
+try_compiler_option '-Waggregate-return'
+try_compiler_option '-Wcast-align'
+# NOTE: Generates way too many false positives.
+# try_compiler_option '-Wconversion'
+try_compiler_option '-Wextra'
+try_compiler_option '-Wformat=2'
+try_compiler_option '-Winit-self'
+# NOTE: This generates warnings for functions defined in ruby.h.
+# try_compiler_option '-Winline'
+try_compiler_option '-Wlarger-than-65500'
+try_compiler_option '-Wmissing-declarations'
+try_compiler_option '-Wmissing-format-attribute'
+try_compiler_option '-Wmissing-include-dirs'
+try_compiler_option '-Wmissing-noreturn'
+try_compiler_option '-Wmissing-prototypes'
+try_compiler_option '-Wnested-externs'
+try_compiler_option '-Wold-style-definition'
+try_compiler_option '-Wpacked'
+try_compiler_option '-Wp,-D_FORTIFY_SOURCE=2'
+try_compiler_option '-Wpointer-arith'
+# NOTE: ruby.h and intern.h have too many of these.
+# try_compiler_option '-Wredundant-decls'
+# NOTE: Complains about index, for example.
+# try_compiler_option '-Wshadow'
+try_compiler_option '-Wswitch-default'
+try_compiler_option '-Wswitch-enum'
+try_compiler_option '-Wundef'
+# NOTE: Incredible amounts of false positives.
+#try_compiler_option '-Wunreachable-code'
+try_compiler_option '-Wunsafe-loop-optimizations'
+try_compiler_option '-Wwrite-strings'
 
 if /-Wl,--no-undefined/ =~ $LDFLAGS.to_s
   $LDFLAGS.gsub!(/-Wl,--no-undefined/, '')