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 2017/09/28 04:15:08 UTC
[1/2] buildr git commit: Added support for `:js_exports` boolean to
enable "JsInteropExports".
Repository: buildr
Updated Branches:
refs/heads/master 00f02b727 -> 72f716912
Added support for `:js_exports` boolean to enable "JsInteropExports".
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/a26a7172
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/a26a7172
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/a26a7172
Branch: refs/heads/master
Commit: a26a7172e2e41427f99bcf561e37a7de5d91da37
Parents: 00f02b7
Author: Peter Donald <pe...@realityforge.org>
Authored: Thu Sep 28 13:54:13 2017 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Thu Sep 28 13:54:13 2017 +1000
----------------------------------------------------------------------
CHANGELOG | 1 +
addon/buildr/gwt.rb | 4 ++++
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/a26a7172/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 5a11d7e..fbda0e8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
1.5.4 (Pending)
+* Added: GWT Addon: Added support for `:js_exports` boolean to enable "JsInteropExports".
* Added: BUILDR-732 - Support bnd version 2.1.0 or more. Submitted By Eric Bruneton.
* Added: Support to compiling Kotlin
* Fixed: Remove section on development builds in the Contributing section.
http://git-wip-us.apache.org/repos/asf/buildr/blob/a26a7172/addon/buildr/gwt.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/gwt.rb b/addon/buildr/gwt.rb
index 379166b..8b40fc0 100644
--- a/addon/buildr/gwt.rb
+++ b/addon/buildr/gwt.rb
@@ -150,6 +150,10 @@ module Buildr
args << '-XenableClosureCompiler'
end
+ if options[:js_exports]
+ args << '-generateJsInteropExports'
+ end
+
args += modules
properties = options[:properties] ? options[:properties].dup : {}
[2/2] buildr git commit: Ensure that the pom is attached to the jar
artifact with empty classifier rather than the last artifact of a type
defined. Otherwise a project that defines multiple artifacts of the same type
(i.e. `package(:jar)` and `package(:j
Posted by do...@apache.org.
Ensure that the pom is attached to the jar artifact with empty classifier rather than the last
artifact of a type defined. Otherwise a project that defines multiple artifacts of the same type
(i.e. `package(:jar)` and `package(:jar, :classifier => :gwt)`) could have the pom named after
the package with the classifier rather than the package without a classifer. (i.e. the pom could
be incorrectly defined as `mypackage-1.0.0-gwt.pom` rather than `mypackage-1.0.0.pom`).
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/72f71691
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/72f71691
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/72f71691
Branch: refs/heads/master
Commit: 72f716912b6d22d1777c0cd0ee69e2d308e61c32
Parents: a26a717
Author: Peter Donald <pe...@realityforge.org>
Authored: Thu Sep 28 14:14:54 2017 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Thu Sep 28 14:14:54 2017 +1000
----------------------------------------------------------------------
CHANGELOG | 5 +++++
lib/buildr/packaging/package.rb | 5 +++--
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/72f71691/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index fbda0e8..ade33db 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,9 @@
1.5.4 (Pending)
+* Fixed: Ensure that the pom is attached to the jar artifact with empty classifier rather than the last
+ artifact of a type defined. Otherwise a project that defines multiple artifacts of the same type
+ (i.e. `package(:jar)` and `package(:jar, :classifier => :gwt)`) could have the pom named after
+ the package with the classifier rather than the package without a classifer. (i.e. the pom could
+ be incorrectly defined as `mypackage-1.0.0-gwt.pom` rather than `mypackage-1.0.0.pom`).
* Added: GWT Addon: Added support for `:js_exports` boolean to enable "JsInteropExports".
* Added: BUILDR-732 - Support bnd version 2.1.0 or more. Submitted By Eric Bruneton.
* Added: Support to compiling Kotlin
http://git-wip-us.apache.org/repos/asf/buildr/blob/72f71691/lib/buildr/packaging/package.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/packaging/package.rb b/lib/buildr/packaging/package.rb
index 07ecc9d..e3688ca 100644
--- a/lib/buildr/packaging/package.rb
+++ b/lib/buildr/packaging/package.rb
@@ -182,7 +182,7 @@ module Buildr #:nodoc:
end
@pom
end
- end
+ end if package.classifier.nil?
file(Buildr.repositories.locate(package)=>package) { package.install }
@@ -190,7 +190,8 @@ module Buildr #:nodoc:
# register it as an artifact. The later is required so if we look up the spec
# we find the package in the project's target directory, instead of finding it
# in the local repository and attempting to install it.
- Artifact.register package, package.pom
+ Artifact.register package
+ Artifact.register package.pom if package.classifier.nil?
end
task('install') { package.install if package.respond_to?(:install) }