Changeset 942

Show
Ignore:
Timestamp:
12/31/07 12:48:28 (8 months ago)
Author:
evanweaver
Message:

copy stable Rakefile changes into trunk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/Rakefile

    r925 r942  
    88  p.author ="Zed A. Shaw" 
    99  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'] 
     10  p.url = "http://mongrel.rubyforge.org" 
    1011  p.rdoc_pattern = ['README', 'LICENSE', 'CHANGELOG', 'COPYING', 'lib/**/*.rb', 'doc/**/*.rdoc'] 
    1112  p.ignore_pattern = /^(pkg|site|projects|doc|log)|CVS|\.log/ 
    12   p.ruby_version = '>= 1.8.4' 
     13  p.ruby_version = '>=1.8.4' 
    1314  p.dependencies = ['gem_plugin >=0.2.3']   
    1415  p.extension_pattern = nil 
    15   p.certificate_chain = ['~/p/configuration/gem_certificates/mongrel/mongrel-public_cert.pem', 
    16     '~/p/configuration/gem_certificates/evan_weaver-mongrel-public_cert.pem'] 
     16   
     17  p.certificate_chain = case ENV['USER'] 
     18    when 'eweaver'  
     19      ['~/p/configuration/gem_certificates/mongrel/mongrel-public_cert.pem', 
     20       '~/p/configuration/gem_certificates/evan_weaver-mongrel-public_cert.pem'] 
     21    when 'luislavena' 
     22      ['~/gem_certificates/mongrel-public_cert.pem', 
     23        '~/gem_certificates/luislavena-mongrel-public_cert.pem']     
     24  end 
    1725   
    1826  p.need_tar_gz = false 
    1927  p.need_tgz = true 
    2028 
    21   case RUBY_PLATFORM 
    22     when /mswin/ 
    23        p.certificate_chain = ['~/gem_certificates/mongrel-public_cert.pem', 
    24         '~/gem_certificates/luislavena-mongrel-public_cert.pem']     
    25     when /java/ 
    26     else 
    27       p.extension_pattern = ["ext/**/extconf.rb"] 
     29  if RUBY_PLATFORM !~ /mswin|java/ 
     30    p.extension_pattern = ["ext/**/extconf.rb"] 
    2831  end 
    2932 
     
    3235    when /mswin/ 
    3336      self.files += ['lib/http11.so'] 
    34       # We don't cross-package Windows so CURRENT is ok 
    35       self.platform = Gem::Platform::CURRENT  
     37      self.platform = Gem::Platform::WIN32 
    3638      add_dependency('cgi_multipart_eof_fix', '>= 2.4') 
    3739    when /java/ 
    3840      self.files += ['lib/http11.jar'] 
    39       self.platform = 'jruby' 
     41      self.platform = 'jruby' # XXX Is this right? 
    4042    else 
    4143      add_dependency('daemons', '>= 1.0.3')