Author: assaf
Date: Thu Jun 5 18:59:43 2008
New Revision: 663799
URL: http://svn.apache.org/viewvc?rev=663799&view=rev
Log:
Fixed: BUILDR-82: Temporary work around for Net::SSH 2.0.2 attempting to load
Pageant DLLs when running on JRuby/Windows.
Added:
incubator/buildr/trunk/buildr (with props)
Modified:
incubator/buildr/trunk/CHANGELOG
incubator/buildr/trunk/lib/buildr.rb
incubator/buildr/trunk/lib/buildr/core/application.rb
incubator/buildr/trunk/lib/buildr/core/transports.rb
incubator/buildr/trunk/lib/buildr/core/util.rb
Modified: incubator/buildr/trunk/CHANGELOG
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/CHANGELOG?rev=663799&r1=663798&r2=663799&view=diff
==============================================================================
--- incubator/buildr/trunk/CHANGELOG (original)
+++ incubator/buildr/trunk/CHANGELOG Thu Jun 5 18:59:43 2008
@@ -4,6 +4,8 @@
* Fixed: BUILDR-76: Added more specs and fixes to compile task.
* Fixed: BUILDR-80: Fix reference to Util#timestamp method on nailgun addon.
* Fixed: BUILDR-79: Remove :source option for Scala compiler
+* Fixed: BUILDR-82: Temporary work around for Net::SSH 2.0.2 attempting to
+load Pageant DLLs when running on JRuby/Windows.
1.3.1.1 (2008-06-04)
* Fixed: BUILDR-78 Broken dependency on Rubyforge Gem.
Added: incubator/buildr/trunk/buildr
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/buildr?rev=663799&view=auto
==============================================================================
--- incubator/buildr/trunk/buildr (added)
+++ incubator/buildr/trunk/buildr Thu Jun 5 18:59:43 2008
@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+# Run buildr from source, specifically for testing stuff without doing a rake
install.
+ruby -Ilib -Iaddon bin/buildr $*
Propchange: incubator/buildr/trunk/buildr
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/buildr/trunk/lib/buildr.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr.rb?rev=663799&r1=663798&r2=663799&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr.rb (original)
+++ incubator/buildr/trunk/lib/buildr.rb Thu Jun 5 18:59:43 2008
@@ -15,14 +15,6 @@
$KCODE = 'utf8'
-# in order to work around a bug in jruby (1.0.1 and trunk as of oct11, 2007)
-# needle and net/ssh need to be loaded before -anything- else. please see
-# http://jira.codehaus.org/browse/JRUBY-1188 for more info.
-require 'net/ssh'
-
-require 'highline/import'
-require 'builder' # A different kind of buildr, one we use to create XML.
-
module Buildr
VERSION = '1.3.2'.freeze # unless const_defined?(:VERSION)
end
Modified: incubator/buildr/trunk/lib/buildr/core/application.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/core/application.rb?rev=663799&r1=663798&r2=663799&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/core/application.rb (original)
+++ incubator/buildr/trunk/lib/buildr/core/application.rb Thu Jun 5 18:59:43
2008
@@ -35,6 +35,7 @@
# SOFTWARE.
+require 'highline/import'
require 'benchmark'
require 'rake'
require 'rubygems/source_info_cache'
Modified: incubator/buildr/trunk/lib/buildr/core/transports.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/core/transports.rb?rev=663799&r1=663798&r2=663799&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/core/transports.rb (original)
+++ incubator/buildr/trunk/lib/buildr/core/transports.rb Thu Jun 5 18:59:43
2008
@@ -17,6 +17,8 @@
require 'cgi'
require 'net/http'
require 'net/https'
+# PATCH: On Windows, Net::SSH 2.0.2 attempts to load the Pageant DLLs which
break on JRuby.
+$LOAD_PATH << 'net/ssh/authentication/pageant' if RUBY_PLATFORM =~ /java/
require 'net/ssh'
require 'net/sftp'
require 'uri'
Modified: incubator/buildr/trunk/lib/buildr/core/util.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/core/util.rb?rev=663799&r1=663798&r2=663799&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/core/util.rb (original)
+++ incubator/buildr/trunk/lib/buildr/core/util.rb Thu Jun 5 18:59:43 2008
@@ -13,8 +13,10 @@
# License for the specific language governing permissions and limitations under
# the License.
+
require 'rbconfig'
require 'pathname'
+require 'builder' # A different kind of buildr, one we use to create XML.
module Buildr
