You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildr.apache.org by as...@apache.org on 2008/04/26 02:48:22 UTC

svn commit: r651755 - in /incubator/buildr/trunk: doc/pages/download.textile rakelib/apache.rake rakelib/doc.rake

Author: assaf
Date: Fri Apr 25 17:48:21 2008
New Revision: 651755

URL: http://svn.apache.org/viewvc?rev=651755&view=rev
Log:
Distro links are now generated in staged/site instead of modifying textile sources

Modified:
    incubator/buildr/trunk/doc/pages/download.textile
    incubator/buildr/trunk/rakelib/apache.rake
    incubator/buildr/trunk/rakelib/doc.rake

Modified: incubator/buildr/trunk/doc/pages/download.textile
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/doc/pages/download.textile?rev=651755&r1=651754&r2=651755&view=diff
==============================================================================
--- incubator/buildr/trunk/doc/pages/download.textile (original)
+++ incubator/buildr/trunk/doc/pages/download.textile Fri Apr 25 17:48:21 2008
@@ -13,15 +13,6 @@
 
 h2.  Binaries and Source Code
 
-h3. buildr 1.3.0 (2008-04-25)
-
-| "buildr-1.3.0-incubating.gem":http://www.apache.org/dist/incubator/buildr/1.3.0-incubating/buildr-1.3.0-incubating.gem | "3982cb4c847a8aba81f367feb53c8077":http://www.apache.org/dist/incubator/buildr/1.3.0-incubating/buildr-1.3.0-incubating.gem.md5 | "PGP":http://www.apache.org/dist/incubator/buildr/1.3.0-incubating/buildr-1.3.0-incubating.gem.asc |
-| "buildr-1.3.0-java-incubating.gem":http://www.apache.org/dist/incubator/buildr/1.3.0-incubating/buildr-1.3.0-java-incubating.gem | "ff9bd2494c731d0feefa8a002f5a46a1":http://www.apache.org/dist/incubator/buildr/1.3.0-incubating/buildr-1.3.0-java-incubating.gem.md5 | "PGP":http://www.apache.org/dist/incubator/buildr/1.3.0-incubating/buildr-1.3.0-java-incubating.gem.asc |
-| "buildr-1.3.0-incubating.tgz":http://www.apache.org/dist/incubator/buildr/1.3.0-incubating/buildr-1.3.0-incubating.tgz | "55e85d527c20d9a9dbbadc52ae786416":http://www.apache.org/dist/incubator/buildr/1.3.0-incubating/buildr-1.3.0-incubating.tgz.md5 | "PGP":http://www.apache.org/dist/incubator/buildr/1.3.0-incubating/buildr-1.3.0-incubating.tgz.asc |
-| "buildr-1.3.0-incubating.zip":http://www.apache.org/dist/incubator/buildr/1.3.0-incubating/buildr-1.3.0-incubating.zip | "530d15d4b124764e06bdf6545c24a0d7":http://www.apache.org/dist/incubator/buildr/1.3.0-incubating/buildr-1.3.0-incubating.zip.md5 | "PGP":http://www.apache.org/dist/incubator/buildr/1.3.0-incubating/buildr-1.3.0-incubating.zip.asc |
-
-p>.  ("Signing keys":http://www.apache.org/dist/incubator/buildr/1.3.0-incubating/KEYS)
-
 
 p(note). When downloading from files please check the
 "md5sum":http://www.apache.org/dev/release-signing#md5 and verify the

Modified: incubator/buildr/trunk/rakelib/apache.rake
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/rakelib/apache.rake?rev=651755&r1=651754&r2=651755&view=diff
==============================================================================
--- incubator/buildr/trunk/rakelib/apache.rake (original)
+++ incubator/buildr/trunk/rakelib/apache.rake Fri Apr 25 17:48:21 2008
@@ -69,12 +69,32 @@
     puts 'Done'
   end
 
-  task 'distro-links' do |task, args|
+  task 'distro-links', :path do |task, args|
     url = args.incubating ? "http://www.apache.org/dist/incubator/#{spec.name}/#{spec.version}-incubating" :
       "http://www.apache.org/dist/#{spec.name}/#{spec.version}"
-    packages = FileList['staged/distro/*.{gem,tgz,zip}'].map { |pkg|
-      { :name=>File.basename(pkg), :md5=>File.read("#{pkg}.md5").split.first } }
-    task('download-links').invoke(url, packages)
+    rows = FileList['staged/distro/*.{gem,tgz,zip}'].map { |pkg|
+      name, md5 = File.basename(pkg), File.read("#{pkg}.md5").split.first
+      <<-HTML
+      <tr>
+        <td><a href="#{url}/#{name}">#{name}</a></td>
+        <td><a href="#{url}/#{name}.md5">#{md5}</a></td>
+        <td><a href="#{url}/#{name}.asc">Sig</a></td>
+      </tr>
+      HTML
+    }
+    html = <<-HTML
+    <h3>#{spec.name} #{spec.version}#{args.incubating && "-incubating"} (#{Time.now.strftime('%Y-%m-%d')})</h3>
+    <table>
+      <thead><th>Package</th><th>MD5 Checksum</th><th>PGP</th></thead>
+    #{rows.join("\n")}
+    </table>
+    <p style="text-align:right"> (<a href="#{url}/KEYS">Release signing keys</a>)</p>
+    HTML
+    file_name = File.join(args.path || 'site', 'download.html')
+    modified = File.read(file_name).sub(/<h2.*binaries.*source.*<\/h2>.*/i) { |header| "#{header}\n#{html}\n" }
+    File.open file_name, 'w' do |file|
+      file.write modified
+    end
   end
 
 =begin
@@ -106,6 +126,7 @@
     mkpath 'staged'
     rm_rf 'staged/site'
     cp_r 'site', 'staged'
+    task('apache:distro-links').invoke('staged/site')
   end
 
   # Publish prerequisites to Web site.
@@ -120,7 +141,6 @@
 end
 
 
-task 'stage'=>'apache:distro-links'
 task 'stage:check'=>['apache:license', 'apache:check']
 task 'stage:prepare'=>['staged/distro', 'staged/site'] do |task|
   # Since this requires input (passphrase), do it at the very end.

Modified: incubator/buildr/trunk/rakelib/doc.rake
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/rakelib/doc.rake?rev=651755&r1=651754&r2=651755&view=diff
==============================================================================
--- incubator/buildr/trunk/rakelib/doc.rake (original)
+++ incubator/buildr/trunk/rakelib/doc.rake Fri Apr 25 17:48:21 2008
@@ -92,20 +92,6 @@
     rm_rf 'site'
   end
 
-  task 'download-links', :url, :packages do |task, args|
-    url = args.url
-    lines = ["h3. #{spec.name} #{spec.version} (#{Time.now.strftime('%Y-%m-%d')})", ''] +
-      args.packages.map { |pkg|
-        name = pkg[:name]
-        %{| "#{name}":#{url}/#{name} | "#{pkg[:md5]}":#{url}/#{name}.md5 | "PGP":#{url}/#{name}.asc |} } +
-      ['', %{p>.  ("Signing keys":#{url}/KEYS)} ]
-    downloads = 'doc/pages/download.textile'
-    modified = File.read(downloads).sub(/^h2.*binaries.*source.*$/i) { |header| "#{header}\n\n#{lines.join("\n")}\n" }
-    File.open downloads, 'w' do |file|
-      file.write modified
-    end
-  end
-
 rescue LoadError
   puts 'Please run rake setup to install the Docter document generation library'
   task 'setup' do