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 2016/08/12 06:43:45 UTC
[5/5] buildr git commit: Bring back ECJ into the fold - add its
dependencies to classpath,
as scala and other compilers do. We can sort this out later
Bring back ECJ into the fold - add its dependencies to classpath, as scala and other compilers do. We can sort this out later
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/ac9ab5bf
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/ac9ab5bf
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/ac9ab5bf
Branch: refs/heads/master
Commit: ac9ab5bf90f3b75d0e2f19fb21172a84350695bd
Parents: 1f914fa
Author: Antoine Toulme <an...@lunar-ocean.com>
Authored: Thu Aug 11 23:14:34 2016 -0700
Committer: Antoine Toulme <an...@lunar-ocean.com>
Committed: Thu Aug 11 23:14:34 2016 -0700
----------------------------------------------------------------------
lib/buildr/java/ecj.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/ac9ab5bf/lib/buildr/java/ecj.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/java/ecj.rb b/lib/buildr/java/ecj.rb
index 35128fc..ca33f6c 100644
--- a/lib/buildr/java/ecj.rb
+++ b/lib/buildr/java/ecj.rb
@@ -42,7 +42,6 @@ module Buildr #:nodoc:
cmd_args = []
# tools.jar contains the Java compiler.
dependencies << Java.tools_jar if Java.tools_jar
- dependencies << Buildr::Compiler::Ecj.dependencies
cmd_args << '-classpath' << ('"' + dependencies.join(File::PATH_SEPARATOR) + '"') unless dependencies.empty?
source_paths = sources.select { |source| File.directory?(source) }
cmd_args << '-sourcepath' << source_paths.join(File::PATH_SEPARATOR) unless source_paths.empty?
@@ -79,4 +78,5 @@ module Buildr #:nodoc:
end
end
+Java.classpath << lambda { Buildr::Compiler::Ecj.dependencies }
Buildr::Compiler.compilers << Buildr::Compiler::Ecj