Author: assaf
Date: Wed Oct 1 18:23:13 2008
New Revision: 700979
URL: http://svn.apache.org/viewvc?rev=700979&view=rev
Log:
Fixed: BUILDR-137 JRuby 1.1.3 and Buildr 1.3.2 don't appear to work (on
Windows).
Modified:
incubator/buildr/trunk/CHANGELOG
incubator/buildr/trunk/lib/buildr/core/transports.rb
incubator/buildr/trunk/rakelib/rspec.rake
Modified: incubator/buildr/trunk/CHANGELOG
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/CHANGELOG?rev=700979&r1=700978&r2=700979&view=diff
==============================================================================
--- incubator/buildr/trunk/CHANGELOG (original)
+++ incubator/buildr/trunk/CHANGELOG Wed Oct 1 18:23:13 2008
@@ -23,6 +23,8 @@
* Change: BUILDR-153 To customize the SVN tag used by the release task, set
Release.tag_name to either the tag value or a proc that takes the
version number and return the desired tag.
+* Fixed: BUILDR-137 JRuby 1.1.3 and Buildr 1.3.2 don't appear to work
+ (on Windows).
* Fixed: BUILDR-135. Extracted reusable replacement logic into Filter::Mapper
* Fixed: BUILDR-129. Modifying a project manifest should not alter it's
parent project manifest.
Modified: incubator/buildr/trunk/lib/buildr/core/transports.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/core/transports.rb?rev=700979&r1=700978&r2=700979&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/core/transports.rb (original)
+++ incubator/buildr/trunk/lib/buildr/core/transports.rb Wed Oct 1 18:23:13
2008
@@ -18,8 +18,7 @@
require 'net/http'
require 'net/https'
# PATCH: On Windows, Net::SSH 2.0.2 attempts to load the Pageant DLLs which
break on JRuby.
-$LOADED_FEATURES.unshift 'net/ssh/authentication/pageant' if RUBY_PLATFORM =~
/java/
-require 'net/ssh'
+$LOADED_FEATURES << 'net/ssh/authentication/pageant.rb' if RUBY_PLATFORM =~
/java/
require 'net/sftp'
require 'uri'
require 'digest/md5'
Modified: incubator/buildr/trunk/rakelib/rspec.rake
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/rakelib/rspec.rake?rev=700979&r1=700978&r2=700979&view=diff
==============================================================================
--- incubator/buildr/trunk/rakelib/rspec.rake (original)
+++ incubator/buildr/trunk/rakelib/rspec.rake Wed Oct 1 18:23:13 2008
@@ -68,7 +68,7 @@
end
task 'setup' do
- install_gem 'win32console' if Gem.win_platform? # Colors for RSpec, only
on Windows platform.
+ install_gem 'win32console' if windows? && !RUBY_PLATFORM[/java/] # Colors
for RSpec, only on Windows platform.
end
rescue LoadError
