You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2017/06/08 12:31:14 UTC
svn commit: r1798052 - in /webservices/axiom/trunk:
aspects/dom-aspects/BUILD aspects/om-aspects/BUILD
aspects/shared-aspects/BUILD axiom-api/BUILD buildutils/aspectj.bzl
Author: veithen
Date: Thu Jun 8 12:31:14 2017
New Revision: 1798052
URL: http://svn.apache.org/viewvc?rev=1798052&view=rev
Log:
Make all aspects buildable with Bazel.
Added:
webservices/axiom/trunk/aspects/dom-aspects/BUILD
webservices/axiom/trunk/aspects/om-aspects/BUILD
webservices/axiom/trunk/aspects/shared-aspects/BUILD
Modified:
webservices/axiom/trunk/axiom-api/BUILD
webservices/axiom/trunk/buildutils/aspectj.bzl
Added: webservices/axiom/trunk/aspects/dom-aspects/BUILD
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/dom-aspects/BUILD?rev=1798052&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/dom-aspects/BUILD (added)
+++ webservices/axiom/trunk/aspects/dom-aspects/BUILD Thu Jun 8 12:31:14 2017
@@ -0,0 +1,13 @@
+load('//buildutils:aspectj.bzl', 'aspectj_library')
+
+aspectj_library(
+ name = "dom-aspects",
+ srcs = glob([
+ "src/main/java/**/*.java",
+ "src/main/java/**/*.aj",
+ ]),
+ deps = [
+ "//aspects/core-aspects",
+ "//aspects/shared-aspects",
+ ],
+)
Added: webservices/axiom/trunk/aspects/om-aspects/BUILD
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/BUILD?rev=1798052&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/BUILD (added)
+++ webservices/axiom/trunk/aspects/om-aspects/BUILD Thu Jun 8 12:31:14 2017
@@ -0,0 +1,17 @@
+load('//buildutils:aspectj.bzl', 'aspectj_library')
+
+aspectj_library(
+ name = "om-aspects",
+ srcs = glob([
+ "src/main/java/**/*.java",
+ "src/main/java/**/*.aj",
+ ]),
+ deps = [
+ "//aspects/core-aspects",
+ "//aspects/shared-aspects",
+ "//axiom-api",
+ "//axiom-api:util-base64",
+ "//axiom-api:util-sax",
+ "//components/base64-utils",
+ ],
+)
Added: webservices/axiom/trunk/aspects/shared-aspects/BUILD
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/shared-aspects/BUILD?rev=1798052&view=auto
==============================================================================
--- webservices/axiom/trunk/aspects/shared-aspects/BUILD (added)
+++ webservices/axiom/trunk/aspects/shared-aspects/BUILD Thu Jun 8 12:31:14 2017
@@ -0,0 +1,13 @@
+load('//buildutils:aspectj.bzl', 'aspectj_library')
+
+aspectj_library(
+ name = "shared-aspects",
+ srcs = glob([
+ "src/main/java/**/*.java",
+ "src/main/java/**/*.aj",
+ ]),
+ deps = [
+ "//aspects/core-aspects",
+ ],
+ visibility = ["//visibility:public"],
+)
Modified: webservices/axiom/trunk/axiom-api/BUILD
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/BUILD?rev=1798052&r1=1798051&r2=1798052&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/BUILD (original)
+++ webservices/axiom/trunk/axiom-api/BUILD Thu Jun 8 12:31:14 2017
@@ -1,3 +1,5 @@
+package(default_visibility = ["//visibility:public"])
+
java_library(
name = "ext-activation",
srcs = glob(["src/main/java/org/apache/axiom/ext/activation/*.java"]),
@@ -27,6 +29,15 @@ java_library(
)
java_library(
+ name = "util-base64",
+ srcs = glob(["src/main/java/org/apache/axiom/util/base64/*.java"]),
+ deps = [
+ ":util-activation",
+ "//components/base64-utils",
+ ],
+)
+
+java_library(
name = "util-io",
srcs = glob(["src/main/java/org/apache/axiom/util/io/*.java"]),
deps = [
@@ -40,6 +51,11 @@ java_library(
)
java_library(
+ name = "util-sax",
+ srcs = glob(["src/main/java/org/apache/axiom/util/sax/*.java"]),
+)
+
+java_library(
name = "util-stax",
srcs = glob(["src/main/java/org/apache/axiom/util/stax/*.java"]),
deps = [
@@ -127,4 +143,6 @@ java_library(
":util-namespace",
":util-stax",
],
+ # TODO
+ javacopts = ['-extra_checks:off'],
)
Modified: webservices/axiom/trunk/buildutils/aspectj.bzl
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/buildutils/aspectj.bzl?rev=1798052&r1=1798051&r2=1798052&view=diff
==============================================================================
--- webservices/axiom/trunk/buildutils/aspectj.bzl (original)
+++ webservices/axiom/trunk/buildutils/aspectj.bzl Thu Jun 8 12:31:14 2017
@@ -1,18 +1,19 @@
-# Partially based on bazel/tools/build_rules/java_rules_skylark.bzl
-
def _impl(ctx):
class_jar = ctx.outputs.class_jar
+ deps_provider = java_common.merge([dep[java_common.provider] for dep in ctx.attr.deps + [ctx.attr._runtime]])
ctx.action(
- inputs=ctx.files.deps + ctx.files._runtime + ctx.files.srcs,
+ inputs=list(deps_provider.transitive_runtime_jars) + ctx.files.srcs,
outputs=[class_jar],
arguments=[
- "-classpath", ctx.configuration.host_path_separator.join([f.path for f in ctx.files.deps + ctx.files._runtime]),
+ "-classpath", ctx.configuration.host_path_separator.join([f.path for f in deps_provider.transitive_runtime_jars]),
"-outjar", class_jar.path,
"-source", "1.7",
"-target", "1.7",
] + [f.path for f in ctx.files.srcs],
progress_message="Building %s" % class_jar.short_path,
executable=ctx.executable._ajc)
+ return [java_common.merge(
+ [deps_provider, java_common.create_provider(compile_time_jars=[class_jar], runtime_jars=[class_jar])])]
aspectj_library = rule(
implementation = _impl,