Author: toulmean
Date: Fri Nov 18 04:20:04 2011
New Revision: 1203483
URL: http://svn.apache.org/viewvc?rev=1203483&view=rev
Log:
Small fixes required for the release process
Modified:
buildr/trunk/Rakefile
buildr/trunk/buildr.gemspec
buildr/trunk/rakelib/doc.rake
buildr/trunk/rakelib/stage.rake
Modified: buildr/trunk/Rakefile
URL:
http://svn.apache.org/viewvc/buildr/trunk/Rakefile?rev=1203483&r1=1203482&r2=1203483&view=diff
==============================================================================
--- buildr/trunk/Rakefile (original)
+++ buildr/trunk/Rakefile Fri Nov 18 04:20:04 2011
@@ -13,6 +13,9 @@
# License for the specific language governing permissions and limitations under
# the License.
+# To work-around a bug with gemcutter:
http://stackoverflow.com/questions/4932881/gemcutter-rake-build-now-throws-undefined-method-write-for-syckemitter
+require 'psych' unless RUBY_PLATFORM[/java/]
+
# We need JAVA_HOME for most things (setup, spec, etc).
unless ENV['JAVA_HOME']
if RUBY_PLATFORM[/java/]
Modified: buildr/trunk/buildr.gemspec
URL:
http://svn.apache.org/viewvc/buildr/trunk/buildr.gemspec?rev=1203483&r1=1203482&r2=1203483&view=diff
==============================================================================
--- buildr/trunk/buildr.gemspec (original)
+++ buildr/trunk/buildr.gemspec Fri Nov 18 04:20:04 2011
@@ -85,4 +85,5 @@ for those one-off tasks, with a language
spec.add_development_dependency 'bundler'
spec.add_development_dependency 'win32console' if spec.platform.to_s ==
'x86-mswin32'
+ spec.add_development_dependency 'rubyforge'
end
Modified: buildr/trunk/rakelib/doc.rake
URL:
http://svn.apache.org/viewvc/buildr/trunk/rakelib/doc.rake?rev=1203483&r1=1203482&r2=1203483&view=diff
==============================================================================
--- buildr/trunk/rakelib/doc.rake (original)
+++ buildr/trunk/rakelib/doc.rake Fri Nov 18 04:20:04 2011
@@ -14,8 +14,8 @@
# the License.
if !RUBY_PLATFORM[/java/]
+ gem 'rdoc'
require 'rdoc/task'
-
desc "Creates a symlink to rake's lib directory to support combined rdoc
generation"
file "rake/lib" do
rake_path = $LOAD_PATH.find { |p| File.exist? File.join(p, "rake.rb") }
@@ -24,7 +24,7 @@ if !RUBY_PLATFORM[/java/]
end
desc "Generate RDoc documentation in rdoc/"
- Rake::RDocTask.new :rdoc do |rdoc|
+ RDoc::Task.new :rdoc do |rdoc|
rdoc.rdoc_dir = 'rdoc'
rdoc.title = spec.name
rdoc.options = spec.rdoc_options.clone
@@ -79,7 +79,7 @@ if !RUBY_PLATFORM[/java/]
desc "Build a copy of the Web site in the ./_site"
task :site=>['_site', :rdoc, '_reports/specs.html', '_reports/coverage',
'buildr.pdf'] do
cp_r 'rdoc', '_site'
- fail 'No RDocs in site directory' unless
File.exist?('_site/rdoc/files/lib/buildr_rb.html')
+ fail 'No RDocs in site directory' unless
File.exist?('_site/rdoc/lib/buildr_rb.html')
cp '_reports/specs.html', '_site'
cp_r '_reports/coverage', '_site'
fail 'No coverage report in site directory' unless
File.exist?('_site/coverage/index.html')
Modified: buildr/trunk/rakelib/stage.rake
URL:
http://svn.apache.org/viewvc/buildr/trunk/rakelib/stage.rake?rev=1203483&r1=1203482&r2=1203483&view=diff
==============================================================================
--- buildr/trunk/rakelib/stage.rake (original)
+++ buildr/trunk/rakelib/stage.rake Fri Nov 18 04:20:04 2011
@@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations under
# the License.
-
+require 'rubyforge'
require 'digest/md5'
require 'digest/sha1'
@@ -58,7 +58,8 @@ task :prepare do |task, args|
lambda do
puts "Checking that we have JRuby, Scala and Groovy available ... "
sh 'jruby --version'
- sh 'scala -version'
+ `scala -version`
+ $?.exitstatus == 1 or fail "Scala is not installed"
sh 'groovy -version'
puts "[X] We have JRuby, Scala and Groovy"
end.call
@@ -84,6 +85,7 @@ end
task :stage=>[:clobber, :prepare] do |task, args|
+ gpg_arg = args.gpg || ENV['gpg']
mkpath '_staged'
# Start by figuring out what has changed.
