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 2015/01/18 01:30:37 UTC
[1/4] buildr git commit: Remove excess whitespace
Repository: buildr
Updated Branches:
refs/heads/master fd6b97574 -> 675e676b9
Remove excess whitespace
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/6a8763a4
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/6a8763a4
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/6a8763a4
Branch: refs/heads/master
Commit: 6a8763a42ebaeec90b8a0af620ebadfec15e5fe9
Parents: fd6b975
Author: Peter Donald <pe...@realityforge.org>
Authored: Sun Jan 18 11:23:40 2015 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Sun Jan 18 11:23:40 2015 +1100
----------------------------------------------------------------------
addon/buildr/gwt.rb | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/6a8763a4/addon/buildr/gwt.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/gwt.rb b/addon/buildr/gwt.rb
index 5eadd20..5c50142 100644
--- a/addon/buildr/gwt.rb
+++ b/addon/buildr/gwt.rb
@@ -126,7 +126,6 @@ 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)
[2/4] buildr git commit: Avoid empty dependency issue in gwt addon if
the attempting to gwt compile a project that has no src/main/java.
Posted by do...@apache.org.
Avoid empty dependency issue in gwt addon if the attempting to gwt compile a project that has no src/main/java.
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/4aeb9a72
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/4aeb9a72
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/4aeb9a72
Branch: refs/heads/master
Commit: 4aeb9a72d29b8ec811ac06e1b00482c069bf774d
Parents: 6a8763a
Author: Peter Donald <pe...@realityforge.org>
Authored: Sun Jan 18 11:26:09 2015 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Sun Jan 18 11:26:09 2015 +1100
----------------------------------------------------------------------
CHANGELOG | 2 ++
addon/buildr/gwt.rb | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/4aeb9a72/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 3a1af66..48f8b74 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
1.4.22 (Pending)
* Change: Update checkstyle to 6.1.1. Submitted by neher.
+* Fixed: Avoid empty dependency issue in gwt addon if the attempting to gwt compile
+ a project that has no src/main/java.
1.4.21 (2014-11-28)
* Change: Upgrade atoulme-Antwrap to 0.7.5 to remove deprecation warnings in
http://git-wip-us.apache.org/repos/asf/buildr/blob/4aeb9a72/addon/buildr/gwt.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/gwt.rb b/addon/buildr/gwt.rb
index 5c50142..5a401cd 100644
--- a/addon/buildr/gwt.rb
+++ b/addon/buildr/gwt.rb
@@ -114,10 +114,10 @@ module Buildr
def gwt(module_names, options = {})
output_key = options[:output_key] || project.id
output_dir = project._(:target, :generated, :gwt, output_key)
- artifacts = ([project.compile.target] + project.compile.sources + project.resources.sources).collect do |a|
+ artifacts = ([project.compile.target] + project.compile.sources + project.resources.sources).flatten.compact.collect do |a|
a.is_a?(String) ? file(a) : a
end
- dependencies = options[:dependencies] ? artifacts(options[:dependencies]) : (project.compile.dependencies + [project.compile.target]).collect do |dep|
+ dependencies = options[:dependencies] ? artifacts(options[:dependencies]) : (project.compile.dependencies + [project.compile.target]).flatten.compact.collect do |dep|
dep.is_a?(String) ? file(dep) : dep
end
[4/4] buildr git commit: Support specification of the target project
to which the gwt compilation artifacts are added as an asset,
by using :target_project option.
Posted by do...@apache.org.
Support specification of the target project to which the gwt compilation
artifacts are added as an asset, by using :target_project option.
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/675e676b
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/675e676b
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/675e676b
Branch: refs/heads/master
Commit: 675e676b923eb4a44a4508aabd8f11153536f860
Parents: 2497ef7
Author: Peter Donald <pe...@realityforge.org>
Authored: Sun Jan 18 11:30:32 2015 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Sun Jan 18 11:30:32 2015 +1100
----------------------------------------------------------------------
CHANGELOG | 2 ++
addon/buildr/gwt.rb | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/675e676b/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index af0cbeb..bd2d31d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,8 @@
* Fixed: Support dependencies in the gwt addon that are other local projects rather
that artifacts, without forcing a compilation of dependency when parsing
buildfile.
+* Added: Support specification of the target project to which the gwt compilation
+ artifacts are added as an asset, by using :target_project option.
1.4.21 (2014-11-28)
* Change: Upgrade atoulme-Antwrap to 0.7.5 to remove deprecation warnings in
http://git-wip-us.apache.org/repos/asf/buildr/blob/675e676b/addon/buildr/gwt.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/gwt.rb b/addon/buildr/gwt.rb
index 5dfaa63..a711a87 100644
--- a/addon/buildr/gwt.rb
+++ b/addon/buildr/gwt.rb
@@ -112,6 +112,8 @@ module Buildr
include Extension
def gwt(module_names, options = {})
+ p = options[:target_project]
+ target_project = p.nil? ? project : p.is_a?(String) ? project(p) : p
output_key = options[:output_key] || project.id
output_dir = project._(:target, :generated, :gwt, output_key)
artifacts = ([project.compile.target] + project.compile.sources + project.resources.sources).flatten.compact.collect do |a|
@@ -147,7 +149,7 @@ module Buildr
end
task.enhance(dependencies)
task.enhance([project.compile])
- project.assets.paths << task
+ target_project.assets.paths << task
task
end
[3/4] buildr git commit: Support dependencies in the gwt addon that
are other local projects rather that artifacts,
without forcing a compilation of dependency when parsing buildfile.
Posted by do...@apache.org.
Support dependencies in the gwt addon that are other local projects rather that artifacts, without forcing a compilation of dependency when parsing buildfile.
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/2497ef7d
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/2497ef7d
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/2497ef7d
Branch: refs/heads/master
Commit: 2497ef7d26010ef3312e8d2e4ee8f01e3e98b82c
Parents: 4aeb9a7
Author: Peter Donald <pe...@realityforge.org>
Authored: Sun Jan 18 11:28:21 2015 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Sun Jan 18 11:28:21 2015 +1100
----------------------------------------------------------------------
CHANGELOG | 3 +++
addon/buildr/gwt.rb | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/2497ef7d/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 48f8b74..af0cbeb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
* Change: Update checkstyle to 6.1.1. Submitted by neher.
* Fixed: Avoid empty dependency issue in gwt addon if the attempting to gwt compile
a project that has no src/main/java.
+* Fixed: Support dependencies in the gwt addon that are other local projects rather
+ that artifacts, without forcing a compilation of dependency when parsing
+ buildfile.
1.4.21 (2014-11-28)
* Change: Upgrade atoulme-Antwrap to 0.7.5 to remove deprecation warnings in
http://git-wip-us.apache.org/repos/asf/buildr/blob/2497ef7d/addon/buildr/gwt.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/gwt.rb b/addon/buildr/gwt.rb
index 5a401cd..5dfaa63 100644
--- a/addon/buildr/gwt.rb
+++ b/addon/buildr/gwt.rb
@@ -128,7 +128,7 @@ module Buildr
if project.iml?
existing_deps = project.compile.dependencies.collect do |d|
a = artifact(d)
- a.invoke if a.respond_to?(:invoke)
+ a.invoke if a.is_a?(Buildr::Artifact)
a.to_s
end
Buildr::GWT.dependencies(version).each do |d|