copy stable Rakefile changes into trunk

git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@942 19e92222-5c0b-0410-8929-a290d50e31e9

1 files changed, 15 insertions, 13 deletions

diff --git a/Rakefile b/Rakefile
index 30b77cd..f47d7a2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -7,36 +7,38 @@ e = Echoe.new("mongrel") do |p|
   p.summary = "A small fast HTTP library and server that runs Rails, Camping, Nitro and Iowa apps."
   p.author ="Zed A. Shaw"
   p.clean_pattern = ['ext/http11/*.{bundle,so,o,obj,pdb,lib,def,exp}', 'lib/*.{bundle,so,o,obj,pdb,lib,def,exp}', 'ext/http11/Makefile', 'pkg', 'lib/*.bundle', '*.gem', 'site/output', '.config', 'lib/http11.jar', 'ext/http11_java/classes', 'coverage']
+  p.url = "http://mongrel.rubyforge.org"
   p.rdoc_pattern = ['README', 'LICENSE', 'CHANGELOG', 'COPYING', 'lib/**/*.rb', 'doc/**/*.rdoc']
   p.ignore_pattern = /^(pkg|site|projects|doc|log)|CVS|\.log/
-  p.ruby_version = '>= 1.8.4'
+  p.ruby_version = '>=1.8.4'
   p.dependencies = ['gem_plugin >=0.2.3']  
   p.extension_pattern = nil
-  p.certificate_chain = ['~/p/configuration/gem_certificates/mongrel/mongrel-public_cert.pem',
-    '~/p/configuration/gem_certificates/evan_weaver-mongrel-public_cert.pem']
+  
+  p.certificate_chain = case ENV['USER']
+    when 'eweaver' 
+      ['~/p/configuration/gem_certificates/mongrel/mongrel-public_cert.pem',
+       '~/p/configuration/gem_certificates/evan_weaver-mongrel-public_cert.pem']
+    when 'luislavena'
+      ['~/gem_certificates/mongrel-public_cert.pem',
+        '~/gem_certificates/luislavena-mongrel-public_cert.pem']    
+  end
   
   p.need_tar_gz = false
   p.need_tgz = true
 
-  case RUBY_PLATFORM
-    when /mswin/
-       p.certificate_chain = ['~/gem_certificates/mongrel-public_cert.pem',
-        '~/gem_certificates/luislavena-mongrel-public_cert.pem']    
-    when /java/
-    else
-      p.extension_pattern = ["ext/**/extconf.rb"]
+  if RUBY_PLATFORM !~ /mswin|java/
+    p.extension_pattern = ["ext/**/extconf.rb"]
   end
 
   p.eval = proc do
     case RUBY_PLATFORM
     when /mswin/
       self.files += ['lib/http11.so']
-      # We don't cross-package Windows so CURRENT is ok
-      self.platform = Gem::Platform::CURRENT 
+      self.platform = Gem::Platform::WIN32
       add_dependency('cgi_multipart_eof_fix', '>= 2.4')
     when /java/
       self.files += ['lib/http11.jar']
-      self.platform = 'jruby'
+      self.platform = 'jruby' # XXX Is this right?
     else
       add_dependency('daemons', '>= 1.0.3')
       add_dependency('fastthread', '>= 1.0.1')