diff options
| author |  John Sullivan <john.t.sullivan@gmail.com> | 2015-09-16 21:24:05 +0000 |
|---|---|---|
| committer |  Florian Weikert <fwe@google.com> | 2015-09-16 21:33:10 +0000 |
| commit | e0c6df7939452aba830c5a8bfffc87c83cd03145 (patch) | |
| tree | 525a6c64845ed7efe8f165aec726cab8c60f7db5 /tools | |
| parent | e1f187a7bcaf13d03ee9570ca2874927c6c3d73f (diff) | |
Added support for scalac and jvm_flags in scala_[library|binary]. Fixes #457.
--
Reviewed-on: https://github.com/bazelbuild/bazel/pull/459
MOS_MIGRATED_REVID=103229152
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/build_defs/scala/scala.bzl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/build_defs/scala/scala.bzl b/tools/build_defs/scala/scala.bzl index 222573db8f..193a6836f1 100644 --- a/tools/build_defs/scala/scala.bzl +++ b/tools/build_defs/scala/scala.bzl @@ -25,13 +25,15 @@ def _compile(ctx, jars): cmd = """ set -e mkdir -p {out}_tmp -{scalac} -classpath "{jars}" $@ -d {out}_tmp +{scalac} {scala_opts} {jvm_flags} -classpath "{jars}" $@ -d {out}_tmp # Make jar file deterministic by setting the timestamp of files touch -t 198001010000 $(find .) jar cmf {manifest} {out} -C {out}_tmp . """ cmd = cmd.format( scalac=_scalac_path, + scala_opts=" ".join(ctx.attr.scalacopts), + jvm_flags=" ".join(["-J" + flag for flag in ctx.attr.jvm_flags]), out=ctx.outputs.jar.path, manifest=ctx.outputs.manifest.path, jars=":".join([j.path for j in jars])) @@ -119,6 +121,8 @@ scala_library = rule( non_empty=True), "deps": attr.label_list(), "data": attr.label_list(allow_files=True, cfg=DATA_CFG), + "scalacopts": attr.string_list(), + "jvm_flags": attr.string_list(), }, outputs={ "jar": "%{name}_deploy.jar", @@ -135,6 +139,8 @@ scala_binary = rule( non_empty=True), "deps": attr.label_list(), "data": attr.label_list(allow_files=True, cfg=DATA_CFG), + "scalacopts":attr.string_list(), + "jvm_flags": attr.string_list(), }, outputs={ "jar": "%{name}_deploy.jar", |