Changeset 868

Show
Ignore:
Timestamp:
11/01/07 02:26:10 (10 months ago)
Author:
evanweaver
Message:

reenable site feed, with autodiscovery link, by scraping feed43 instead of using the broken atom.xml

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Rakefile

    r866 r868  
    1616  p.need_tgz = true 
    1717 
    18 #  case RUBY_PLATFORM  
    19 #  when /mswin/ 
    20 #    p.certificate_chain = ['~/gem_certificates/mongrel-public_cert.pem',  
    21 #      '~/gem_certificates/luislavena-mongrel-public_cert.pem'] 
    22 #  else 
    23     p.certificate_chain = ['~/p/configuration/gem_certificates/mongrel/mongrel-public_cert.pem',  
    24       '~/p/configuration/gem_certificates/evan_weaver-mongrel-public_cert.pem'] 
    25 #  end 
    26  
    27   p.eval = proc do   
     18  #  case RUBY_PLATFORM 
     19  #  when /mswin/ 
     20  #    p.certificate_chain = ['~/gem_certificates/mongrel-public_cert.pem', 
     21  #      '~/gem_certificates/luislavena-mongrel-public_cert.pem'] 
     22  #  else 
     23  p.certificate_chain = ['~/p/configuration/gem_certificates/mongrel/mongrel-public_cert.pem', 
     24  '~/p/configuration/gem_certificates/evan_weaver-mongrel-public_cert.pem'] 
     25  #  end 
     26 
     27  p.eval = proc do 
    2828    case RUBY_PLATFORM 
    2929    when /mswin/ 
    …… 
    4040    end 
    4141  end 
    42    
     42 
    4343end 
    4444 
    …… 
    7676end 
    7777 
    78 def java_classpath_arg  
     78def java_classpath_arg 
    7979  # A myriad of ways to discover the JRuby classpath 
    8080  classpath = begin 
    81     require 'java'  
     81    require 'java' 
    8282    # Already running in a JRuby JVM 
    8383    Java::java.lang.System.getProperty('java.class.path') 
    …… 
    9292  filename = "lib/http11.so" 
    9393  file filename do 
    94     Dir.chdir("ext/http11") do  
     94    Dir.chdir("ext/http11") do 
    9595      ruby "extconf.rb" 
    9696      system(PLATFORM =~ /mswin/ ? 'nmake' : 'make') 
    9797    end 
    9898    move_extensions 
    99   end  
     99  end 
    100100  task :compile => [filename] 
    101101 
    …… 
    108108    sh "javac -target 1.4 -source 1.4 -d #{build_dir} #{java_classpath_arg} #{sources}" 
    109109    sh "jar cf lib/http11.jar -C #{build_dir} ." 
    110     move_extensions       
    111   end       
     110    move_extensions 
     111  end 
    112112  task :compile => [filename] 
    113113 
    …… 
    154154  sub_project("mongrel_upload_progress", :install) 
    155155  sub_project("mongrel_console", :install) 
    156   sub_project("mongrel_cluster", :install)   
     156  sub_project("mongrel_cluster", :install) 
    157157  sub_project("mongrel_experimental", :install) 
    158158  sub_project("mongrel_service", :install) if RUBY_PLATFORM =~ /mswin/ 
    …… 
    166166  sub_project("mongrel_console", :uninstall) 
    167167  sub_project("gem_plugin", :uninstall) 
    168   sub_project("fastthread", :uninstall)   
    169   sub_project("mongrel_experimental", :uninstall)   
     168  sub_project("fastthread", :uninstall) 
     169  sub_project("mongrel_experimental", :uninstall) 
    170170  sub_project("mongrel_service", :uninstall) if RUBY_PLATFORM =~ /mswin/ 
    171171end 
    …… 
    179179  sub_project("mongrel_upload_progress", :clean) 
    180180  sub_project("mongrel_console", :clean) 
    181   sub_project("mongrel_cluster", :clean)  
    182   sub_project("mongrel_experimental", :clean)     
     181  sub_project("mongrel_cluster", :clean) 
     182  sub_project("mongrel_experimental", :clean) 
    183183  sub_project("mongrel_service", :clean) if RUBY_PLATFORM =~ /mswin/ 
    184184end 
    …… 
    194194    mkdir_p "pkg/gems" 
    195195    mkdir_p "pkg/tars" 
    196     
     196 
    197197    FileList["**/*.gem"].each { |gem| mv gem, "pkg/gems" } 
    198198    FileList["**/*.tgz"].each {|tgz| mv tgz, "pkg/tars" } 
    199      
     199 
    200200    # XXX Hack, because only Luis can package for Win32 right now 
    201201    sh "cp ~/Downloads/mongrel-#{e.version}-mswin32.gem pkg/gems/" 
    202     sh "cp ~/Downloads/mongrel_service-0.3.3-mswin32.gem pkg/gems/"   
     202    sh "cp ~/Downloads/mongrel_service-0.3.3-mswin32.gem pkg/gems/" 
    203203    sh "rm -rf pkg/mongrel*" 
    204     sh "gem generate_index -d pkg"   
    205     sh "scp -r CHANGELOG pkg/* rubyforge.org:/var/www/gforge-projects/mongrel/releases/"  
     204    sh "gem generate_index -d pkg" 
     205    sh "scp -r CHANGELOG pkg/* rubyforge.org:/var/www/gforge-projects/mongrel/releases/" 
    206206    sh "svn log -v > SVN_LOG" 
    207     sh "scp -r SVN_LOG pkg/* rubyforge.org:/var/www/gforge-projects/mongrel/releases/"  
    208     rm "SVN_LOG"   
    209   end 
    210    
     207    sh "scp -r SVN_LOG pkg/* rubyforge.org:/var/www/gforge-projects/mongrel/releases/" 
     208    rm "SVN_LOG" 
     209  end 
     210 
    211211  desc "Upload the website" 
    212212  task :web do 
    213     # Requires the 'webgem' gem and the 'atom-tools' gem 
    214     sh "cd site; webgen; webgen; ruby atom.rb > output/feed.atom; rsync -azv --no-perms --no-times output/* rubyforge.org:/var/www/gforge-projects/mongrel/" 
    215   end 
    216    
     213    # Requires the 'webgem' gem 
     214    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/" 
     215  end 
     216 
    217217  desc "Upload the rdocs" 
    218218  task :rdoc => [:doc] do 
    …… 
    220220    sh "cd projects/gem_plugin; rake site:rdoc" 
    221221  end 
    222    
     222 
    223223  desc "Upload the coverage report" 
    224224  task :coverage => [:rcov] do 
    225225    sh "rsync -azv --no-perms --no-times test/coverage/* rubyforge.org:/var/www/gforge-projects/mongrel/coverage/" rescue nil 
    226226  end 
    227    
     227 
    228228  desc "Upload the website, the rdocs, and the coverage report" 
    229229  task :all => [:clean, :web, :rdoc, :coverage] 
    230    
    231 end 
     230 
     231end 

  • trunk/site/src/default.template

    r790 r868  
    55  <head> 
    66    <title>Mongrel: {title: }</title> 
    7     <link rel="stylesheet" href="{relocatable: default.css}" type="text/css" media= 
    8     "screen" /> 
    9     <meta http-equiv="Content-Type" content= 
    10     "text/html; charset=us-ascii" /> 
     7    <link rel="stylesheet" href="{relocatable: default.css}" type="text/css" media="screen" /> 
     8    <link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="http://mongrel.rubyforge.org/rss.xml" /> 
     9    <meta http-equiv="Content-Type" content="text/html; charset=us-ascii" /> 
    1110  </head> 
    1211