Merge pull request #17 from bazelbuild/johnynek/fix-resources

Fix resources bug

Author: johnynek

.travis.yml

@@ -23,6 +23,4 @@ before_install:
   - cat ~/.bazelrc >> .bazelrc
 
 script:
-  - bazel build test/...
-  - bazel run test:ScalaBinary
-  - bazel test test/...
+  - bash test_run.sh

scala/scala.bzl

@@ -26,12 +26,16 @@ def _adjust_resources_path(path):
     return dir_1 + dir_2, rel_path
   return "", path
 
-def _build_nosrc_jar(ctx, buildijar):
+def _add_resources_cmd(ctx):
   res_cmd = ""
   for f in ctx.files.resources:
     c_dir, res_path = _adjust_resources_path(f.path)
     change_dir = "-C " + c_dir if c_dir else ""
-    res_cmd = "\n{jar} uf {out} " + change_dir + " " + res_path
+    res_cmd += "\n{jar} uf {out} " + change_dir + " " + res_path
+  return res_cmd
+
+def _build_nosrc_jar(ctx, buildijar):
+  res_cmd = _add_resources_cmd(ctx)
   ijar_cmd = ""
   if buildijar:
     ijar_cmd = "\ncp {out} {ijar_out}".format(
@@ -61,11 +65,7 @@ touch -t 198001010000 {manifest}
       arguments=[])
 
 def _compile(ctx, jars, buildijar):
-  res_cmd = ""
-  for f in ctx.files.resources:
-    c_dir, res_path = _adjust_resources_path(f.path)
-    change_dir = "-C " + c_dir if c_dir else ""
-    res_cmd = "\n{jar} uf {out} " + change_dir + " " + res_path
+  res_cmd = _add_resources_cmd(ctx)
   ijar_cmd = ""
   if buildijar:
     ijar_cmd = "\n{ijar} {out} {ijar_out}".format(

test/BUILD

@@ -14,7 +14,18 @@ java_binary(
 # For now, we have to use a java_import proxy.
 java_import(
     name = "lib_import",
-    jars = [":HelloLib_deploy.jar"],
+    # these are the outputs of the scala_library targets
+    jars = [":HelloLib_deploy.jar",
+            "OtherLib_deploy.jar",
+            "Exported_deploy.jar",
+            "Runtime_deploy.jar",
+           ],
+    runtime_deps = ["org_scala_lang__scala_library", "OtherJavaLib"]
+)
+
+java_import(
+    name = "org_scala_lang__scala_library",
+    jars = ["@scala//:lib/scala-library.jar"]
 )
 
 scala_binary(
@@ -79,7 +90,7 @@ java_library(
 scala_library(
     name = "ScalaLibResources",
     srcs = ["src/main/scala/scala/test/ScalaLibResources.scala"],
-    resources = ["src/main/resources/scala/test/hellos"],
+    resources = ["src/main/resources/scala/test/hellos", "src/main/resources/scala/test/byes"],
 )
 
 scala_binary(

test/src/main/resources/scala/test/byes

@@ -0,0 +1,3 @@
+see ya
+later
+A hui hou

test/src/main/scala/scala/test/ScalaLibBinary.scala

@@ -17,5 +17,6 @@ package scala.test
 object ScalaLibBinary {
   def main(args:Array[String]) {
     ScalaLibResources.getGreetings foreach println
+    ScalaLibResources.getFarewells foreach println
   }
 }

test/src/main/scala/scala/test/ScalaLibResources.scala

@@ -15,5 +15,15 @@
 package scala.test
 
 object ScalaLibResources {
-  def getGreetings() = scala.io.Source.fromInputStream(getClass.getResourceAsStream("hellos")).getLines.toList
+  def getGreetings() =
+    scala.io.Source
+      .fromInputStream(getClass.getResourceAsStream("hellos"))
+      .getLines
+      .toList
+
+  def getFarewells() =
+    scala.io.Source
+      .fromInputStream(getClass.getResourceAsStream("byes"))
+      .getLines
+      .toList
 }

test_run.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -e
+
+bazel build test/... \
+  && bazel run test:ScalaBinary \
+  && bazel run test:ScalaLibBinary \
+  && bazel run test:JavaBinary \
+  && bazel test test/...