buildr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From boisv...@apache.org
Subject svn commit: r1022379 - in /buildr/trunk: CHANGELOG lib/buildr/core/util.rb
Date Thu, 14 Oct 2010 04:39:18 GMT
Author: boisvert
Date: Thu Oct 14 04:39:17 2010
New Revision: 1022379

URL: http://svn.apache.org/viewvc?rev=1022379&view=rev
Log:
BUILDR-535 Failing 'checks' produce no meaningful errors on JRuby

Modified:
    buildr/trunk/CHANGELOG
    buildr/trunk/lib/buildr/core/util.rb

Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1022379&r1=1022378&r2=1022379&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Thu Oct 14 04:39:17 2010
@@ -21,6 +21,7 @@
 * Fixed:  BUILDR-532 package_as_source does not package resources (Tammo van Lessen)
 * Fixed:  BUILDR-534 package_with_sources does not package source artifacts if no sources
but resources exist.
           (Tammo Van Lessen)
+* Fixed:  BUILDR-535 Failing "checks" produce no meaningful errors  on JRuby
 * Fixed:  JavaRebel was previously not correctly detected.
 
 1.4.2 (2010-09-18)

Modified: buildr/trunk/lib/buildr/core/util.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/util.rb?rev=1022379&r1=1022378&r2=1022379&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/util.rb (original)
+++ buildr/trunk/lib/buildr/core/util.rb Thu Oct 14 04:39:17 2010
@@ -342,6 +342,12 @@ end
 if Buildr::Util.java_platform?
   require 'ffi'
 
+  # Workaround for BUILDR-535: when requiring 'ffi', JRuby defines an :error
+  # method with arity 0.
+  class Module
+    remove_method :error if method_defined?(:error)
+  end
+
   # Fix for BUILDR-292.
   # JRuby fails to rename a file on different devices
   # this monkey-patch wont be needed when JRUBY-3381 gets resolved.



Mime
View raw message