Author: assaf
Date: Fri Apr 25 17:48:13 2008
New Revision: 651754

URL: http://svn.apache.org/viewvc?rev=651754&view=rev
Log:
Update distro links before generating site image

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=651754&r1=651753&r2=651754&view=diff
==============================================================================
--- incubator/buildr/trunk/doc/pages/download.textile (original)
+++ incubator/buildr/trunk/doc/pages/download.textile Fri Apr 25 17:48:13 2008
@@ -13,6 +13,15 @@
 
 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=651754&r1=651753&r2=651754&view=diff
==============================================================================
--- incubator/buildr/trunk/rakelib/apache.rake (original)
+++ incubator/buildr/trunk/rakelib/apache.rake Fri Apr 25 17:48:13 2008
@@ -69,7 +69,16 @@
     puts 'Done'
   end
 
-  task 'add-links' do |task, args|
+  task 'distro-links' 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)
+  end
+
+=begin
+  task 'distro-links-old' 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}";
     links = FileList['staged/distro/*.{gem,tgz,zip}'].map { |pkg|
@@ -85,15 +94,15 @@
 
 p>.  ("Signing keys":#{url}/KEYS)
     TEXTILE
-    fn = 'doc/pages/download.textile'
-    modified = File.read(fn).sub(/^h2.*binaries.*source.*$/i) { |header| 
"#{header}\n\n#{textile}" }
-    File.open fn, 'w' do |file|
+    downloads = 'doc/pages/download.textile'
+    modified = File.read(args.file).sub(/^h2.*binaries.*source.*$/i) { 
|header| "#{header}\n\n#{textile}" }
+    File.open args.file, 'w' do |file|
       file.write modified
     end
   end
+=end
 
-
-  file 'staged/site'=>'site' do
+  file 'staged/site'=>['distro-links', 'site'] do
     mkpath 'staged'
     rm_rf 'staged/site'
     cp_r 'site', 'staged'
@@ -111,6 +120,7 @@
 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=651754&r1=651753&r2=651754&view=diff
==============================================================================
--- incubator/buildr/trunk/rakelib/doc.rake (original)
+++ incubator/buildr/trunk/rakelib/doc.rake Fri Apr 25 17:48:13 2008
@@ -73,6 +73,15 @@
     cp 'print/buildr.pdf', 'site'
   end
 
+  task 'site' do
+    print 'Checking that we have site documentation, RDoc and PDF ... '
+    fail 'No PDF generated, you need to install PrinceXML!' unless 
File.exist?('site/buildr.pdf')
+    fail 'No RDocs in site directory' unless 
File.exist?('site/rdoc/files/lib/buildr_rb.html')
+    fail 'No site documentation in site directory' unless 
File.exist?('site/index.html')
+    fail 'No specifications site directory' unless 
File.exist?('site/specs.html')
+    puts 'OK'
+  end
+
   desc 'Produce PDF'
   task 'pdf'=>'print/buildr.pdf' do |task|
     sh 'open', 'print/buildr.pdf'
@@ -83,13 +92,18 @@
     rm_rf 'site'
   end
 
-  task 'site:prepare'=>'site' do
-    print 'Checking that we have site documentation, RDoc and PDF ... '
-    fail 'No PDF generated, you need to install PrinceXML!' unless 
File.exist?('site/buildr.pdf')
-    fail 'No RDocs in site directory' unless 
File.exist?('site/rdoc/files/lib/buildr_rb.html')
-    fail 'No site documentation in site directory' unless 
File.exist?('site/index.html')
-    fail 'No specifications site directory' unless 
File.exist?('site/specs.html')
-    puts 'OK'
+  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


Reply via email to