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 2009/02/27 23:24:50 UTC
svn commit: r748722 - in /buildr/trunk: Rakefile buildr.gemspec
rakelib/doc.rake rakelib/package.rake
Author: assaf
Date: Fri Feb 27 22:24:50 2009
New Revision: 748722
URL: http://svn.apache.org/viewvc?rev=748722&view=rev
Log:
Fixed RDoc 2.3/2.4 conflict on rake setup.
Modified:
buildr/trunk/Rakefile
buildr/trunk/buildr.gemspec
buildr/trunk/rakelib/doc.rake
buildr/trunk/rakelib/package.rake
Modified: buildr/trunk/Rakefile
URL: http://svn.apache.org/viewvc/buildr/trunk/Rakefile?rev=748722&r1=748721&r2=748722&view=diff
==============================================================================
--- buildr/trunk/Rakefile (original)
+++ buildr/trunk/Rakefile Fri Feb 27 22:24:50 2009
@@ -35,28 +35,6 @@
end
-require 'rake/gempackagetask'
-
-
-
-
-
-
-desc 'Compile Java libraries used by Buildr'
-task 'compile' do
- puts 'Compiling Java libraries ...'
- args = File.expand_path('_buildr'), '--buildfile=buildr.buildfile', 'compile'
- args << '--trace' if Rake.application.options.trace
- sh *args
- puts 'OK'
-end
-file Rake::GemPackageTask.new(spec).package_dir=>'compile'
-file Rake::GemPackageTask.new(spec).package_dir_path=>'compile'
-
-# We also need the other package (JRuby if building on Ruby, and vice versa)
-Rake::GemPackageTask.new spec(RUBY_PLATFORM =~ /java/ ? 'ruby' : 'java') do |task|
- # Block necessary otherwise doesn't do full job.
-end
ENV['staging'] = "people.apache.org:~/public_html/#{spec.name}/#{spec.version}"
Modified: buildr/trunk/buildr.gemspec
URL: http://svn.apache.org/viewvc/buildr/trunk/buildr.gemspec?rev=748722&r1=748721&r2=748722&view=diff
==============================================================================
--- buildr/trunk/buildr.gemspec (original)
+++ buildr/trunk/buildr.gemspec Fri Feb 27 22:24:50 2009
@@ -30,14 +30,15 @@
spec.files = Dir['lib/**/*', 'bin/**/*', 'addon/**/*', 'doc/**/*', 'spec/**/*',
'README.rdoc', 'LICENSE', 'NOTICE', 'CHANGELOG',
'buildr.*', 'Rakefile', 'rakelib/**/*', '_buildr', '_jbuildr', 'etc/**/*']
- spec.require_paths = ['lib', 'addon']
+ spec.require_paths = 'lib', 'addon'
spec.bindir = 'bin' # Use these for applications.
spec.executable = 'buildr'
spec.has_rdoc = true
- spec.extra_rdoc_files = ['README.rdoc', 'CHANGELOG', 'LICENSE', 'NOTICE']
- spec.rdoc_options << '--title' << "Buildr" << '--main' << 'README.rdoc' <<
- '--webcvs' << 'http://svn.apache.org/repos/asf/buildr/trunk/'
+ spec.extra_rdoc_files = 'README.rdoc', 'CHANGELOG', 'LICENSE', 'NOTICE'
+ spec.rdoc_options = '--title', 'Buildr', '--main', 'README.rdoc',
+ '--webcvs', 'http://svn.apache.org/repos/asf/buildr/trunk/'
+ spec.post_install_message = "To get started run buildr --help"
# Tested against these dependencies.
spec.add_dependency 'rake', '0.8.3'
Modified: buildr/trunk/rakelib/doc.rake
URL: http://svn.apache.org/viewvc/buildr/trunk/rakelib/doc.rake?rev=748722&r1=748721&r2=748722&view=diff
==============================================================================
--- buildr/trunk/rakelib/doc.rake (original)
+++ buildr/trunk/rakelib/doc.rake Fri Feb 27 22:24:50 2009
@@ -27,7 +27,7 @@
rdoc = Rake::RDocTask.new('rdoc') do |rdoc|
rdoc.rdoc_dir = 'rdoc'
rdoc.title = spec.name
- rdoc.options = spec.rdoc_options
+ rdoc.options = spec.rdoc_options.clone
rdoc.rdoc_files.include('lib/**/*.rb')
rdoc.rdoc_files.include spec.extra_rdoc_files
end
Modified: buildr/trunk/rakelib/package.rake
URL: http://svn.apache.org/viewvc/buildr/trunk/rakelib/package.rake?rev=748722&r1=748721&r2=748722&view=diff
==============================================================================
--- buildr/trunk/rakelib/package.rake (original)
+++ buildr/trunk/rakelib/package.rake Fri Feb 27 22:24:50 2009
@@ -74,3 +74,22 @@
end
task 'stage:check'=>'dependency'
+
+desc 'Compile Java libraries used by Buildr'
+task 'compile' do
+ puts 'Compiling Java libraries ...'
+ args = File.expand_path('_buildr'), '--buildfile=buildr.buildfile', 'compile'
+ args << '--trace' if Rake.application.options.trace
+ sh *args
+ puts 'OK'
+end
+file Rake::GemPackageTask.new(spec).package_dir=>'compile'
+file Rake::GemPackageTask.new(spec).package_dir_path=>'compile'
+
+# We also need the other package (JRuby if building on Ruby, and vice versa)
+Rake::GemPackageTask.new spec(RUBY_PLATFORM =~ /java/ ? 'ruby' : 'java') do |task|
+ # Block necessary otherwise doesn't do full job.
+end
+
+
+