Author: donaldp
Date: Sun Sep 23 10:10:27 2012
New Revision: 1388996
URL: http://svn.apache.org/viewvc?rev=1388996&view=rev
Log:
BUILDR-640 Enable building jekyll and rdoc under more rubies. (Niklaus Giger)
Modified:
buildr/trunk/CHANGELOG
buildr/trunk/buildr.gemspec
buildr/trunk/rakelib/doc.rake
Modified: buildr/trunk/CHANGELOG
URL:
http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1388996&r1=1388995&r2=1388996&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Sun Sep 23 10:10:27 2012
@@ -1,4 +1,5 @@
1.4.8 (Pending)
+* Change: BUILDR-640 Enable building jekyll and rdoc under more rubies.
(Niklaus Giger)
* Change: Mark Buildr:Bnd.remote_repository as deprecated as dependencies
appear in maven central.
* Added: BUILDR-654 Add the ability to configure the version of BND used by
bnd addon. (Niklaus Giger)
* Added: Create the git_auto_version addon that automatically specifies a
version for a git project based
Modified: buildr/trunk/buildr.gemspec
URL:
http://svn.apache.org/viewvc/buildr/trunk/buildr.gemspec?rev=1388996&r1=1388995&r2=1388996&view=diff
==============================================================================
--- buildr/trunk/buildr.gemspec (original)
+++ buildr/trunk/buildr.gemspec Sun Sep 23 10:10:27 2012
@@ -74,14 +74,11 @@ for those one-off tasks, with a language
spec.add_dependency 'minitar', '0.5.3'
spec.add_dependency 'jruby-openssl', '>= 0.7' if $platform.to_s ==
'java'
- # The documentation is currently not generated whe building via jruby
- unless $platform.to_s == 'java'
- spec.add_development_dependency 'jekyll', '0.11.2'
- spec.add_development_dependency 'RedCloth', '4.2.9'
- spec.add_development_dependency 'jekylltask', '1.1.0'
- spec.add_development_dependency 'rdoc', '3.8'
- spec.add_development_dependency 'rcov', '0.9.9'
- end
+ spec.add_development_dependency 'jekyll', '0.11.2'
+ spec.add_development_dependency 'RedCloth', '4.2.9'
+ spec.add_development_dependency 'jekylltask', '1.1.0'
+ spec.add_development_dependency 'rdoc', '3.8'
+ spec.add_development_dependency 'rcov', '0.9.9'
spec.add_development_dependency 'ci_reporter', '1.6.3'
@@ -89,4 +86,7 @@ for those one-off tasks, with a language
spec.add_development_dependency 'bundler'
spec.add_development_dependency 'win32console' if $platform.to_s ==
'x86-mswin32'
spec.add_development_dependency 'rubyforge'
+ # Ideally we would depend on psych when the platform has >= 1.9.2 support
and jruby platform version > 1.6.6
+ #spec.add_development_dependency 'psych' if RUBY_VERSION >= '1.9.2'
+ spec.add_development_dependency 'pygmentize', '0.0.3'
end
Modified: buildr/trunk/rakelib/doc.rake
URL:
http://svn.apache.org/viewvc/buildr/trunk/rakelib/doc.rake?rev=1388996&r1=1388995&r2=1388996&view=diff
==============================================================================
--- buildr/trunk/rakelib/doc.rake (original)
+++ buildr/trunk/rakelib/doc.rake Sun Sep 23 10:10:27 2012
@@ -13,7 +13,9 @@
# License for the specific language governing permissions and limitations under
# the License.
-if !RUBY_PLATFORM[/java/]
+if (RUBY_PLATFORM[/java/] and JRUBY_VERSION < '1.6.6')
+ puts "Running jekyll under jruby < 1.6.6 would never complete!"
+else
gem 'rdoc'
require 'rdoc/task'
desc "Creates a symlink to rake's lib directory to support combined rdoc
generation"
