glib2 0.90.8 → 0.90.9

data/ChangeLog

@@ -1,5 +1,49 @@
+2011-06-11  Kouhei Sutou  <kou@cozmixng.org>
+
+	* Rakefile, test/: use test-unit 2 gem. don't bundle it.
+
+2011-06-04  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/mkmf-gnome2.rb (add_depend_package): don't require parent
+	directory for target_srcdir. target_srcdir can be relative path
+	from target package root directory.
+
+	e.g.:
+	  add_depend_package("glib2", "ext/glib2",
+	                     "/path/to/ruby-gnome2-root-dir"))
+          before: NG
+          after: OK
+
+	  add_depend_package("glib2", "glib2/ext/glib2",
+	                     "/path/to/ruby-gnome2-root-dir"))
+          before: OK
+          after: OK
+
+	* lib/mkmf-gnome2.rb (add_depend_package): support gem installed
+	depend package.
+
+	* ext/glib2/rbglib_iochannel.c: [backward incompatible]
+	GLib::IOChannel#write returns written byte not self.
+
+2011-06-03  Kouhei Sutou  <kou@cozmixng.org>
+
+	* ext/glib2/rbglib_iochannel.c: support GLib::IOChannel.new(fd)
+	and GLib::IOChannel#fd on Windows.
+
+2011-05-27  Kouhei Sutou  <kou@clear-code.com>
+
+	* ext/glib2/rbgobject.h, ext/glib2/rbgobj_signal.c
+	(rbgobj_set_signal_func): add missing "const".
+
+2011-03-03  Vincent Carmona
+
+	* glib2/lib/mkmf-gnome2.rb: Fix a bug in make_version_header.
+	[ruby-gnome2-devel-en] reported by Grant Schoep. Thanks!!!
+
 2011-03-04  Kouhei Sutou  <kou@cozmixng.org>
 
+	* ext/glib2/rbglib.h: 0.90.7 -> 0.90.8.
+
 	* ext/glib2/rbglib_win32.c
 	(rbglib_m_win32_locale_filename_from_utf8_deprecated): add missing
 	argument.

data/Rakefile

@@ -6,6 +6,7 @@ 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.dependency.gem.development = [["test-unit", ">= 2"]]
   _package.win32.packages = ["glib"]
   _package.win32.dependencies = ["gettext-runtime"]
 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 8
+#define RBGLIB_MICRO_VERSION 9
 
 #ifndef RSTRING_PTR
 #  define RSTRING_PTR(s) (RSTRING(s)->ptr)

data/ext/glib2/rbglib_iochannel.c

@@ -41,12 +41,16 @@ ioc_initialize(gint argc, VALUE *argv, VALUE self)
     rb_scan_args(argc, argv, "11", &arg1, &arg2);
 
     if (TYPE(arg1) != T_STRING){
-#ifdef G_OS_UNIX
+        gint fd;
         if (TYPE(arg1) == T_FIXNUM){
-            io = g_io_channel_unix_new(NUM2INT(arg1));
+            fd = NUM2INT(arg1);
         } else {
-            io = g_io_channel_unix_new(NUM2INT(rb_funcall(arg1, rb_intern("to_i"), 0)));
+            fd = NUM2INT(rb_funcall(arg1, rb_intern("to_i"), 0));
         }
+#ifdef G_OS_UNIX
+        io = g_io_channel_unix_new(fd);
+#elif defined(G_OS_WIN32)
+        io = g_io_channel_win32_new_fd(fd);
 #else
         rb_raise(rb_eRuntimeError, "GLib::IOChannel.new(fd) is supported on UNIX environment only");
 #endif
@@ -86,7 +90,9 @@ ioc_s_open(gint argc, VALUE *argv, VALUE self)
 #ifdef G_OS_UNIX
         io = g_io_channel_unix_new(NUM2INT(arg1));
 #else
-        rb_raise(rb_eRuntimeError, "GLib::IOChannel.new(fd) is supported on UNIX environment only");
+        rb_raise(rb_eRuntimeError,
+                 "GLib::IOChannel.new(fd) is supported on "
+                 "UNIX and Windows environment only");
 #endif
     } else {
         GError* err = NULL;
@@ -109,8 +115,11 @@ ioc_get_fd(VALUE self)
 {
 #ifdef G_OS_UNIX
     return INT2NUM(g_io_channel_unix_get_fd(_SELF(self)));
+#elif defined(G_OS_WIN32)
+    return INT2NUM(g_io_channel_win32_get_fd(_SELF(self)));
 #else
-    rb_warn("GLib::IOChannel#fd is supported on UNIX environment only.");
+    rb_warn("GLib::IOChannel#fd is supported on "
+            "UNIX and Windows environment only.");
     return Qnil;
 #endif
 }
@@ -404,7 +413,7 @@ ioc_write_chars(VALUE self, VALUE buf)
     status = g_io_channel_write_chars(_SELF(self), RVAL2CSTR(buf), count, &bytes_written, &err);
 
     ioc_error(status, err);
-    return self;
+    return UINT2NUM(bytes_written);
 }
 
 static ID id_unpack;

data/ext/glib2/rbgobj_signal.c

@@ -24,7 +24,7 @@ VALUE rbgobj_signal_wrap(guint sig_id);
 static VALUE signal_func_table;
 
 void
-rbgobj_set_signal_func(VALUE klass, gchar *sig_name, GValToRValSignalFunc func)
+rbgobj_set_signal_func(VALUE klass, const gchar *sig_name, GValToRValSignalFunc func)
 {
     VALUE obj = Data_Wrap_Struct(rb_cData, NULL, NULL, func);
     guint signal_id = g_signal_lookup(sig_name, CLASS2GTYPE(klass));

data/ext/glib2/rbgobject.h

@@ -175,7 +175,7 @@ extern GType rbgobj_gtype_get(VALUE obj);
 
 /* rbgobj_signal.c */
 typedef VALUE (*GValToRValSignalFunc)(guint num,const GValue* values);
-extern void rbgobj_set_signal_func(VALUE klass, gchar* sig_name, GValToRValSignalFunc func);
+extern void rbgobj_set_signal_func(VALUE klass, const gchar *sig_name, GValToRValSignalFunc func);
 extern GValToRValSignalFunc rbgobj_get_signal_func(guint signal_id);
 extern VALUE rbgobj_signal_wrap(guint sig_id);
 

data/lib/gnome2-raketask.rb

@@ -10,6 +10,8 @@ require 'rubygems'
 require 'rake/extensiontask'
 
 class GNOME2Package
+  include Rake::DSL
+
   attr_accessor :name, :summary, :description, :author, :email, :homepage, :post_install_message
   def initialize
     initialize_variables
@@ -86,11 +88,11 @@ class GNOME2Package
           "ChangeLog", "README", "Rakefile", "extconf.rb",
           "lib/**/*.rb", "{ext,sample,test,test-unit}/**/*"]
       s.post_install_message  = @post_install_message
-      s.has_rdoc              = false
       @dependency_configuration.apply(s)
     end
 
-    Rake::GemPackageTask.new(@spec) do |pkg|
+    Gem::PackageTask.new(@spec) do |pkg|
+      pkg.need_tar = true
     end
   end
 

data/lib/mkmf-gnome2.rb

@@ -77,12 +77,25 @@ end
 
 #add_depend_package("glib2", "ext/glib2", "/...../ruby-gnome2")
 def add_depend_package(target_name, target_srcdir, top_srcdir, options={})
-  [top_srcdir, $configure_args['--topdir']].each do |topdir|
+  begin
+    require 'rubygems'
+    gem_spec = Gem.source_index.find_name(target_name).last
+    if gem_spec
+      target_source_dir = File.join(gem_spec.full_gem_path, "ext/#{target_name}")
+      target_build_dir = target_source_dir
+      add_depend_package_path(target_name,
+                              target_source_dir,
+                              target_build_dir)
+    end
+  rescue LoadError
+  end
+
+  [top_srcdir,
+   File.join(top_srcdir, target_name),
+   $configure_args['--topdir'],
+   File.join($configure_args['--topdir'], target_name)].each do |topdir|
     topdir = File.expand_path(topdir)
     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
@@ -96,26 +109,38 @@ def add_depend_package(target_name, target_srcdir, top_srcdir, options={})
     unless File.exist?(target_build_dir_full_path)
       target_build_dir_full_path = File.join(topdir, target_srcdir)
     end
-    next unless File.exist?(target_build_dir_full_path)
-    $INCFLAGS = "-I#{target_build_dir_full_path} #{$INCFLAGS}"
+    add_depend_package_path(target_name,
+                            target_source_dir_full_path,
+                            target_build_dir_full_path)
+  end
+end
+
+def add_depend_package_path(target_name, target_source_dir, target_build_dir)
+  if File.exist?(target_source_dir)
+    $INCFLAGS = "-I#{target_source_dir} #{$INCFLAGS}"
+  end
+
+  return unless File.exist?(target_build_dir)
+  if target_source_dir != target_build_dir
+    $INCFLAGS = "-I#{target_build_dir} #{$INCFLAGS}"
+  end
 
+  case RUBY_PLATFORM
+  when /cygwin|mingw|mswin32/
     case RUBY_PLATFORM
-    when /cygwin|mingw|mswin32/
-      case RUBY_PLATFORM
-      when /cygwin|mingw/
-        $LDFLAGS << " -L#{target_build_dir_full_path}"
-        $libs << " -lruby-#{target_name}"
-      when /mswin32/
-        $DLDFLAGS << " /libpath:#{target_build_dir_full_path}"
-        $libs << " libruby-#{target_name}.lib"
-      end
-      target_base_dir = Pathname.new(target_source_dir_full_path).parent.parent
-      target_binary_base_dir = target_base_dir + "vendor" + "local"
-      if target_binary_base_dir.exist?
-        $INCFLAGS = "-I#{target_binary_base_dir}/include #{$INCFLAGS}"
-        target_pkg_config_dir = target_binary_base_dir + "lib" + "pkgconfig"
-        PKGConfig.add_path(target_pkg_config_dir.to_s)
-      end
+    when /cygwin|mingw/
+      $LDFLAGS << " -L#{target_build_dir}"
+      $libs << " -lruby-#{target_name}"
+    when /mswin32/
+      $DLDFLAGS << " /libpath:#{target_build_dir}"
+      $libs << " libruby-#{target_name}.lib"
+    end
+    target_base_dir = Pathname.new(target_source_dir).parent.parent
+    target_binary_base_dir = target_base_dir + "vendor" + "local"
+    if target_binary_base_dir.exist?
+      $INCFLAGS = "-I#{target_binary_base_dir}/include #{$INCFLAGS}"
+      target_pkg_config_dir = target_binary_base_dir + "lib" + "pkgconfig"
+      PKGConfig.add_path(target_pkg_config_dir.to_s)
     end
   end
 end
@@ -258,7 +283,6 @@ end
 # This is used for the library which doesn't support version info.
 def make_version_header(app_name, pkgname, dir = "src")
   version = PKGConfig.modversion(pkgname).split(/\./)
-  version = "2.0b7".split(/\./)
   (0..2).each do |v|
     version[v] = "0" unless version[v]
     if /\A(\d+)/ =~ version[v]

data/test/glib-test-init.rb

@@ -1,6 +1,4 @@
 $VERBOSE = true
 
-glib_top = File.expand_path(File.join(File.dirname(__FILE__), ".."))
-
-$LOAD_PATH.unshift(File.join(glib_top, "test-unit", "lib"))
+gem 'test-unit'
 require 'test/unit'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: glib2
 version: !ruby/object:Gem::Version 
-  hash: 359
-  prerelease: false
+  hash: 357
+  prerelease: 
   segments: 
   - 0
   - 90
-  - 8
-  version: 0.90.8
+  - 9
+  version: 0.90.9
 platform: ruby
 authors: 
 - The Ruby-GNOME2 Proejct Team
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-04 00:00:00 +09:00
-default_executable: 
+date: 2011-06-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: pkg-config
@@ -32,6 +31,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: test-unit
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        version: "2"
+  type: :development
+  version_requirements: *id002
 description: Ruby/GLib2 is a Ruby binding of GLib-2.x.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
@@ -128,120 +141,6 @@ files:
 - test/test_unicode.rb
 - test/test_iochannel.rb
 - test/glib-test-init.rb
-- test-unit/Manifest.txt
-- test-unit/TODO
-- test-unit/html/rubyforge.png
-- test-unit/html/test-unit.css
-- test-unit/html/reference.png
-- test-unit/html/tutorial.svg
-- test-unit/html/jp.png
-- test-unit/html/tango-logo.png
-- test-unit/html/install.svg
-- test-unit/html/heading-mark.png
-- test-unit/html/developer.svg
-- test-unit/html/kinotan-failure.png
-- test-unit/html/developer.png
-- test-unit/html/heading-mark.svg
-- test-unit/html/logo.png
-- test-unit/html/tutorial.png
-- test-unit/html/us.png
-- test-unit/html/bar.svg
-- test-unit/html/index.html
-- test-unit/html/index.html.ja
-- test-unit/html/bar.png
-- test-unit/html/favicon.svg
-- test-unit/html/favicon.png
-- test-unit/html/favicon.ico
-- test-unit/html/install.png
-- test-unit/html/kinotan-pass.png
-- test-unit/html/logo.svg
-- test-unit/html/famfamfam-logo.png
-- test-unit/History.txt
-- test-unit/README.txt
-- test-unit/images/color-diff.png
-- test-unit/COPYING
-- test-unit/lib/test/unit.rb
-- test-unit/lib/test/unit/attribute.rb
-- test-unit/lib/test/unit/color.rb
-- test-unit/lib/test/unit/version.rb
-- test-unit/lib/test/unit/runner/emacs.rb
-- test-unit/lib/test/unit/runner/console.rb
-- test-unit/lib/test/unit/runner/tap.rb
-- test-unit/lib/test/unit/runner/xml.rb
-- test-unit/lib/test/unit/ui/testrunnerutilities.rb
-- test-unit/lib/test/unit/ui/emacs/testrunner.rb
-- test-unit/lib/test/unit/ui/testrunner.rb
-- test-unit/lib/test/unit/ui/tap/testrunner.rb
-- test-unit/lib/test/unit/ui/xml/testrunner.rb
-- test-unit/lib/test/unit/ui/console/outputlevel.rb
-- test-unit/lib/test/unit/ui/console/testrunner.rb
-- test-unit/lib/test/unit/ui/testrunnermediator.rb
-- test-unit/lib/test/unit/assertionfailederror.rb
-- test-unit/lib/test/unit/failure.rb
-- test-unit/lib/test/unit/autorunner.rb
-- test-unit/lib/test/unit/exceptionhandler.rb
-- test-unit/lib/test/unit/assertions.rb
-- test-unit/lib/test/unit/error.rb
-- test-unit/lib/test/unit/omission.rb
-- test-unit/lib/test/unit/fixture.rb
-- test-unit/lib/test/unit/collector/descendant.rb
-- test-unit/lib/test/unit/collector/load.rb
-- test-unit/lib/test/unit/collector/xml.rb
-- test-unit/lib/test/unit/collector/dir.rb
-- test-unit/lib/test/unit/collector/objectspace.rb
-- test-unit/lib/test/unit/color-scheme.rb
-- test-unit/lib/test/unit/testcase.rb
-- test-unit/lib/test/unit/util/method-owner-finder.rb
-- test-unit/lib/test/unit/util/output.rb
-- test-unit/lib/test/unit/util/procwrapper.rb
-- test-unit/lib/test/unit/util/observable.rb
-- test-unit/lib/test/unit/util/backtracefilter.rb
-- test-unit/lib/test/unit/pending.rb
-- test-unit/lib/test/unit/testresult.rb
-- test-unit/lib/test/unit/collector.rb
-- test-unit/lib/test/unit/diff.rb
-- test-unit/lib/test/unit/priority.rb
-- test-unit/lib/test/unit/notification.rb
-- test-unit/lib/test/unit/testsuite.rb
-- test-unit/bin/testrb
-- test-unit/sample/test_subtracter.rb
-- test-unit/sample/subtracter.rb
-- test-unit/sample/test_user.rb
-- test-unit/sample/test_adder.rb
-- test-unit/sample/adder.rb
-- test-unit/Rakefile
-- test-unit/PSFL
-- test-unit/GPL
-- test-unit/test/testunit-test-util.rb
-- test-unit/test/test-testcase.rb
-- test-unit/test/ui/test_testrunmediator.rb
-- test-unit/test/ui/test_tap.rb
-- test-unit/test/test_testresult.rb
-- test-unit/test/test-pending.rb
-- test-unit/test/test-emacs-runner.rb
-- test-unit/test/test-fixture.rb
-- test-unit/test/test-attribute.rb
-- test-unit/test/test_failure.rb
-- test-unit/test/test_testsuite.rb
-- test-unit/test/collector/test_objectspace.rb
-- test-unit/test/collector/test-descendant.rb
-- test-unit/test/collector/test_dir.rb
-- test-unit/test/collector/test-load.rb
-- test-unit/test/run-test.rb
-- test-unit/test/test-assertions.rb
-- test-unit/test/test-priority.rb
-- test-unit/test/util/test_backtracefilter.rb
-- test-unit/test/util/test_observable.rb
-- test-unit/test/util/test_procwrapper.rb
-- test-unit/test/util/test-method-owner-finder.rb
-- test-unit/test/util/test-output.rb
-- test-unit/test/test_error.rb
-- test-unit/test/test-diff.rb
-- test-unit/test/test-notification.rb
-- test-unit/test/test-color-scheme.rb
-- test-unit/test/test-omission.rb
-- test-unit/test/test-color.rb
-has_rdoc: true
 homepage: http://ruby-gnome2.sourceforge.jp/
 licenses: []
 
@@ -273,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Ruby/GLib2 is a Ruby binding of GLib-2.x.

data/test-unit/COPYING

@@ -1,56 +0,0 @@
-Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.jp>.
-You can redistribute it and/or modify it under either the terms of the GPL
-version 2 (see the file GPL), or the conditions below:
-
-  1. You may make and give away verbatim copies of the source form of the
-     software without restriction, provided that you duplicate all of the
-     original copyright notices and associated disclaimers.
-
-  2. You may modify your copy of the software in any way, provided that
-     you do at least ONE of the following:
-
-       a) place your modifications in the Public Domain or otherwise
-          make them Freely Available, such as by posting said
-	  modifications to Usenet or an equivalent medium, or by allowing
-	  the author to include your modifications in the software.
-
-       b) use the modified software only within your corporation or
-          organization.
-
-       c) give non-standard binaries non-standard names, with
-          instructions on where to get the original software distribution.
-
-       d) make other distribution arrangements with the author.
-
-  3. You may distribute the software in object code or binary form,
-     provided that you do at least ONE of the following:
-
-       a) distribute the binaries and library files of the software,
-	  together with instructions (in the manual page or equivalent)
-	  on where to get the original distribution.
-
-       b) accompany the distribution with the machine-readable source of
-	  the software.
-
-       c) give non-standard binaries non-standard names, with
-          instructions on where to get the original software distribution.
-
-       d) make other distribution arrangements with the author.
-
-  4. You may modify and include the part of the software into any other
-     software (possibly commercial).  But some files in the distribution
-     are not written by the author, so that they are not under these terms.
-
-     For the list of those files and their copying conditions, see the
-     file LEGAL.
-
-  5. The scripts and library files supplied as input to or produced as 
-     output from the software do not automatically fall under the
-     copyright of the software, but belong to whomever generated them, 
-     and may be sold commercially, and may be aggregated with this
-     software.
-
-  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     PURPOSE.