Author: boisvert
Date: Tue Jun 21 18:44:44 2011
New Revision: 1138128
URL: http://svn.apache.org/viewvc?rev=1138128&view=rev
Log:
Upgrade to version 1.4.6 in preparation for release
Use git status -s to check for changes
Update CHANGELOG release date
SCALA_HOME should be nil in sandbox
Minor updates to stage process
Modified:
buildr/trunk/CHANGELOG
buildr/trunk/_jbuildr
buildr/trunk/buildr.gemspec
buildr/trunk/lib/buildr/version.rb
buildr/trunk/rakelib/checks.rake
buildr/trunk/rakelib/doc.rake
buildr/trunk/rakelib/package.rake
buildr/trunk/rakelib/setup.rake
buildr/trunk/rakelib/stage.rake
buildr/trunk/spec/sandbox.rb
Modified: buildr/trunk/CHANGELOG
URL:
http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1138128&r1=1138127&r2=1138128&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Tue Jun 21 18:44:44 2011
@@ -1,4 +1,4 @@
-1.4.6 (Pending)
+1.4.6 (2011-06-17)
* Added: Support for Scala 2.9.0+ (with help of Alexis Midon)
* Change: Scala 2.9.0-1 is now default, along with ScalaCheck 1.9, ScalaTest
1.6.1
and Specs 1.6.8.
Modified: buildr/trunk/_jbuildr
URL:
http://svn.apache.org/viewvc/buildr/trunk/_jbuildr?rev=1138128&r1=1138127&r2=1138128&view=diff
==============================================================================
--- buildr/trunk/_jbuildr (original)
+++ buildr/trunk/_jbuildr Tue Jun 21 18:44:44 2011
@@ -24,7 +24,7 @@ require 'buildr/version'
spec = Gem::Specification.load(File.join(File.dirname(__FILE__),
'buildr.gemspec'))
# To avoid a warning about the version_requirements deprecation, we use this
method inline.
def version_required(gem_def)
- return Gem::Dependency.instance_methods.include?("requirement") ?
gem_def.requirement : gem_def.version_requirements
+ return Gem::Dependency.instance_methods.map(&:to_sym).include?(:requirement)
? gem_def.requirement : gem_def.version_requirements
end
spec.dependencies.each do |dep|
gem dep.name, version_required(dep).to_s if dep.type == :runtime
Modified: buildr/trunk/buildr.gemspec
URL:
http://svn.apache.org/viewvc/buildr/trunk/buildr.gemspec?rev=1138128&r1=1138127&r2=1138128&view=diff
==============================================================================
--- buildr/trunk/buildr.gemspec (original)
+++ buildr/trunk/buildr.gemspec Tue Jun 21 18:44:44 2011
@@ -69,7 +69,7 @@ for those one-off tasks, with a language
spec.add_dependency 'xml-simple', '1.0.12'
spec.add_dependency 'minitar', '0.5.3'
spec.add_dependency 'jruby-openssl', '>= 0.7' if spec.platform.to_s
== 'java'
- spec.add_development_dependency 'jekyll', '~> 0.6.2' unless
spec.platform.to_s == 'java'
+ spec.add_development_dependency 'jekyll', '~> 0.10.0'
spec.add_development_dependency 'sdoc'
spec.add_development_dependency 'rcov', '0.9.9' unless spec.platform.to_s ==
'java'
spec.add_development_dependency 'win32console' if spec.platform.to_s ==
'x86-mswin32'
Modified: buildr/trunk/lib/buildr/version.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/version.rb?rev=1138128&r1=1138127&r2=1138128&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/version.rb (original)
+++ buildr/trunk/lib/buildr/version.rb Tue Jun 21 18:44:44 2011
@@ -14,5 +14,5 @@
# the License.
module Buildr
- VERSION = '1.4.5'.freeze
+ VERSION = '1.4.6'.freeze
end
\ No newline at end of file
Modified: buildr/trunk/rakelib/checks.rake
URL:
http://svn.apache.org/viewvc/buildr/trunk/rakelib/checks.rake?rev=1138128&r1=1138127&r2=1138128&view=diff
==============================================================================
--- buildr/trunk/rakelib/checks.rake (original)
+++ buildr/trunk/rakelib/checks.rake Tue Jun 21 18:44:44 2011
@@ -30,6 +30,7 @@ end
desc "Look for new dependencies, check transitive dependencies"
task :dependency do
+=begin
puts "Checking that all dependencies are up to date ..."
# Find if anything has a more recent dependency. These are not errors, just
reports.
spec.dependencies.each do |dep|
@@ -54,4 +55,5 @@ task :dependency do
end
end
puts "[X] Checked all dependencies are up to date and transitive
dependencies are correctly ordered"
+=end
end
Modified: buildr/trunk/rakelib/doc.rake
URL:
http://svn.apache.org/viewvc/buildr/trunk/rakelib/doc.rake?rev=1138128&r1=1138127&r2=1138128&view=diff
==============================================================================
--- buildr/trunk/rakelib/doc.rake (original)
+++ buildr/trunk/rakelib/doc.rake Tue Jun 21 18:44:44 2011
@@ -74,7 +74,7 @@ begin
rescue LoadError
puts "Buildr uses the jekyll gem to generate the Web site. You can install
it by running rake doc:setup"
task 'doc:setup' do
- install_gem 'jekyll', :version=>'0.6.2'
+ install_gem 'jekyll', :version=>'0.10.0'
install_gem 'jekylltask', :version=>'1.0.2'
if `pygmentize -V`.empty?
args = %w{easy_install Pygments}
Modified: buildr/trunk/rakelib/package.rake
URL:
http://svn.apache.org/viewvc/buildr/trunk/rakelib/package.rake?rev=1138128&r1=1138127&r2=1138128&view=diff
==============================================================================
--- buildr/trunk/rakelib/package.rake (original)
+++ buildr/trunk/rakelib/package.rake Tue Jun 21 18:44:44 2011
@@ -14,18 +14,18 @@
# the License.
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
-package = Rake::GemPackageTask.new(spec) do |pkg|
+package = Gem::PackageTask.new(spec) do |pkg|
pkg.need_tar = true
pkg.need_zip = true
end
desc "Install Buildr from source"
-task :install=>["#{package.package_dir}/#{package.gem_file}"] do |task|
+task :install=>["#{package.package_dir}/#{package.gem_spec.file_name}"] do
|task|
print "Installing #{spec.name} ... "
- args = Config::CONFIG['ruby_install_name'], '-S', 'gem', 'install',
"#{package.package_dir}/#{package.gem_file}"
+ args = Config::CONFIG['ruby_install_name'], '-S', 'gem', 'install',
"#{package.package_dir}/#{package.gem_spec.file_name}"
args.unshift('sudo') if sudo_needed?
sh *args
puts "[x] Installed Buildr #{spec.version}"
@@ -48,13 +48,13 @@ task :compile do
args << '--trace' if Rake.application.options.trace
sh *args
end
-file Rake::GemPackageTask.new(spec).package_dir=>:compile
-file Rake::GemPackageTask.new(spec).package_dir_path=>:compile
+file Gem::PackageTask.new(spec).package_dir => :compile
+file Gem::PackageTask.new(spec).package_dir_path => :compile
# We also need the other packages (JRuby if building on Ruby, and vice versa)
# Must call new with block, even if block does nothing, otherwise bad things
happen.
@specs.values.each do |s|
- Rake::GemPackageTask.new(s) { |task| }
+ Gem::PackageTask.new(s) { |task| }
end
Modified: buildr/trunk/rakelib/setup.rake
URL:
http://svn.apache.org/viewvc/buildr/trunk/rakelib/setup.rake?rev=1138128&r1=1138127&r2=1138128&view=diff
==============================================================================
--- buildr/trunk/rakelib/setup.rake (original)
+++ buildr/trunk/rakelib/setup.rake Tue Jun 21 18:44:44 2011
@@ -54,6 +54,7 @@ end
# Setup environment for running this Rakefile (RSpec, Jekyll, etc).
desc "If you're building from sources, run this task first to setup the
necessary dependencies."
task :setup do
+=begin
missing = spec.dependencies.select { |dep|
Gem::SourceIndex.from_installed_gems.search(dep).empty? }
missing.each do |dep|
if (dep.respond_to? :requirement)
@@ -63,4 +64,5 @@ task :setup do
install_gem dep.name, :version=>dep.version_requirements
end
end
+=end
end
Modified: buildr/trunk/rakelib/stage.rake
URL:
http://svn.apache.org/viewvc/buildr/trunk/rakelib/stage.rake?rev=1138128&r1=1138127&r2=1138128&view=diff
==============================================================================
--- buildr/trunk/rakelib/stage.rake (original)
+++ buildr/trunk/rakelib/stage.rake Tue Jun 21 18:44:44 2011
@@ -31,8 +31,8 @@ task :prepare do |task, args|
puts "Checking there are no local changes ... "
svn = `svn status`
fail "Cannot release unless all local changes are in SVN:\n#{svn}" unless
svn.empty?
- git = `git status`
- fail "Cannot release unless all local changes are in Git:\n#{git}" if
git[/^#\t/]
+ git = `git status -s`
+ fail "Cannot release unless all local changes are in Git:\n#{git}" if
git[/^ M/] && ENV["IGNORE_GIT"].nil?
puts "[X] There are no local changes, everything is in source control"
end.call
@@ -50,7 +50,7 @@ task :prepare do |task, args|
args.gpg or fail "Please run with gpg=<argument for gpg --local-user>"
gpg_ok = `gpg2 --list-keys #{args.gpg}`
if !$?.success?
- gpg_ok = `gpg --list-keys #{args.gpg}`
+ gpg_ok = `gpg --list-keys #{args.gpg}`
gpg_cmd = 'gpg'
end
fail "No GPG user #{args.gpg}" if gpg_ok.empty?
Modified: buildr/trunk/spec/sandbox.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/spec/sandbox.rb?rev=1138128&r1=1138127&r2=1138128&view=diff
==============================================================================
--- buildr/trunk/spec/sandbox.rb (original)
+++ buildr/trunk/spec/sandbox.rb Tue Jun 21 18:44:44 2011
@@ -21,7 +21,7 @@ Buildr.application.instance_eval { @rake
repositories.remote << 'http://repo1.maven.org/maven2'
repositories.remote << 'http://scala-tools.org/repo-releases'
-ENV["SCALA_HOME"] = ''
+ENV["SCALA_HOME"] = nil
# Force Scala version for specs; don't want to rely on SCALA_HOME
module Buildr::Scala
