From: <kt...@us...> - 2011-09-18 15:26:53
|
Revision: 4687 http://ruby-gnome2.svn.sourceforge.net/ruby-gnome2/?rev=4687&view=rev Author: ktou Date: 2011-09-18 15:26:47 +0000 (Sun, 18 Sep 2011) Log Message: ----------- * lib/mkmf-gnome2.rb (check_cairo): really support RubyGems 1.8.6... [#3411234] Reported by Tobias Pfeiffer. Thanks!!! Modified Paths: -------------- ruby-gnome2/trunk/glib2/ChangeLog ruby-gnome2/trunk/glib2/lib/mkmf-gnome2.rb Modified: ruby-gnome2/trunk/glib2/ChangeLog =================================================================== --- ruby-gnome2/trunk/glib2/ChangeLog 2011-09-18 13:35:44 UTC (rev 4686) +++ ruby-gnome2/trunk/glib2/ChangeLog 2011-09-18 15:26:47 UTC (rev 4687) @@ -1,3 +1,9 @@ +2011-09-19 Kouhei Sutou <ko...@co...> + + * lib/mkmf-gnome2.rb (check_cairo): really support RubyGems 1.8.6... + [#3411234] + Reported by Tobias Pfeiffer. Thanks!!! + 2011-09-18 Kouhei Sutou <ko...@co...> * ext/glib2/rbglib.h: 1.0.2 -> 1.0.3. @@ -2,3 +8,5 @@ - * lib/mkmf-gnome2.rb (add_depend_package): support RubyGems 1.8.6. + * lib/mkmf-gnome2.rb (add_depend_package): support RubyGems + 1.8.6. [#3411204] + Reported by Tobias Pfeiffer. Thanks!!! Modified: ruby-gnome2/trunk/glib2/lib/mkmf-gnome2.rb =================================================================== --- ruby-gnome2/trunk/glib2/lib/mkmf-gnome2.rb 2011-09-18 13:35:44 UTC (rev 4686) +++ ruby-gnome2/trunk/glib2/lib/mkmf-gnome2.rb 2011-09-18 15:26:47 UTC (rev 4687) @@ -75,23 +75,30 @@ end end -#add_depend_package("glib2", "ext/glib2", "/...../ruby-gnome2") -def add_depend_package(target_name, target_srcdir, top_srcdir, options={}) +def find_gem_spec(package) begin require 'rubygems' - gem_spec = (Gem::Specification.respond_to?(:find_by_name) ? - Gem::Specification.find_by_name(target_name) : - 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) + if Gem::Specification.respond_to?(:find_by_name) + Gem::Specification.find_by_name(package) + else + Gem.source_index.find_name(package).last end rescue LoadError + nil end +end +#add_depend_package("glib2", "ext/glib2", "/...../ruby-gnome2") +def add_depend_package(target_name, target_srcdir, top_srcdir, options={}) + gem_spec = find_gem_spec(target_name) + 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 + [top_srcdir, File.join(top_srcdir, target_name), $configure_args['--topdir'], @@ -383,16 +390,8 @@ rcairo_source_dir = nil end if rcairo_source_dir.nil? - begin - require 'rubygems' - cairo_gem_spec = (Gem::Specification.respond_to?(:find_by_name) ? - Gem::Specification.find_by_name('cairo') : - Gem.source_index.find_name('cairo')).last - if cairo_gem_spec - rcairo_source_dir = cairo_gem_spec.full_gem_path - end - rescue LoadError - end + cairo_gem_spec = find_gem_spec("cairo") + rcairo_source_dir = cairo_gem_spec.full_gem_path if cairo_gem_spec end unless rcairo_source_dir.nil? This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |