glib2 0.20.0 → 0.90.2

data/ChangeLog

@@ -1,3 +1,95 @@
+2010-09-26  Kouhei Sutou  <kou@cozmixng.org>
+
+	* ext/glib2/rbglib.h: 0.90.2 -> 0.90.3.
+
+2010-09-25  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/mkmf-gnome2.rb (ensure_objs): add.
+
+	* lib/mkmf-gnome2.rb: add generated files in build directory
+	to build targets too.
+
+2010-09-23  Kouhei Sutou  <kou@cozmixng.org>
+
+	* ext/glib2/rbglib.h: 0.90.1 -> 0.90.2.
+
+	* Rakefile: don't add .zip into gem.
+
+	* lib/mkmf-gnome2.rb (#add_depend_package): improve auto build
+	path detection.
+
+	* ext/glib2/rbglib.h: 0.90.0 -> 0.90.1.
+
+	* ext/glib2/rbglib.h (RBGLIB_MINOR_VERSION): 20 -> 90. (0.20.0 -> 0.90.0)
+
+	* lib/glib2.rb (GLib#prepend_environment_path): add for Windows DLL.
+
+	* ext/glib2/rbgutil.c (rbgutil_gslist2ary_and_free): fix wrong
+	address is passed.
+
+	* test/run-test.rb: fix extension library path.
+
+	* lib/mkmf-gnome2.rb (#add_depend_package): don't add nonexistent
+	path to include paths.
+
+	* lib/mkmf-gnome2.rb (#ruby_gnome2_version): follow directory
+	structure change.
+
+	* lib/mkmf-gnome2.rb (#add_depend_package): support top build
+	directory path.
+
+	* README: add installation document by RubyGems.
+
+	* lib/mkmf-gnome2.rb (#add_depend_package): add build directory to
+	include path.
+
+2010-09-21  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/mkmf-gnome2.rb (#check_cairo): support rcairo path customize
+	by arguments.
+
+	* lib/mkmf-gnome2.rb (#check_cairo): follow rcairo's path change.
+
+	* ext/glib/extconfr.b, lib/mkmf-gnome2.rb: share Windows setup code.
+
+	* Rakefile, lib/gnome2-win32-binary-downloader.rb: share
+	Windows binary file downloader.
+
+2010-09-11  Kouhei Sutou  <kou@cozmixng.org>
+
+	* ext/glib2/rbglib_maincontext.c (idle_add): fix default priority.
+	Reported by ashbb. Thanks!!!
+
+2010-09-07  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/mkmf-gnome2.rb: ensure add generated enum file.
+
+	* ./: support cross-compile for Windows.
+
+2010-09-02  Kouhei Sutou  <kou@cozmixng.org>
+
+	* ./: reconstruct directory structure for rake-compiler.
+
+2010-07-24  Nikolai Weibull
+
+	src/rbgutil.c: make sure that all strings are fred in
+	rbgutil_glist2ary_string_and_free.
+
+2010-07-23  Nikolai Weibull
+
+	src/rbgutil.c: use rb_ensure around all *_free functions and also fix a
+	bug that made sure that no lists were actually freed.  That's the price
+	of reusing variables.
+
+2010-07-14  Kouhei Sutou  <kou@cozmixng.org>
+
+	* src/rbglib.c: fix coding style.
+
+2010-07-12  Nikolai Weibull
+
+	* src/rbglib.c: use rb_ensure for rbg_cstr_to_rval to free the memory
+	even if an error occurs when creating the Ruby String.
+
 2010-04-17  Kouhei Sutou  <kou@cozmixng.org>
 
 	* src/rbglib.h: 0.19.4 -> 0.20.0.

data/README

@@ -4,20 +4,32 @@ Ruby/GLib2 is a Ruby binding of GLib-2.x.
 
 Requirements
 ------------
-   Ruby: http://www.ruby-lang.org/
-   GLib: http://www.gtk.org/
 
-Install
--------
-   0. install ruby-1.6.x or later, GLib.
-   1. ruby extconf.rb
-   2. make
-   3. su
-   4. make install
+  Ruby >= 1.8.5: http://www.ruby-lang.org/
+  pkg-config.rb: http://github.com/rcairo/pkg-config
+  GLib >= 2.x: http://www.gtk.org/
+
+Install (RubyGems)
+------------------
+
+  % sudo gem install glib2
+
+Windows:
+
+  > gem install glib2 --platform x86-mingw32
+
+Install (traditional)
+---------------------
+
+Install ruby-1.8.5 or later, pkg-config.rb and GLib-2.x.
+
+  % ruby extconf.rb
+  % make
+  % sudo make install
 
 Copying
 -------
-   Copyright (c) 2002-2005 Ruby-GNOME2 Project Team
+   Copyright (c) 2002-2010 Ruby-GNOME2 Project Team
 
    This program is free software.
    You can distribute/modify this program under the terms of

data/Rakefile

@@ -1,87 +1,69 @@
-require 'rake/clean'
-CLEAN.include '**/*.o'
-CLEAN.include "**/*.#{Config::MAKEFILE_CONFIG['DLEXT']}"
-CLOBBER.include 'doc'
-CLOBBER.include '**/*.log'
-CLOBBER.include '**/Makefile'
-CLOBBER.include '**/extconf.h'
+# -*- ruby -*-
 
-# Determine the current version of the software
-def ruby_glib_version
-  buf = File.read('src/rbglib.h')
-  if buf =~ /\s*RBGLIB_MAJOR_VERSION\s*(\d.+)/
-    major = $1
-  else
-    major = 0
-  end
-  if buf =~ /\s*RBGLIB_MINOR_VERSION\s*(\d.+)/
-    minor = $1
-  else
-    minor = 0
-  end
-  if buf =~ /\s*RBGLIB_MICRO_VERSION\s*(\d.+)/
-    micro = $1
-  else
-    micro = 0
-  end
-  "#{major}.#{minor}.#{micro}"
-end
-
-CURRENT_VERSION = ruby_glib_version
-
-desc "Default Task (Test project)"
-task :default => :test
-
-# Make tasks -----------------------------------------------------
-make_program = (/mswin/ =~ RUBY_PLATFORM) ? 'nmake' : 'make'
-MAKECMD = ENV['MAKE_CMD'] || make_program
-MAKEOPTS = ENV['MAKE_OPTS'] || ''
+require 'find'
+require 'rubygems'
+require 'rake/extensiontask'
 
-GLIB_SO = "src/glib2.#{Config::MAKEFILE_CONFIG['DLEXT']}"
+task :default => :build
 
-file 'Makefile' => 'extconf.rb' do
-  sh "ruby extconf.rb #{ENV['EXTCONF_OPTS']}"
+def version
+  @version ||= ENV["VERSION"] || guess_version
 end
 
-def make(target = '')
-  pid = system("#{MAKECMD} #{MAKEOPTS} #{target}")
-  $?.exitstatus
-end
-
-# Let make handle dependencies between c/o/so - we'll just run it. 
-file GLIB_SO => (['Makefile'] + Dir['src/*.c'] + Dir['src/*.h']) do
-  m = make
-  fail "Make failed (status #{m})" unless m == 0
+def guess_version
+  versions = {}
+  File.open("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
+      end
+    end
+  end
+  ["major", "minor", "micro"].collect {|type| versions[type]}.compact.join(".")
 end
 
-desc "Configure Glib2"
-task :configure => ['Makefile']
+package_name = "glib2"
 
-desc "Compile the shared object"
-task :compile => [GLIB_SO]
+spec = Gem::Specification.new do |s|
+  s.name = package_name
+  s.summary = "Ruby/GLib2 is a Ruby binding of GLib-2.x."
+  s.description = "Ruby/GLib2 is a Ruby binding of GLib-2.x."
+  s.author = "The Ruby-GNOME2 Proejct Team"
+  s.email = "ruby-gnome2-devel-en@lists.sourceforge.net"
+  s.homepage = "http://ruby-gnome2.sourceforge.jp/"
+  s.version = version
+  s.platform = Gem::Platform::RUBY
+  s.extensions = FileList["ext/#{package_name}/extconf.rb"]
+  s.require_paths = ["lib"]
+  s.files = FileList["ChangeLog", "README", "Rakefile", "extconf.rb",
+                     "lib/**/*.rb", "{ext,sample,test,test-unit}/**/*"]
+end
 
-desc "Run glib tests"
-task :test => :compile do
-  sh "ruby test/run-test.rb"
+Rake::GemPackageTask.new(spec) do |pkg|
 end
 
-desc 'Generate gem specification'
-task :gemspec do
-  require 'erb'
-  tspec = ERB.new(File.read(File.join(File.dirname(__FILE__),'src','glib2.gemspec.erb')))
-  File.open(File.join(File.dirname(__FILE__),'glib2.gemspec'),'wb') do|f|
-    f << tspec.result
+Rake::ExtensionTask.new(package_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_files = []
+      Find.find(win32_dir) do |file|
+        next if /\.zip\z/ =~ file
+        win32_files << file
+      end
+      spec.files += win32_files
+    end
   end
 end
 
-desc 'Build gem'
-task :package => :gemspec do
-  require 'rubygems/specification'
-  spec_source = File.read File.join(File.dirname(__FILE__),'glib2.gemspec')
-  spec = nil
-  # see: http://gist.github.com/16215
-  Thread.new { spec = eval("$SAFE = 3\n#{spec_source}") }.join
-  spec.validate
-  Gem::Builder.new(spec).build
+namespace :win32 do
+  desc "download Windows binaries"
+  task :download do
+    base_dir = File.join(File.dirname(__FILE__), "lib")
+    $LOAD_PATH.unshift(base_dir)
+    require 'gnome2-win32-binary-downloader'
+    GNOME2Win32BinaryDownloader.download(:package => "glib",
+                                         :dependencies => ["gettext-runtime"])
+  end
 end
-

data/ext/glib2/depend

@@ -0,0 +1,10 @@
+install-so:
+	$(INSTALL_DATA) $(srcdir)/rbglib.h $(RUBYARCHDIR)
+	$(INSTALL_DATA) $(srcdir)/rbgutil.h $(RUBYARCHDIR)
+	$(INSTALL_DATA) $(srcdir)/rbgobject.h $(RUBYARCHDIR)
+	$(INSTALL_DATA) $(srcdir)/rbgcompat.h $(RUBYARCHDIR)
+	$(INSTALL_DATA) glib-enum-types.h $(RUBYARCHDIR)
+
+install:
+	$(MAKEDIRS) $(libdir)/pkgconfig
+	$(INSTALL_DATA) ruby-glib2.pc $(libdir)/pkgconfig

data/ext/glib2/extconf.rb

@@ -0,0 +1,61 @@
+=begin
+extconf.rb for Ruby/GLib extention library
+=end
+
+require 'pathname'
+
+base_dir = Pathname(__FILE__).dirname.parent.parent.expand_path
+mkmf_gnome2_dir = base_dir + 'lib'
+
+$LOAD_PATH.unshift(mkmf_gnome2_dir.to_s)
+
+module_name = "glib2"
+package_id = "gobject-2.0"
+
+require 'mkmf-gnome2'
+
+setup_win32(module_name, base_dir)
+
+PKGConfig.have_package(package_id) or exit 1
+PKGConfig.have_package('gthread-2.0')
+
+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)
+
+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"])
+
+$defs << "-DRUBY_GLIB2_COMPILATION"
+create_makefile(module_name)

data/ext/glib2/glib2.def

@@ -0,0 +1,89 @@
+EXPORTS
+	Init_glib2
+	mGLib		DATA
+	rbgobj_cType	DATA
+	rbgobj_id_children DATA
+	rbgobj_add_relative
+	rbgobj_invalidate_relatives
+	rbgobj_add_relative_removable
+	rbgobj_get_relative_removable
+	rbgobj_remove_relative
+	rbgobj_remove_relative_all
+	rbgobj_define_class
+	rbgobj_define_class_dynamic
+	rbgobj_instance_from_ruby_object
+	rbgobj_ruby_object_from_instance
+	rbgobj_ruby_object_from_instance2
+	rbgobj_ruby_object_from_instance_with_unref
+	rbgobj_get_ruby_object_from_gobject
+	rbgobj_create_object
+	rbgobj_gobject_new
+	rbgobj_boxed_create
+	rbgobj_boxed_get
+	rbgobj_boxed_not_copy_obj
+	rbgobj_make_boxed
+	rbgobj_add_abstract_but_create_instance_class
+	rbgobj_gtype_get
+	rbgobj_gtype_new
+	rbgobj_gvalue_to_rvalue
+	rbgobj_rvalue_to_gvalue
+	rbgobj_initialize_gvalue
+	rbgobj_initialize_object
+	rbgobj_lookup_class
+	rbgobj_lookup_class_by_gtype
+	rbgobj_gtype_to_ruby_class
+	rbgobj_ptr2cptr
+	rbgobj_ptr_new
+	rbgobj_make_enum
+	rbgobj_get_enum
+	rbgobj_make_flags
+	rbgobj_get_flags
+	rbgobj_register_g2r_func
+	rbgobj_register_r2g_func
+	rbgobj_register_class
+	rbgobj_register_property_getter
+	rbgobj_register_property_setter
+	rbgobj_set_signal_func
+	rbgobj_get_signal_func
+	rbgobj_add_constants
+	rbgobj_constant_remap
+	rbgobj_signal_wrap
+	g_rclosure_new
+	g_rclosure_attach
+	g_rclosure_set_tag
+	rbgobj_ruby_value_get_type
+	g_value_get_ruby_value
+	g_value_set_ruby_value
+	g_key_file_get_type
+	rbg_rval_inspect
+	rbg_rval2cstr_accept_nil
+	rbg_cstr2rval
+	rbg_cstr2rval_with_free
+	rbg_string_value_ptr
+	rbgutil_id_module_eval		DATA
+	rbgutil_def_setters
+	rbgutil_glist2ary
+	rbgutil_glist2ary_boxed
+	rbgutil_glist2ary_string
+	rbgutil_glist2ary_and_free
+	rbgutil_glist2ary_boxed_and_free
+	rbgutil_glist2ary_string_and_free
+	rbgutil_gslist2ary
+	rbgutil_gslist2ary_boxed
+	rbgutil_gslist2ary_and_free
+	rbgutil_gslist2ary_boxed_and_free
+	rbgutil_set_properties
+	rbgutil_sym_g2r_func
+	rbgutil_protect
+	rbgutil_invoke_callback
+	rbgutil_start_callback_dispatch_thread
+	rbgutil_stop_callback_dispatch_thread
+	rbgutil_string_set_utf8_encoding
+	rbgerr_define_gerror
+	rbgerr_gerror2exception
+	rbgobj_convert_define
+	rbgobj_fund_define_fundamental
+	rbgobj_gc_mark_gvalue
+	rbgobj_gc_mark_instance
+
+	g_connect_flags_get_type

data/{src → ext/glib2}/rbglib.c

@@ -71,15 +71,25 @@ rbg_cstr2rval(const char* str)
     return str ? rb_str_new2(str) : Qnil;
 }
 
+static VALUE
+rbg_cstr2rval_with_free_body(VALUE str)
+{
+    return rb_str_new2((gchar *)str);
+}
+
+static VALUE
+rbg_cstr2rval_with_free_ensure(VALUE str)
+{
+    g_free((gchar *)str);
+
+    return Qnil;
+}
+
 VALUE
-rbg_cstr2rval_with_free(gchar* str)
+rbg_cstr2rval_with_free(gchar *str)
 {
-    VALUE ret = Qnil;
-    if (str) {
-        ret = rb_str_new2(str);
-        g_free(str);
-    }
-    return ret;
+    return str ? rb_ensure(rbg_cstr2rval_with_free_body, (VALUE)str,
+                           rbg_cstr2rval_with_free_ensure, (VALUE)str) : Qnil;
 }
 
 #if 0