X-Git-Url: http://git.code-monkey.de/?p=ruby-eet.git;a=blobdiff_plain;f=Rakefile;fp=Rakefile;h=3ab381d3ba8638f7bb89fb2b34d7a08fe77a4d91;hp=f49c8367e18be29fb27e01bde63b82c31bac3ee9;hb=2ff30a3e85ffcae7ed66e1c73d67626fcf5a5f8b;hpb=6b51e31a7f18e33ec8d03d63e1c8427ce0be8a9d

diff --git a/Rakefile b/Rakefile
index f49c836..3ab381d 100644
--- a/Rakefile
+++ b/Rakefile
@@ -6,6 +6,9 @@ require "rake/packagetask"
 require "rake/contrib/compositepublisher"
 require "rake/contrib/sshpublisher"
 
+require "rake/configuretask"
+require "rake/extensiontask"
+
 # make sure we run at least Rake 0.5.0
 if (RAKEVERSION.split(".").map { |p| p.to_i } <=> [0, 5, 0]) < 0
 	raise("Rake 0.5.0 or greater required")
@@ -15,45 +18,46 @@ PKG_NAME = "ruby-eet"
 PKG_VERSION = File.read("lib/eet.rb").
               match(/^\s*VERSION = \"(.*)\"\s$/).captures.first
 
-cc = ENV["CC"] || "cc"
-ext_obj = "ext/ext.o"
-ext_lib = "ext/eet_ext.so"
+CLOBBER.include("test/*.eet")
 
-CLOBBER.include(ext_obj, ext_lib, "test/*.eet")
+task :default => [:ext]
 
-task :default => [ext_lib]
+config = Rake::ConfigureTask.new do |t|
+	t.tests << Rake::ConfigureTask::
+	           PkgConfigTest.new("eet", :is_critical => true)
+end
 
-rule ".o" => [".c"] do |t|
-	archdir = Config::CONFIG["archdir"]
-	cflags = "#{ENV["CFLAGS"]} #{`eet-config --cflags`.strip} " +
-	         "-I#{archdir}"
+task :ext => [:pre_ext]
 
-	sh "#{cc} #{cflags} -fPIC #{t.source} -c -o #{t.name}"
+ext = Rake::ExtensionTask.new :ext => [:ext] do |t|
+	t.dir = "ext"
+	t.lib_name = "#{t.dir}/eet_ext.so"
 end
 
-file ext_lib => ext_obj do |t|
-	libdir = Config::CONFIG["libdir"]
-	rubylib = Config::CONFIG["LIBRUBYARG_SHARED"]
-	ldflags = "#{ENV["LDFLAGS"]} #{`eet-config --libs`.strip} " +
-	          "-L#{libdir} #{rubylib}"
+task :pre_ext => [:configure] do
+	ext.link_libs << config.eet.libs
+
+	cflags = [
+		ext.env[:cflags],
+		config.eet.cflags
+	]
 
-	sh "#{cc} #{ldflags} -shared -Wl #{t.prerequisites.join(" ")} " +
-	   "-o #{t.name}"
+	ext.env.update(:cflags => cflags)
 end
 
-task :install => [ext_lib] do |t|
+task :install => [:ext] do |t|
 	destdir = ENV["DESTDIR"] || ""
 
 	ddir = destdir + Config::CONFIG["sitearchdir"]
 	FileUtils::Verbose.mkdir_p(ddir) unless File.directory?(ddir)
-	FileUtils::Verbose.install(ext_lib, ddir, :mode => 0755)
+	FileUtils::Verbose.install(ext.lib_name, ddir, :mode => 0755)
 
 	ddir = destdir + Config::CONFIG["sitelibdir"]
 	FileUtils::Verbose.mkdir_p(ddir) unless File.directory?(ddir)
 	FileUtils::Verbose.install("lib/eet.rb", ddir, :mode => 0644)
 end
 
-task :test => [ext_lib]
+task :test => [:ext]
 
 Rake::TestTask.new do |t|
 	t.libs = ["lib", "ext", "test"]