Changeset 923

Show
Ignore:
Timestamp:
12/22/07 21:47:58 (9 months ago)
Author:
evanweaver
Message:

cp rakefile from stable branch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Rakefile

    r919 r923  
    11 
    22require 'rubygems' 
    3 gem 'echoe', '>=2.7' 
     3gem 'echoe', '>=2.7.5' 
    44require 'echoe' 
    55 
    …… 
    1111  p.ignore_pattern = /^(pkg|site|projects|doc|log)|CVS|\.log/ 
    1212  p.ruby_version = '>= 1.8.4' 
    13   p.dependencies = ['gem_plugin >=0.2.3'] 
    14   (p.rdoc_template = `allison --path`.chomp) rescue nil 
    15  
     13  p.dependencies = ['gem_plugin >=0.2.3']   
     14  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'] 
     17   
    1618  p.need_tar_gz = false 
    1719  p.need_tgz = true 
    1820 
    1921  case RUBY_PLATFORM 
    20   when /mswin/ 
    21     p.certificate_chain = [ 
    22       '~/projects/gem_certificates/mongrel-public_cert.pem', 
    23       '~/projects/gem_certificates/luislavena-mongrel-public_cert.pem' 
    24     ] 
    25   else 
    26     p.certificate_chain = [ 
    27       '~/p/configuration/gem_certificates/mongrel/mongrel-public_cert.pem', 
    28       '~/p/configuration/gem_certificates/evan_weaver-mongrel-public_cert.pem' 
    29     ] 
     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"] 
    3028  end 
    3129 
    …… 
    3331    case RUBY_PLATFORM 
    3432    when /mswin/ 
    35       extensions.clear 
    3633      self.files += ['lib/http11.so'] 
    37       self.platform = Gem::Platform::CURRENT 
     34      self.platform = Gem::Platform::WIN32 
    3835      add_dependency('cgi_multipart_eof_fix', '>= 2.4') 
    3936    when /java/ 
    40       extensions.clear 
    4137      self.files += ['lib/http11.jar'] 
    4238      self.platform = 'jruby' 
    …… 
    6864end 
    6965 
    70 #### XXX Hack around JRuby in-process launching problem 
    71  
    72 desc "Run each test suite in isolation on JRuby" 
    73 task :test_java do 
    74   require 'jruby' 
    75   save = JRuby.runtime.instance_config.run_ruby_in_process 
    76   begin 
    77     JRuby.runtime.instance_config.run_ruby_in_process = false 
    78     Rake::Task[:test].invoke 
    79   ensure 
    80     JRuby.runtime.instance_config.run_ruby_in_process = save 
    81   end 
    82 end 
    83  
    84 #### XXX Hack around RubyGems and Echoe for pre-compiled extensions. 
     66#### Pre-compiled extensions for alternative platforms 
    8567 
    8668def move_extensions 
    …… 
    11395 
    11496when /java/ 
     97 
     98  # Avoid JRuby in-process launching problem 
     99  begin 
     100    require 'jruby' 
     101    JRuby.runtime.instance_config.run_ruby_in_process = false  
     102  rescue LoadError 
     103  end 
     104 
    115105  filename = "lib/http11.jar" 
    116106  file filename do 
    …… 
    148138  sub_project("mongrel_cluster", :package) 
    149139  sub_project("mongrel_experimental", :package) 
    150   sub_project("mongrel_service", :package) if RUBY_PLATFORM =~ /mswin/ 
     140 
    151141  sh("rake java package") unless RUBY_PLATFORM =~ /java/ 
     142   
     143  # XXX Broken by RubyGems 0.9.5 
     144  # sub_project("mongrel_service", :package) if RUBY_PLATFORM =~ /mswin/ 
    152145  # sh("rake mswin package") unless RUBY_PLATFORM =~ /mswin/ 
    153146end 
    …… 
    210203    FileList["**/*.tgz"].each {|tgz| mv tgz, "pkg/tars" } 
    211204 
    212     # XXX Hack, because only Luis can package for Win32 right now 
    213     sh "cp ~/Downloads/mongrel-#{e.version}-mswin32.gem pkg/gems/" 
    214     sh "cp ~/Downloads/mongrel_service-0.3.3-mswin32.gem pkg/gems/" 
    215205    sh "rm -rf pkg/mongrel*" 
    216206    sh "gem generate_index -d pkg"