Changeset 912

Show
Ignore:
Timestamp:
12/15/07 03:19:19 (9 months ago)
Author:
evanweaver
Message:

rakefile fixes for cross-packaging and java testing in 1-1-2

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/stable_1-1/Rakefile

    r909 r912  
    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 
    19   #  case RUBY_PLATFORM 
    20   #  when /mswin/ 
    21   #    p.certificate_chain = ['~/gem_certificates/mongrel-public_cert.pem', 
    22   #      '~/gem_certificates/luislavena-mongrel-public_cert.pem'] 
    23   #  else 
    24   p.certificate_chain = ['~/p/configuration/gem_certificates/mongrel/mongrel-public_cert.pem', 
    25   '~/p/configuration/gem_certificates/evan_weaver-mongrel-public_cert.pem'] 
    26   #  end 
     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"] 
     28  end 
    2729 
    2830  p.eval = proc do 
    2931    case RUBY_PLATFORM 
    3032    when /mswin/ 
    31       extensions.clear 
    3233      self.files += ['lib/http11.so'] 
    3334      self.platform = Gem::Platform::WIN32 
    3435      add_dependency('cgi_multipart_eof_fix', '>= 2.4') 
    3536    when /java/ 
    36       extensions.clear 
    3737      self.files += ['lib/http11.jar'] 
    3838      self.platform = 'jruby' 
    …… 
    6464end 
    6565 
    66 #### XXX Hack around JRuby test/unit interaction problems 
    67  
    68 desc "Run each test suite in isolation on JRuby" 
    69 task :test_java do 
    70   e.test_pattern.each do |f| 
    71     sh "/opt/local/jruby/bin/jruby -w -Ilib:ext:bin:test -e 'require \"#{f}\"'" rescue nil 
    72   end 
    73 end 
    74  
    75 #### XXX Hack around RubyGems and Echoe for pre-compiled extensions. 
     66#### Pre-compiled extensions for alternative platforms 
    7667 
    7768def move_extensions 
    …… 
    10495 
    10596when /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 
    106105  filename = "lib/http11.jar" 
    107106  file filename do 
    …… 
    139138  sub_project("mongrel_cluster", :package) 
    140139  sub_project("mongrel_experimental", :package) 
    141   sub_project("mongrel_service", :package) if RUBY_PLATFORM =~ /mswin/ 
     140 
    142141  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/ 
    143145  # sh("rake mswin package") unless RUBY_PLATFORM =~ /mswin/ 
    144146end 
    …… 
    201203    FileList["**/*.tgz"].each {|tgz| mv tgz, "pkg/tars" } 
    202204 
    203     # XXX Hack, because only Luis can package for Win32 right now 
    204     sh "cp ~/Downloads/mongrel-#{e.version}-mswin32.gem pkg/gems/" 
    205     sh "cp ~/Downloads/mongrel_service-0.3.3-mswin32.gem pkg/gems/" 
    206205    sh "rm -rf pkg/mongrel*" 
    207206    sh "gem generate_index -d pkg" 
    …… 
    216215    # Requires the 'webgem' gem 
    217216    sh "cd site; webgen; webgen; curl 'http://feed43.com/mongrel.xml' > output/rss.xml; rsync -azv --no-perms --no-times output/* rubyforge.org:/var/www/gforge-projects/mongrel/" 
     217    puts "\nMake sure to re-run the site update 6 hours later if you updated the news. This delay is required for Feed43 to pick up the site changes." 
    218218  end 
    219219