You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildr.apache.org by to...@apache.org on 2010/07/13 04:28:36 UTC
svn commit: r963586 - in /buildr/trunk: CHANGELOG lib/buildr/java.rb
lib/buildr/java/ecj.rb spec/java/ecj_spec.rb spec/spec_helpers.rb
Author: toulmean
Date: Tue Jul 13 02:28:35 2010
New Revision: 963586
URL: http://svn.apache.org/viewvc?rev=963586&view=rev
Log:
BUILDR-472: ECJ dependency now required to build any java project
Modified:
buildr/trunk/CHANGELOG
buildr/trunk/lib/buildr/java.rb
buildr/trunk/lib/buildr/java/ecj.rb
buildr/trunk/spec/java/ecj_spec.rb
buildr/trunk/spec/spec_helpers.rb
Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=963586&r1=963585&r2=963586&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Tue Jul 13 02:28:35 2010
@@ -12,6 +12,7 @@
* Fixed: BUILDR-464 Improve the versioning of Buildr (Rhett Sutphin)
* Fixed: BUILDR-466 Rendering issue with IE on the website (Shane Witbeck)
* Fixed: BUILDR-468 test:failed does not respect test.exclude
+* Fixed: BUILDR-472 ECJ dependency now required to build any java project
1.4.1 (2010-07-07)
* Added: BUILDR-420 Support external compiler
Modified: buildr/trunk/lib/buildr/java.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/java.rb?rev=963586&r1=963585&r2=963586&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/java.rb (original)
+++ buildr/trunk/lib/buildr/java.rb Tue Jul 13 02:28:35 2010
@@ -17,7 +17,6 @@
require RUBY_PLATFORM == 'java' ? 'buildr/java/jruby' : 'buildr/java/rjb'
require 'buildr/java/compiler'
require 'buildr/java/external'
-require 'buildr/java/ecj'
require 'buildr/java/tests'
require 'buildr/java/bdd'
require 'buildr/java/packaging'
Modified: buildr/trunk/lib/buildr/java/ecj.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/java/ecj.rb?rev=963586&r1=963585&r2=963586&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/java/ecj.rb (original)
+++ buildr/trunk/lib/buildr/java/ecj.rb Tue Jul 13 02:28:35 2010
@@ -20,14 +20,6 @@ module Buildr
OPTIONS = Buildr::Compiler::Javac::OPTIONS
- class << self
-
- def applies_to?(project, task)
- return false
- end
-
- end
-
specify :language=>:java, :sources => 'java', :source_ext => 'java',
:target=>'classes', :target_ext=>'class', :packaging=>:jar
Modified: buildr/trunk/spec/java/ecj_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/java/ecj_spec.rb?rev=963586&r1=963585&r2=963586&view=diff
==============================================================================
--- buildr/trunk/spec/java/ecj_spec.rb (original)
+++ buildr/trunk/spec/java/ecj_spec.rb Tue Jul 13 02:28:35 2010
@@ -94,7 +94,7 @@ describe Buildr::Compiler::Ecj do
end
after(:all) do
- #Make ecj appear as a compiler that applies:
+ #Make ecj appear as a compiler that doesn't apply:
module Buildr
module Compiler
Modified: buildr/trunk/spec/spec_helpers.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/spec_helpers.rb?rev=963586&r1=963585&r2=963586&view=diff
==============================================================================
--- buildr/trunk/spec/spec_helpers.rb (original)
+++ buildr/trunk/spec/spec_helpers.rb Tue Jul 13 02:28:35 2010
@@ -38,7 +38,17 @@ unless defined?(SpecHelpers)
require path
end
require 'buildr'
-
+ # load ecj
+ require 'buildr/java/ecj'
+ #Make ecj appear as a compiler that doesn't apply:
+ class Buildr::Compiler::Ecj
+ class << self
+ def applies_to?(project, task)
+ false
+ end
+ end
+ end
+
# Give a chance for plugins to do a few things before requiring the sandbox.
include SandboxHook if defined?(SandboxHook)