svn commit: r1151439 - in /buildr/trunk: CHANGELOG buildr.gemspec rakelib/doc.rake rakelib/stage.rake

[do...@apache.org]

Author: donaldp
Date: Wed Jul 27 12:14:48 2011
New Revision: 1151439

URL: http://svn.apache.org/viewvc?rev=1151439&view=rev
Log:
Upgrade to jekyll 0.11.0, jekylltask 1.1.0, RedCloth 4.2.7, rdoc 3.8 for generating documentation

Modified:
    buildr/trunk/CHANGELOG
    buildr/trunk/buildr.gemspec
    buildr/trunk/rakelib/doc.rake
    buildr/trunk/rakelib/stage.rake

Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1151439&r1=1151438&r2=1151439&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Wed Jul 27 12:14:48 2011
@@ -1,4 +1,6 @@
 1.4.7 (Pending)
+* Change: Upgrade to jekyll 0.11.0, jekylltask 1.1.0, RedCloth 4.2.7, rdoc 3.8 for
+          generating documentation
 * Change: Upgrade to require rubygems > 1.8.6
 * Change: BUILDR-603 Remove install/uninstall actions from :gem packaging type
 * Change: BUILDR-602 Fail the build when gem dependencies are missing rather than

Modified: buildr/trunk/buildr.gemspec
URL: http://svn.apache.org/viewvc/buildr/trunk/buildr.gemspec?rev=1151439&r1=1151438&r2=1151439&view=diff
==============================================================================
--- buildr/trunk/buildr.gemspec (original)
+++ buildr/trunk/buildr.gemspec Wed Jul 27 12:14:48 2011
@@ -75,11 +75,10 @@ for those one-off tasks, with a language
 
   # The documentation is currently not generated whe building via jruby
   unless spec.platform.to_s == 'java'
-    spec.add_development_dependency 'jekyll', '>= 0.10.0'
-    spec.add_development_dependency 'RedCloth'
-    spec.add_development_dependency 'jekylltask', '>= 1.0.2'
-    spec.add_development_dependency 'rdoc', '2.4.3'
-    spec.add_development_dependency 'sdoc'
+    spec.add_development_dependency 'jekyll', '0.11.0'
+    spec.add_development_dependency 'RedCloth', '4.2.7'
+    spec.add_development_dependency 'jekylltask', '1.1.0'
+    spec.add_development_dependency 'rdoc', '3.8'
     spec.add_development_dependency 'rcov', '0.9.9'
   end
 

Modified: buildr/trunk/rakelib/doc.rake
URL: http://svn.apache.org/viewvc/buildr/trunk/rakelib/doc.rake?rev=1151439&r1=1151438&r2=1151439&view=diff
==============================================================================
--- buildr/trunk/rakelib/doc.rake (original)
+++ buildr/trunk/rakelib/doc.rake Wed Jul 27 12:14:48 2011
@@ -14,13 +14,6 @@
 # the License.
 
 if !RUBY_PLATFORM[/java/]
-  task 'doc:setup'
-  begin # For the Web site, we use the SDoc RDoc generator/theme (http://github.com/voloko/sdoc/)
-    require 'sdoc'
-  rescue LoadError
-    puts "Buildr uses the SDoc RDoc generator/theme. You can install it by running bundler"
-  end
-
   require 'rdoc/task'
 
   desc "Creates a symlink to rake's lib directory to support combined rdoc generation"

Modified: buildr/trunk/rakelib/stage.rake
URL: http://svn.apache.org/viewvc/buildr/trunk/rakelib/stage.rake?rev=1151439&r1=1151438&r2=1151439&view=diff
==============================================================================
--- buildr/trunk/rakelib/stage.rake (original)
+++ buildr/trunk/rakelib/stage.rake Wed Jul 27 12:14:48 2011
@@ -81,7 +81,7 @@ task :prepare do |task, args|
 end
 
 
-task :stage=>['setup', 'doc:setup', :clobber, :prepare] do |task, args|
+task :stage=>['setup', :clobber, :prepare] do |task, args|
   mkpath '_staged'
 
   # Start by figuring out what has changed.