[cairo-commit] rcairo ChangeLog,1.242,1.243 Rakefile,1.8,1.9

[Kouhei Sutou]

Committed by: kou

Update of /cvs/cairo/rcairo
In directory kemper:/tmp/cvs-serv11185

Modified Files:
	ChangeLog Rakefile 
Log Message:
* Rakefile: don't require 'cairo' if needless.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/rcairo/ChangeLog,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -d -r1.242 -r1.243
--- ChangeLog	24 Apr 2008 05:15:57 -0000	1.242
+++ ChangeLog	24 Apr 2008 05:18:47 -0000	1.243
@@ -1,5 +1,7 @@
 2008-04-24  Kouhei Sutou  <kou at cozmixng.org>
 
+	* Rakefile: don't require 'cairo' if needless.
+
 	* pkg-config.rb (PackageConfig#guess_default_path): ignore
 	require 'dl/import' error.
 

Index: Rakefile
===================================================================
RCS file: /cvs/cairo/rcairo/Rakefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Rakefile	11 Apr 2008 12:43:25 -0000	1.8
+++ Rakefile	24 Apr 2008 05:18:48 -0000	1.9
@@ -17,7 +17,11 @@
 $LOAD_PATH.unshift(cairo_ext_dir)
 $LOAD_PATH.unshift(cairo_lib_dir)
 ENV["RUBYLIB"] = "#{cairo_lib_dir}:#{cairo_ext_dir}:#{ENV['RUBYLIB']}"
-require 'cairo'
+
+def guess_rcairo_version
+  require 'cairo'
+  Cairo.bindings_version
+end
 
 manifest = File.join(base_dir, "Manifest.txt")
 manifest_contents = []
@@ -50,7 +54,7 @@
   FileUtils.rm_f(manifest)
 end
 
-ENV["VERSION"] ||= Cairo.bindings_version
+ENV["VERSION"] ||= guess_rcairo_version
 version = ENV["VERSION"]
 project = Hoe.new('cairo', version) do |project|
   project.rubyforge_name = 'cairo'