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

diff --git a/Rakefile b/Rakefile
index eeee145..3ab381d 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,5 +1,3 @@
-# $Id: Rakefile 18 2005-03-29 17:01:39Z tilman $
-
 require "rbconfig"
 require "rake/clean"
 require "rake/testtask"
@@ -8,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")
@@ -17,46 +18,49 @@ PKG_NAME = "ruby-eet"
 PKG_VERSION = File.read("lib/eet.rb").
               match(/^\s*VERSION = \"(.*)\"\s$/).captures.first
 
-ext_obj = "ext/ext.o"
-ext_lib = "ext/eet_ext.so"
+CLOBBER.include("test/*.eet")
 
-CLOBBER.include(ext_obj)
-CLOBBER.include(ext_lib)
-CLOBBER.include(FileList["test/*.eet"])
+task :default => [:ext]
 
-archdir = Config::CONFIG["archdir"]
-sitearchdir = Config::CONFIG["sitearchdir"]
-libdir = Config::CONFIG["libdir"]
-sitelibdir = Config::CONFIG["sitelibdir"]
-rubylib = Config::CONFIG["LIBRUBYARG_SHARED"]
-destdir = "#{ENV["DESTDIR"]}"
-eet_cflags = `eet-config --cflags`.strip
-eet_libs = `eet-config --libs`.strip
-cflags = "#{ENV["CFLAGS"]} #{eet_cflags}"
-ldflags = "#{ENV["LDFLAGS"]} #{eet_libs}"
+config = Rake::ConfigureTask.new do |t|
+	t.tests << Rake::ConfigureTask::
+	           PkgConfigTest.new("eet", :is_critical => true)
+end
 
-task :default => [ext_lib]
+task :ext => [:pre_ext]
 
-rule ".o" => [".c"] do |t|
-	sh "cc #{cflags} -fPIC -I #{archdir} #{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|
-	sh "cc #{ldflags} -shared -Wl -L #{libdir} #{rubylib} " +
-	   "#{t.prerequisites.join(" ")} -o #{t.name}"
+task :pre_ext => [:configure] do
+	ext.link_libs << config.eet.libs
+
+	cflags = [
+		ext.env[:cflags],
+		config.eet.cflags
+	]
+
+	ext.env.update(:cflags => cflags)
 end
 
-task :install => [ext_lib] do |t|
-	FileUtils::Verbose.install(ext_lib, destdir + sitearchdir,
-	                           :mode => 0755)
-	FileUtils::Verbose.install("lib/eet.rb", destdir + sitelibdir,
-	                           :mode => 0644)
+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_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 << "ext"
+	t.libs = ["lib", "ext", "test"]
 	t.test_files = FileList["test/test_*.rb"]
 	t.verbose = true
 end
@@ -65,19 +69,27 @@ Rake::RDocTask.new do |t|
 	t.rdoc_dir = "doc"
 	t.title = "Ruby-EET - EET bindings for Ruby"
 	t.options = ["--line-numbers", "--inline-source", "--main", "README"]
-	t.rdoc_files.include("README", "COPYING", "AUTHORS", "ChangeLog",
+	t.rdoc_files.include("README", "COPYING", "AUTHORS",
 	                     "NEWS", "ext/ext.c", "lib/eet.rb")
 end
 
+CLOBBER.include("ChangeLog")
+
+file "ChangeLog" do
+	`git log > ChangeLog`
+end
+
 Rake::PackageTask.new(PKG_NAME, PKG_VERSION) do |t|
 	t.need_tar_gz = true
-	t.package_files.include("[A-Z]*", "ext/*.c", "lib/*.rb", "test/*.rb")
+	t.package_files.include("AUTHORS", "ChangeLog", "COPYING", "NEWS",
+	                        "README", "Rakefile",
+	                        "ext/*.c", "lib/*.rb", "test/*.rb")
 end
 
 task :publish => [:rdoc, :package] do
 	p = Rake::CompositePublisher.new
 	p.add(Rake::SshFreshDirPublisher.new("code-monkey.de",
-	                                     "public_html/docs/" +
+	                                     "public_docs/" +
 	                                     PKG_NAME, "doc"))
 	p.add(Rake::SshFilePublisher.new("code-monkey.de",
 	                                 ".", "pkg",