You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildr.apache.org by do...@apache.org on 2014/11/13 23:49:54 UTC
[1/3] buildr git commit: Extract a variable for readability
Repository: buildr
Updated Branches:
refs/heads/master 7eb0ea49c -> 4fca5593b
Extract a variable for readability
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/acb90c4c
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/acb90c4c
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/acb90c4c
Branch: refs/heads/master
Commit: acb90c4cceba3c811ff1b4c7d521231fdf4dca59
Parents: 7eb0ea4
Author: Peter Donald <pe...@realityforge.org>
Authored: Fri Nov 14 09:48:41 2014 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Fri Nov 14 09:48:41 2014 +1100
----------------------------------------------------------------------
addon/buildr/gwt.rb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/acb90c4c/addon/buildr/gwt.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/gwt.rb b/addon/buildr/gwt.rb
index 3e18794..7bd1d28 100644
--- a/addon/buildr/gwt.rb
+++ b/addon/buildr/gwt.rb
@@ -43,7 +43,8 @@ module Buildr
end
def gwtc_main(modules, source_artifacts, output_dir, unit_cache_dir, options = {})
- cp = Buildr.artifacts(self.dependencies(options[:version])).each(&:invoke).map(&:to_s) + Buildr.artifacts(source_artifacts).each(&:invoke).map(&:to_s)
+ base_dependencies = self.dependencies(options[:version])
+ cp = Buildr.artifacts(base_dependencies).each(&:invoke).map(&:to_s) + Buildr.artifacts(source_artifacts).each(&:invoke).map(&:to_s)
style = options[:style] || 'OBFUSCATED,' # 'PRETTY', 'DETAILED'
log_level = options[:log_level] # ERROR, WARN, INFO, TRACE, DEBUG, SPAM, or ALL
workers = options[:workers] || 2
[2/3] buildr git commit: Extract another variable to improve
readability
Posted by do...@apache.org.
Extract another variable to improve readability
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/4f800dd6
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/4f800dd6
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/4f800dd6
Branch: refs/heads/master
Commit: 4f800dd61d8fad4ceb35c93f34f1e76ac4b37b9f
Parents: acb90c4
Author: Peter Donald <pe...@realityforge.org>
Authored: Fri Nov 14 09:49:04 2014 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Fri Nov 14 09:49:04 2014 +1100
----------------------------------------------------------------------
addon/buildr/gwt.rb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/4f800dd6/addon/buildr/gwt.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/gwt.rb b/addon/buildr/gwt.rb
index 7bd1d28..8d01daf 100644
--- a/addon/buildr/gwt.rb
+++ b/addon/buildr/gwt.rb
@@ -123,12 +123,14 @@ module Buildr
unit_cache_dir = project._(:target, :gwt, :unit_cache_dir, output_key)
+ version = gwt_detect_version(dependencies) || Buildr::GWT.version
+
task = project.file(output_dir) do
Buildr::GWT.gwtc_main(module_names,
(dependencies + artifacts).flatten.compact,
output_dir,
unit_cache_dir,
- {:version => gwt_detect_version(dependencies)}.merge(options))
+ {:version => version}.merge(options))
end
task.enhance(dependencies)
task.enhance([project.compile])
[3/3] buildr git commit: Add missing gwt dependencies to idea module
files if they are not already present
Posted by do...@apache.org.
Add missing gwt dependencies to idea module files if they are not already present
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/4fca5593
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/4fca5593
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/4fca5593
Branch: refs/heads/master
Commit: 4fca5593b5cb05902d1cf880e9517456b280e5dd
Parents: 4f800dd
Author: Peter Donald <pe...@realityforge.org>
Authored: Fri Nov 14 09:49:35 2014 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Fri Nov 14 09:49:35 2014 +1100
----------------------------------------------------------------------
addon/buildr/gwt.rb | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/4fca5593/addon/buildr/gwt.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/gwt.rb b/addon/buildr/gwt.rb
index 8d01daf..5eadd20 100644
--- a/addon/buildr/gwt.rb
+++ b/addon/buildr/gwt.rb
@@ -125,6 +125,20 @@ module Buildr
version = gwt_detect_version(dependencies) || Buildr::GWT.version
+ if project.iml?
+
+ existing_deps = project.compile.dependencies.collect do |d|
+ a = artifact(d)
+ a.invoke if a.respond_to?(:invoke)
+ a.to_s
+ end
+ Buildr::GWT.dependencies(version).each do |d|
+ a = artifact(d)
+ a.invoke if a.respond_to?(:invoke)
+ project.iml.main_dependencies << a.to_s unless existing_deps.include?(a.to_s)
+ end
+ end
+
task = project.file(output_dir) do
Buildr::GWT.gwtc_main(module_names,
(dependencies + artifacts).flatten.compact,